More QS theme fixes for contrast

Test: visual
Change-Id: I4494e92ebf79bbc20c30a18f5ac13228801a3e54
Fixes: 37443237
9 files changed