The only thing wrong with mine is that the clear number plate part of the lens is broken. Do you know if the actual lenses are the same btwn the 18 & the 21? Or do they differ too like the white 'body' part does? It looks like the lens simply clips out, so if they are compatible i could just swap the lenses over couldn't I?
Cheers
Wb