Adds ability to customize button icon.
Merge branch 'button-icon' into all-fix