diff --git a/apps/common/templates/generic_confirm.html b/apps/common/templates/generic_confirm.html
index b020583e2e..7e52c32a2d 100644
--- a/apps/common/templates/generic_confirm.html
+++ b/apps/common/templates/generic_confirm.html
@@ -29,7 +29,8 @@
                 {% endif %}   
                 
                 <div style="float: left; margin-right: 10px;">
-                    <img style="margin-top: 12px;" src="{{ STATIC_URL }}images/icons/{{ form_icon|default:'question.png' }}" alt="{% trans 'form icon' %}" />
+                    {{ form_icon.display_big }}
+                    {#<img style="margin-top: 12px;" src="{{ STATIC_URL }}images/icons/{{ form_icon|default:'question.png' }}" alt="{% trans 'form icon' %}" />#}
                 </div>                
                 <div style="float: left; width: 90%;">
                 {% if title %}
diff --git a/apps/common/templates/generic_list_subtemplate.html b/apps/common/templates/generic_list_subtemplate.html
index fd4076470f..e3636dfb4d 100644
--- a/apps/common/templates/generic_list_subtemplate.html
+++ b/apps/common/templates/generic_list_subtemplate.html
@@ -41,7 +41,7 @@
                         {% for object_reference, object_links in multi_item_links.items %}
                             {% for link in object_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 %}
                         {% endfor %}
@@ -175,7 +175,7 @@
                         {% for object_reference, object_links in multi_item_links.items %}
                             {% for link in object_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 %}
                         {% endfor %}
diff --git a/apps/common/widgets.py b/apps/common/widgets.py
index 46daccd388..28065c60cd 100644
--- a/apps/common/widgets.py
+++ b/apps/common/widgets.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 from itertools import chain
 
@@ -8,6 +10,8 @@ from django.forms.util import flatatt
 from django.utils.html import conditional_escape
 from django.utils.encoding import force_unicode
 
+from .icons import icon_cross, icon_tick
+
 
 class PlainWidget(forms.widgets.Widget):
     """
@@ -66,11 +70,11 @@ def exists_with_famfam(path):
         return exc
 
 
-def two_state_template(state, famfam_ok_icon=u'tick', famfam_fail_icon=u'cross'):
+def two_state_template(state, ok_icon=icon_tick, fail_icon=icon_cross):
     if state:
-        return mark_safe(u'<span class="famfam active famfam-%s"></span>' % famfam_ok_icon)
+        return ok_icon
     else:
-        return mark_safe(u'<span class="famfam active famfam-%s"></span>' % famfam_fail_icon)
+        return fail_icon
 
 
 class TextAreaDiv(forms.widgets.Widget):