diff --git a/muk_web_theme/__manifest__.py b/muk_web_theme/__manifest__.py
index d5cc650..8f362c1 100644
--- a/muk_web_theme/__manifest__.py
+++ b/muk_web_theme/__manifest__.py
@@ -19,7 +19,7 @@
 {
     "name": "MuK Backend Theme", 
     "summary": "Odoo Community Backend Theme",
-    "version": "12.0.1.4.7",
+    "version": "12.0.1.4.8",
     "category": "Themes/Backend",
     "license": "AGPL-3",
     "author": "MuK IT",
diff --git a/muk_web_theme/static/src/xml/views.xml b/muk_web_theme/static/src/xml/views.xml
index 933247c..b28be18 100644
--- a/muk_web_theme/static/src/xml/views.xml
+++ b/muk_web_theme/static/src/xml/views.xml
@@ -27,5 +27,69 @@
             </button>
         </div>
     </t>
+    
+    <t t-name="muk_web_theme.IconButton">
+        <i t-attf-class="d-inline d-sm-none fa fa-#{icon}" t-att-title="label"/>
+        <span class="d-none d-sm-inline" t-esc="label"/>
+    </t>
+    
+    <t t-extend="FormView.buttons">
+    	<t t-jquery=".o_form_button_edit" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'pencil'"/>
+                <t t-set="label">Edit</t>
+            </t>
+        </t>
+    	<t t-jquery=".o_form_button_create" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'plus'"/>
+                <t t-set="label">Create</t>
+            </t>
+        </t>
+        <t t-jquery=".o_form_button_save" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'floppy-o'"/>
+                <t t-set="label">Save</t>
+            </t>
+        </t>
+        <t t-jquery=".o_form_button_cancel" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'times'"/>
+                <t t-set="label">Discard</t>
+            </t>
+        </t>
+    </t>
+    
+    <t t-extend="ListView.buttons">
+        <t t-jquery=".o_list_button_add" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'plus'"/>
+                <t t-set="label">Create</t>
+            </t>
+        </t>
+
+        <t t-jquery=".o_list_button_save" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'floppy-o'"/>
+                <t t-set="label">Save</t>
+            </t>
+        </t>
+
+        <t t-jquery=".o_list_button_discard" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'times'"/>
+                <t t-set="label">Discard</t>
+            </t>
+        </t>
+    </t>
+    
+    <t t-extend="KanbanView.buttons">
+        <t t-jquery="button" t-operation="inner">
+            <t t-call="muk_web_theme.IconButton">
+                <t t-set="icon" t-value="'plus'"/>
+                <t t-set="label" t-value="create_text || _t('Create')"/>
+            </t>
+        </t>
+    </t>
 
 </templates>
\ No newline at end of file