Some fixes for IconTextMixin.