1st ?, do you have clear lenses with amber bulbs or are they amber lenses with clear bulbs? I believe the bulb bases have different offsets for the pins which lock them in place.

2nd ?, is the problem isolated to one side or both?