Refactor icon-button mixin