[[ Bug 12894 ]] Move iconGravity to button property.
Merge branch 'bugfix-12894' into develop