Yes, you can lose the 'egg yolk effect' by going with the hi-intensity bulbs...the have a silver/chrome coating that helps them disappear when they are off. You can also use LEDs... the amber LEDs are actually clear/white when off.
A light that is very close in size and bezel shape is the Ford Escape factory light... you might be able to graft those in just as easily.