Add default icon color and adjust some strings.

Bug: 20303449
Change-Id: Ia3cb016c3432c13b3420fb6982e0baa2371686ec
2 files changed