S3 console rocker switch upgrade

[teamlines]

Evening all. Just wondering whether anyone has found an "after-market" replacement for the three rocker switches on the centre console (2 speed fan, fog and driving lights) on S3s, S4s and V8s (don't think they were used on other models)? I believe the originals are TR7 and/or range rover classic. I've come to the conclusion that an upgrade is due, but it would be good to find something that will just drop into the existing holes with only limited fettling. I've found a few options that will introduce a more modern feel without altering the feel of the dash. Anyone done this successfully?

[Oldred_V8S]

Have you tried Rimmer Brothers? They look like a TR7 switch

[Sandgrounder]

I replaced heater switch in winter. Rimmer bros supplied it. Had to swap the symbol from Lights to Fan, with a little super-glue.