Headlight removal
#2
There are two bolts ( think 10mm) that are across the top of the frame and there is one bolt behind the rubber flap. Remove these three and then pull the light towards you. There are some clips that hold them in place, but don't worry, just give it a little force when pulling it out. Then from there it should be twisting the light connections and pulling them out of the headlight sockets.
#3
You will also need to remove the plastic push pins (one on each side on top) to move the air deflector to access the lower bolt. I used a small screw driver to push the pin in the clip back (towards you). Once the pin is back the clip will easily pull out. Also, as already stated the headlight assembly is held in by a couple of metal clips (you can't see them when the headlight assembly in in place). Just give the assembly a good pull straight out (not at any angle) and it should pop right out.
#5