Merge "AOD: Scale icon padding with the drawing size" into oc-dev