Updated icons to use a mixin