diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py
index b6e8d7d604..301bfd3729 100644
--- a/mayan/apps/acls/views.py
+++ b/mayan/apps/acls/views.py
@@ -345,7 +345,6 @@ def acl_new_holder_for(request, obj, extra_context=None, navigation_object=None)
         'form': form,
         'title': _('Add new holder for: %s') % obj,
         'submit_label': _('Select'),
-        'submit_icon_famfam': 'tick',
         'object': obj,
         'access_object': AccessObject.encapsulate(obj),
         'navigation_object_list': [
@@ -475,7 +474,6 @@ def acl_class_new_holder_for(request, access_object_class_gid):
         'title': _('Add new holder for class: %s') % unicode(access_object_class),
         'object': access_object_class,
         'submit_label': _('Select'),
-        'submit_icon_famfam': 'tick'
     }
 
     return render_to_response('appearance/generic_form.html', context,
diff --git a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
index eda92bd7da..077444811e 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
@@ -64,7 +64,7 @@
         {% endif %}
         {% if not read_only %}
             <div class="form-group">
-                <button class="btn btn-primary" name="{% if form.prefix %}{{ form.prefix }}-submit{% else %}submit{% endif %}" type="submit"><i class="fa fa-check"></i> {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}</button>
+                <button class="btn btn-primary" name="{% if form.prefix %}{{ form.prefix }}-submit{% else %}submit{% endif %}" type="submit"><i class="{{ submit_icon|default:'fa fa-check' }}"></i> {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}</button>
                 {% if previous %}
                       &nbsp;<a class="btn btn-default" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}'>
                         <i class="fa fa-cross"></i> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index 8e5db9f7a6..d430cc0cb0 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -140,7 +140,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                     'form': unselected_list,
                     'title': left_list_title or ' ',
                     'submit_label': _('Add'),
-                    'submit_icon_famfam': 'add'
+                    'submit_icon': 'fa fa-plus'
                 }
             },
             {
@@ -150,7 +150,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                     'form': selected_list,
                     'title': right_list_title or ' ',
                     'submit_label': _('Remove'),
-                    'submit_icon_famfam': 'delete'
+                    'submit_icon': 'fa fa-minus'
                 }
             },
 
diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py
index 0e2d2370f4..6174970b0e 100644
--- a/mayan/apps/dynamic_search/views.py
+++ b/mayan/apps/dynamic_search/views.py
@@ -64,13 +64,13 @@ def search(request, advanced=False):
                 'submit_method': 'GET',
                 'search_results_limit': LIMIT,
                 'submit_label': _('Search'),
-                'submit_icon_famfam': 'zoom',
+                'submit_icon': 'fa fa-search',
             }, context_instance=RequestContext(request)
         )
     else:
         extra_context = {
             'submit_label': _('Search'),
-            'submit_icon_famfam': 'zoom',
+            'submit_icon': 'fa fa-search',
             'form_title': _('Search'),
             'form_hide_required_text': True,
         }
diff --git a/mayan/apps/mailer/views.py b/mayan/apps/mailer/views.py
index c417dc5df9..33fc4ae1f8 100644
--- a/mayan/apps/mailer/views.py
+++ b/mayan/apps/mailer/views.py
@@ -76,7 +76,7 @@ def send_document_link(request, document_id=None, document_id_list=None, as_atta
         'form': form,
         'next': next,
         'submit_label': _('Send'),
-        'submit_icon_famfam': 'email_go'
+        'submit_icon': 'fa fa-envelope'
     }
     if len(documents) == 1:
         context['object'] = documents[0]
diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py
index 790d33de89..aafffbd74a 100644
--- a/mayan/apps/sources/wizards.py
+++ b/mayan/apps/sources/wizards.py
@@ -63,7 +63,7 @@ class DocumentCreateWizard(ViewPermissionCheckMixin, SessionWizardView):
         context.update({
             'step_title': self.step_titles[self.steps.step0],
             'submit_label': _('Next step'),
-            'submit_icon_famfam': 'arrow_right',
+            'submit_icon': 'fa fa-arrow-right',
         })
         return context