Merge "Remove icons for setting items in app & notification screen" into oc-dev