Just to give you an idea, this is what my dash looks like with the cluster painted white. Notice the gear indicator, which wasn't changed ( yet ). I like the amber better anyway! By the way, this is with new 194 bulbs.
Sure sounds like a ground or switch issue. I'd first check/redo the grounds.. which seems fairly likely with your particular issues.. and then replace the switch if they check out ok.