Fix for topcoat bug 393 - Switch has gray lines

Ended up making a new branch because this is a completly different fix
The old one did not fix the mobile components, this one works for all
Also updated tests