Iva lighting questions

[SeriesLandy]

I've been finishing up my car and have hit a couple of snags.
On the number plate light it's shining slightly to the rear (previous iva fail at my centre). Would it be acceptable to glue a bit of trim around the edge of the lens so it isn't visible? I did however break it when i took it off but I may have another at work (it came off our tractor).
If i do need to replace the light it will be a real pita as I have to take the arches and tub off to get to the 2 screws.

Iva problems by Series1Landy, on Flickr

The other thing I'm worried about is on the front indicators. I extended them to clear the visibility angles but the lenses are slightly larger than the extension tube by about 3mm.
As it has a square edge what is the best solution? I thought about gluing a small ring of vacuum hose against it to give a radius or is this not necessary and I'm just worrying too much? I realise in the manual it says if x is less than 5mm it requires blunting. Should I just take a file to it to remove the square edge???
Hopefully someone can put my mind at rest.
Cheers, Steve


Iva problems by Series1Landy, on Flickr