Merge "Fix issue where icon was not centered properly." into cw-f-dev