Dean Booboo Cherrington

Hi guys, am new to the 3 series and got to say that i have never liked BMW but after having this car for about a week i now love the quality of the car and the feel, i have a 99 e46 pre facelift but have upgraded the indicators. Only problem i have is the orange bulbs have an offset pin and standard dont, i'm guessing i can just buy a new bulb holder but cant find anything on ebay :-(. Does any1 know where i can get one, also the new clear indicators dont seem to fit perfectly flush with my bodywork on either wing, seen that people advertise 2 and 4 door ones, would this be th case that i have the wrong ones or is it just a thing i have to put up with.