Ours came with the second type of tray. We have no space for the triangles and the first aid kit is a fraction too big to fit in the space allocated, (neither came with the car) so they both float around on the parcel tray.
No spare wheel nut either

, but I can't imagine loosing one

To tell the truth I can't imagine having to unload everything to get to the tool tray in a hurry if either the triangles or the first aid kit is needed in a hurry.