Wrx sti Ed

I'm looking at changing the one piece side repeaters on my blob sti to the two piece ones where the bulb holder and lens are separate. Anyone know what model they come from (I'm presuming bug) and any suppliers that sell the clear lenses and bulb holders? Thanks!