Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev