diff --git a/apps/common/templates/generic_form_instance.html b/apps/common/templates/generic_form_instance.html
index ae51ac8af9..265554fe0a 100644
--- a/apps/common/templates/generic_form_instance.html
+++ b/apps/common/templates/generic_form_instance.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load styling %}
+
 {{ form.media|safe }}  
 {% add_classes_to_form form %}
 
diff --git a/apps/common/templates/generic_form_subtemplate.html b/apps/common/templates/generic_form_subtemplate.html
index 37eeee5db4..f4f55004aa 100644
--- a/apps/common/templates/generic_form_subtemplate.html
+++ b/apps/common/templates/generic_form_subtemplate.html
@@ -1,4 +1,6 @@
 {% load i18n %}
+{% load default_icons %}
+{% default_icons %}
                 
 {% if side_bar %}
     <div class="block">
@@ -74,11 +76,12 @@
         {% if not read_only %}
         <div class="group navform wat-cf">
             <button class="button" type="submit" name="{% if form.prefix %}{{ form.prefix }}-submit{% else %}submit{% endif %}">
-                {% if submit_icon_famfam %}
-                    <span class="famfam active famfam-{{ submit_icon_famfam|default:'tick' }}"></span>
+                {% if submit_icon %}
+                    {{ submit_icon.display_small }}
                 {% else %}
-                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}" />
+                    {{ submit_icon_default.display_small }}
                 {% endif %}
+
                 {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}{% endif %}
             </button>
 
diff --git a/apps/common/templatetags/default_icons.py b/apps/common/templatetags/default_icons.py
new file mode 100644
index 0000000000..f0b2da8f48
--- /dev/null
+++ b/apps/common/templatetags/default_icons.py
@@ -0,0 +1,11 @@
+from django.template import Library
+
+from common.icons import icon_tick
+
+register = Library()
+
+
+@register.simple_tag(takes_context=True)
+def default_icons(context):
+    context['submit_icon_default'] = icon_tick
+    return u''