Added option to override icon_type per icon