Small color fixes

Change-Id: Ic25f3732845d0028208013361f2733dd12aa42a1
Merge "Small color fixes"