[[ Bug 13422 ]] Fix a couple of issues with iconGravity
Merge pull request #1160 from runrevali/bugfix-13422

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