Fix up color issues as a result of theme change

Test: visual
Change-Id: I9adc8b85b40e3ac2df6099655c7479c74675b7bb
Fixes: 37372025
Fixes: 37362926
Fixes: 37358881
Fixes: 37326340
10 files changed