Merge "Adjust icon width to match the width with framework" into oc-dev