Merge "Ensure icon contrast on the shelf" into oc-dev