diff --git a/mayan/apps/appearance/templates/appearance/generic_confirm.html b/mayan/apps/appearance/templates/appearance/generic_confirm.html
index 3227c3d9f2..20a3956ee4 100644
--- a/mayan/apps/appearance/templates/appearance/generic_confirm.html
+++ b/mayan/apps/appearance/templates/appearance/generic_confirm.html
@@ -30,18 +30,12 @@
                     {% endif %}
 
                     <button type="submit" class="btn btn-danger" data-dismiss="modal">
-                        {% if submit_icon_class %}
-                            {{ submit_icon_class.render }}
-                        {% elif submit_icon %}
-                            <i class="{{ submit_icon }}"></i>
-                        {% else %}
-                            <i class="fa fa-check"></i>
-                        {% endif %}
+                        {{ submit_icon_class.render }}
                         {% if submit_label %}{{ submit_label }}{% else %}{% trans 'Yes' %}{% endif %}
                     </button>
 
                     {% if previous %}
-                        <a class="btn btn-primary" onclick='history.back();'>{% trans 'No' %}</a>
+                        <a class="btn btn-primary" onclick='history.back();'>{{ cancel_icon_class.render }} {% trans 'No' %}</a>
                     {% endif %}
 
                 </form>
diff --git a/mayan/apps/common/generics.py b/mayan/apps/common/generics.py
index 41d101e0ae..3ed2df6a60 100644
--- a/mayan/apps/common/generics.py
+++ b/mayan/apps/common/generics.py
@@ -25,7 +25,8 @@ from mayan.apps.acls.models import AccessControlList
 
 from .forms import ChoiceForm
 from .icons import (
-    icon_add_all, icon_remove_all, icon_assign_remove_add,
+    icon_add_all, icon_confirm_form_cancel, icon_confirm_form_submit,
+    icon_remove_all, icon_assign_remove_add,
     icon_assign_remove_remove, icon_sort_down, icon_sort_up
 )
 from .literals import (
@@ -393,6 +394,14 @@ class ConfirmView(
 ):
     template_name = 'appearance/generic_confirm.html'
 
+    def get_context_data(self, **kwargs):
+        context = {
+            'submit_icon_class': icon_confirm_form_submit,
+            'cancel_icon_class': icon_confirm_form_cancel
+        }
+        context.update(super(ConfirmView, self).get_context_data(**kwargs))
+        return context
+
     def post(self, request, *args, **kwargs):
         self.view_action()
         return HttpResponseRedirect(redirect_to=self.get_success_url())
diff --git a/mayan/apps/common/icons.py b/mayan/apps/common/icons.py
index c75fbb77f5..fc72d63d70 100644
--- a/mayan/apps/common/icons.py
+++ b/mayan/apps/common/icons.py
@@ -11,6 +11,8 @@ icon_add_all = Icon(
 )
 icon_assign_remove_add = Icon(driver_name='fontawesome', symbol='plus')
 icon_assign_remove_remove = Icon(driver_name='fontawesome', symbol='minus')
+icon_confirm_form_submit = Icon(driver_name='fontawesome', symbol='check')
+icon_confirm_form_cancel = Icon(driver_name='fontawesome', symbol='times')
 icon_current_user_locale_profile_details = Icon(
     driver_name='fontawesome', symbol='globe'
 )