Hey, per chance do you remember how you resolved this?
I have the same issue with my xenon headlight, the top left tab has broken one of its legs.
Currently superglueing it but I doubt it will hold with potholes and hard braking, like you say!
Cheers
Ross