diff --git a/mayan/apps/main/templates/main/generic_form_subtemplate.html b/mayan/apps/main/templates/main/generic_form_subtemplate.html
index 35a9139b08..a6d806dcc7 100644
--- a/mayan/apps/main/templates/main/generic_form_subtemplate.html
+++ b/mayan/apps/main/templates/main/generic_form_subtemplate.html
@@ -76,18 +76,15 @@
         {% endif %}
         {% 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 %}
+            <button class="pure-button mayan-button" type="submit" name="{% if form.prefix %}{{ form.prefix }}-submit{% else %}submit{% endif %}">
                     <span class="famfam active famfam-{{ submit_icon_famfam|default:'tick' }}"></span>
-                {% else %}
-                    <img src="{% static '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>
 
               {% if previous %}
-                  <a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="button">
-                    <img src="{% static 'web_theme_media/images/icons/cross.png' %}"  alt="{% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}"/> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
+                  &nbsp;<a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="pure-button mayan-button">
+                    {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
                   </a>
               {% endif %}
         </div>
diff --git a/mayan/apps/main/templates/main/generic_multiform_subtemplate.html b/mayan/apps/main/templates/main/generic_multiform_subtemplate.html
index b9df61ebfd..cf547b711d 100644
--- a/mayan/apps/main/templates/main/generic_multiform_subtemplate.html
+++ b/mayan/apps/main/templates/main/generic_multiform_subtemplate.html
@@ -59,18 +59,14 @@
         {% endfor %}
         {% if not read_only %}
         <div class="group navform wat-cf">
-            <button class="button" type="submit" name="submit">
-                {% if submit_icon_famfam %}
+            <button class="pure-button mayan-button" type="submit" name="submit">
                     <span class="famfam active famfam-{{ submit_icon_famfam|default:'tick' }}"></span>
-                {% else %}
-                    <img src="{% static '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>
 
               {% if previous %}
-                  <a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="button">
-                    <img src="{% static 'web_theme_media/images/icons/cross.png' %}"  alt="{% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}"/> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
+                  &nbsp;<a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="pure-button mayan-button">
+                    <span class="famfam active famfam-cross"></span>{% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
                   </a>
               {% endif %}