Improve color contrast further

Bug: 61411
Change-Id: I91916ce44d6ef6f823432b089e0aef4e513292ad