diff --git a/apps/common/templates/generic_list_horizontal_subtemplate.html b/apps/common/templates/generic_list_horizontal_subtemplate.html
index 43b3211d89..17e0269649 100644
--- a/apps/common/templates/generic_list_horizontal_subtemplate.html
+++ b/apps/common/templates/generic_list_horizontal_subtemplate.html
@@ -4,9 +4,6 @@
 {% load navigation_tags %}
 {% load non_breakable %}
 {% load variable_tags %}
-{% load main_settings_tags %}
-
-{% get_main_setting "DISABLE_ICONS" as disable_icons %}
 
 {% if side_bar %}
     <div class="block">
@@ -38,7 +35,7 @@
                         <div class="group navform wat-cf">
                         {% for link in multi_item_links %}
                             <button class="button" type="submit" name="action" value="{{ link.url }}">
-                               {% if link.sprite and not disable_icons %}<span class="famfam active famfam-{{ link.sprite|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
+                                {{ link.icon.display_small }}{{ link.text|capfirst }}
                             </button>
                         {% endfor %}
                         </div>
@@ -81,7 +78,7 @@
                         <div class="group navform wat-cf">
                         {% for link in multi_item_links %}
                             <button class="button" type="submit" name="action" value="{{ link.url }}">
-                               {% if link.sprite and not disable_icons %}<span class="famfam active famfam-{{ link.sprite|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
+                               {{ link.icon.display_small }}{{ link.text|capfirst }}
                             </button>
                         {% endfor %}
                         </div>