Merge "Update icons to have rounded corner" into oc-mr1-dev