Merge "Icon assets for magnification" into oc-dev