Replacing main beam headlight

[Fimbo]

unfortunately the lens on my main beam light has been shattered by a stone chip and needs replacing. I've had a look at the fixings from inside the wing and it seems that the light is attached to a metal surround which is itself glued to the bodywork. I'm just wondering how the light detaches from the metal surround - is it a simple matter of unscrewing it? The replacement light from Clever Trevor doesn't come with the metal surround (see link below) so presume it simply affixes to the existing metal surround?

One other thing, do you think I'd get away with marking the existing screw threads (used to alter the beam angle) to identify the correct beam setting of the new light?

Any help much appreciated.

www.clever-trevor.net/part/247/headlamp-main-beam-...

Edited by Fimbo on Thursday 25th October 00:07