Merge "Fix issue where icon was not centered properly." into cw-f-dev am: 6119c54b48
am: 7c4caaa9fb

Change-Id: I72b94390bbc621699cf222c4f5558658aa77ddf2