Merge "Fixed an issue where the icons had the wrong color" into oc-dev