I had to remove my headlights the other day to get paint protective film installed, and when I went to reinstall them I noticed they had a little rotation even when fully tightened to the chassis. After inspecting I saw that the rivets that hold the mounting flange to the headlight body were all loose. I have a Gen 2 with the relatively heavy LED lights mounted through the side panels. I only have 200 miles on the car so they worked loose pretty quick. I initially just crimped them down tight again, but was worried they would just loosen up like before.

IMG_4998.JPG

So I knocked the rivets out and replaced them with M5x10 screws and nylon lock nuts. The rivets were pretty thin wall and very easy to remove, so I'm sure they would have loosened up again. The lights are reinstalled and plenty tight now with no more extra rotation.

IMG_5003.jpg IMG_5004.jpg

Thought I would post as a heads up in case anyone might run into this too.