diff --git a/apps/common/templates/generic_form_subtemplate.html b/apps/common/templates/generic_form_subtemplate.html
index 5bf248bc16..d86c771b41 100644
--- a/apps/common/templates/generic_form_subtemplate.html
+++ b/apps/common/templates/generic_form_subtemplate.html
@@ -70,7 +70,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 %}">
-                <img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}" /> {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}{% endif %}
+                {% if submit_icon_famfam %}
+                    <span class="famfam active famfam-{{ submit_icon_famfam|default:'tick' }}"></span>
+                {% else %}
+                    <img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}" />
+                {% endif %}
+                {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}{% endif %}
             </button>
             {% comment %}
             <a href="#header" class="button">
diff --git a/apps/common/views.py b/apps/common/views.py
index c6b236665e..6e6940bf6e 100644
--- a/apps/common/views.py
+++ b/apps/common/views.py
@@ -98,6 +98,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                     'form': unselected_list,
                     'title': left_list_title,
                     'submit_label': _(u'Add'),
+                    'submit_icon_famfam': 'add'                
                 }
             },
             {
@@ -108,6 +109,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                     'form': selected_list,
                     'title': right_list_title,
                     'submit_label': _(u'Remove'),
+                    'submit_icon_famfam': 'delete'
                 }
             },