Merge "Adjust icon width to match the width with framework" into oc-dev am: 7acd87d8d0
am: 0a7dc82eb4

Change-Id: Ic5f8d6912895e1e8f3066f258695566920568ffb