Also modified colors for dark theme compatibility. Bug: 36100548 Bug: 36099721 Test: make, screenshot Change-Id: Ib19ba8d5f34ad6d7461849c9137520308f1e5e34
Bug: 34281330 Test: manual inspection, make Change-Id: I7a98ececf4804e3444514ff1c438e5ed4f9705d5