added a mixin for icons, some fix