[[ Bug 13422 ]] Fix a couple of issues with iconGravity