This is how i fixed the rattle, and added a headlight visor, for which i had to do a custom mount.
I used some Monacor MDM5 speaker foam sealing tape for the rattle.

Here are some pictures.
This is the visor.

I used some M3 screws to join the headlight and the visor, and it worked great.




I applied one layer of foam all around the edge of the headlight and on the part of the visor that came in contact with the metal case.