Merge "Fixed an issue where the icons had the wrong color" into oc-dev
am: 695f21a661

Change-Id: Id515004fae2e8ad90346ce82b334ae6f61b2c086