Fix switch bar theme, clean up text appearances

Change-Id: Ica2577ecfce61270bc38ea4a22d37f7e37f0b1bc
2 files changed