Refactor icon-button mixin
Merge pull request #3537 from guardian/icon-button-refactor

Refactor icon-button mixin