diff --git a/InvenTree/InvenTree/static/script/inventree/bom.js b/InvenTree/InvenTree/static/script/inventree/bom.js
index def3910999..55337e3fa8 100644
--- a/InvenTree/InvenTree/static/script/inventree/bom.js
+++ b/InvenTree/InvenTree/static/script/inventree/bom.js
@@ -237,11 +237,11 @@ function loadBomTable(table, options) {
         cols.push({
             formatter: function(value, row, index, field) {
 
-                var bValidate = "<button title='Validate BOM Item' class='bom-validate-button btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='glyphicon glyphicon-check'/></button>";
-                var bValid = "<span class='glyphicon glyphicon-ok'/>";
+                var bValidate = "<button title='Validate BOM Item' class='bom-validate-button btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-check-circle icon-blue'/></button>";
+                var bValid = "<span title='This line has been validated' class='fas fa-check-double icon-green'/>";
 
-                var bEdit = "<button title='Edit BOM Item' class='bom-edit-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/edit'><span class='glyphicon glyphicon-edit'/></button>";
-                var bDelt = "<button title='Delete BOM Item' class='bom-delete-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/delete'><span class='glyphicon glyphicon-trash'/></button>";
+                var bEdit = "<button title='Edit BOM Item' class='bom-edit-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/edit'><span class='fas fa-edit'/></button>";
+                var bDelt = "<button title='Delete BOM Item' class='bom-delete-button btn btn-default btn-glyph' type='button' url='/part/bom/" + row.pk + "/delete'><span class='fas fa-trash-alt icon-red'/></button>";
                 
                 var html = "<div class='btn-group' role='group'>";
                 
diff --git a/InvenTree/InvenTree/static/script/inventree/build.js b/InvenTree/InvenTree/static/script/inventree/build.js
index 28767c99b4..bb2de7fb81 100644
--- a/InvenTree/InvenTree/static/script/inventree/build.js
+++ b/InvenTree/InvenTree/static/script/inventree/build.js
@@ -119,8 +119,8 @@ function loadAllocationTable(table, part_id, part, url, required, button) {
                 formatter: function(value, row, index, field) {
                     var html = parseFloat(value);
 
-                    var bEdit = "<button class='btn item-edit-button btn-sm' type='button' title='Edit stock allocation' url='/build/item/" + row.pk + "/edit/'><span class='glyphicon glyphicon-small glyphicon-edit'></span></button>";
-                    var bDel = "<button class='btn item-del-button btn-sm' type='button' title='Delete stock allocation' url='/build/item/" + row.pk + "/delete/'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>";
+                    var bEdit = "<button class='btn item-edit-button btn-sm' type='button' title='Edit stock allocation' url='/build/item/" + row.pk + "/edit/'><span class='fas fa-edit'></span></button>";
+                    var bDel = "<button class='btn item-del-button btn-sm' type='button' title='Delete stock allocation' url='/build/item/" + row.pk + "/delete/'><span class='fas fa-trash-alt icon-red'></span></button>";
                     
                     html += "<div class='btn-group' style='float: right;'>" + bEdit + bDel + "</div>";
                     
diff --git a/InvenTree/InvenTree/static/script/inventree/stock.js b/InvenTree/InvenTree/static/script/inventree/stock.js
index e21971bb0f..4e4b61aa93 100644
--- a/InvenTree/InvenTree/static/script/inventree/stock.js
+++ b/InvenTree/InvenTree/static/script/inventree/stock.js
@@ -475,8 +475,8 @@ function loadStockTrackingTable(table, options) {
         formatter: function(value, row, index, field) {
             // Manually created entries can be edited or deleted
             if (!row.system) {
-                var bEdit = "<button title='Edit tracking entry' class='btn btn-entry-edit btn-default btn-glyph' type='button' url='/stock/track/" + row.pk + "/edit/'><span class='glyphicon glyphicon-edit'/></button>";
-                var bDel = "<button title='Delete tracking entry' class='btn btn-entry-delete btn-default btn-glyph' type='button' url='/stock/track/" + row.pk + "/delete/'><span class='glyphicon glyphicon-trash'/></button>";
+                var bEdit = "<button title='Edit tracking entry' class='btn btn-entry-edit btn-default btn-glyph' type='button' url='/stock/track/" + row.pk + "/edit/'><span class='fas fa-edit'/></button>";
+                var bDel = "<button title='Delete tracking entry' class='btn btn-entry-delete btn-default btn-glyph' type='button' url='/stock/track/" + row.pk + "/delete/'><span class='fas fa-trash-alt icon-red'/></button>";
 
                 return "<div class='btn-group' role='group'>" + bEdit + bDel + "</div>";
             } else {
diff --git a/InvenTree/build/templates/build/notes.html b/InvenTree/build/templates/build/notes.html
index 6e05a40c95..f54172ac21 100644
--- a/InvenTree/build/templates/build/notes.html
+++ b/InvenTree/build/templates/build/notes.html
@@ -30,7 +30,7 @@
             <h4>{% trans "Build Notes" %}</h4>
         </div>
         <div class='col-sm-6'>
-            <button title='{% trans "Edit notes" %}' class='btn btn-default btn-glyph float-right' id='edit-notes'><span class='glyphicon glyphicon-edit'></span></button>
+            <button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
         </div>
     </div>
     <hr>
diff --git a/InvenTree/build/templates/build/tabs.html b/InvenTree/build/templates/build/tabs.html
index 24b1e53a15..ca2e92f290 100644
--- a/InvenTree/build/templates/build/tabs.html
+++ b/InvenTree/build/templates/build/tabs.html
@@ -11,6 +11,6 @@
         <a href="{% url 'build-output' build.id %}">{% trans "Build Outputs" %}{% if build.output_count > 0%}<span class='badge'>{{ build.output_count }}</span>{% endif %}</a>
     </li>
     <li{% if tab == 'notes' %} class='active'{% endif %}>
-        <a href="{% url 'build-notes' build.id %}">{% trans "Notes" %}{% if build.notes %} <span class='glyphicon glyphicon-small glyphicon-info-sign'></span>{% endif %}</a>
+        <a href="{% url 'build-notes' build.id %}">{% trans "Notes" %}{% if build.notes %} <span class='fas fa-info-circle'></span>{% endif %}</a>
     </li>
 </ul>
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/notes.html b/InvenTree/company/templates/company/notes.html
index 467bf49d2d..5ee1706acd 100644
--- a/InvenTree/company/templates/company/notes.html
+++ b/InvenTree/company/templates/company/notes.html
@@ -27,7 +27,7 @@
             <h4>{% trans "Company Notes" %}</h4>
         </div>
         <div class='col-sm-6'>
-            <button title='{% trans "Edit notes" %}' class='btn btn-default btn-glyph float-right' id='edit-notes'><span class='glyphicon glyphicon-edit'></span></button>
+            <button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
         </div>
     </div>
     <hr>
diff --git a/InvenTree/company/templates/company/supplier_part_base.html b/InvenTree/company/templates/company/supplier_part_base.html
index 5083af4f3a..5a3d49a10e 100644
--- a/InvenTree/company/templates/company/supplier_part_base.html
+++ b/InvenTree/company/templates/company/supplier_part_base.html
@@ -19,12 +19,12 @@ src="{% static 'img/blank_image.png' %}"
 <h3>{% trans "Supplier Part" %}</h3>
 <p>{{ part.supplier.name }} - {{ part.SKU }}</p>
 <div class='btn-row'>
-    <div class='btn-group'>
-        <button type='button' class='btn btn-default btn-glyph' id='edit-part' title='Edit supplier part'>
-            <span class='glyphicon glyphicon-edit'/>
+    <div class='btn-group action-buttons' role='group'>
+        <button type='button' class='btn btn-default btn-glyph' id='edit-part' title='{% trans "Edit supplier part" %}'>
+            <span class='fas fa-edit icon-green'/>
         </button>
-        <button type='button' class='btn btn-default btn-glyph' id='delete-part' title='Delete supplier part'>
-            <span class='glyphicon glyphicon-trash'/>
+        <button type='button' class='btn btn-default btn-glyph' id='delete-part' title='{% trans "Delete supplier part" %}'>
+            <span class='fas fa-trash-alt icon-red'/>
         </button>
     </div>
 </div>
diff --git a/InvenTree/company/templates/company/supplier_part_pricing.html b/InvenTree/company/templates/company/supplier_part_pricing.html
index bed8d9ed35..080871ace7 100644
--- a/InvenTree/company/templates/company/supplier_part_pricing.html
+++ b/InvenTree/company/templates/company/supplier_part_pricing.html
@@ -36,8 +36,8 @@
                 {% decimal pb.cost %}
                 {% if pb.currency %}{{ pb.currency.suffix }}{% endif %}
                 <div class='btn-group' style='float: right;'>
-                    <button title='Edit Price Break' class='btn btn-default btn-sm pb-edit-button' type='button' url="{% url 'price-break-edit' pb.id %}"><span class='glyphicon glyphicon-edit'></span></button>
-                    <button title='Delete Price Break' class='btn btn-default btn-sm pb-delete-button' type='button' url="{% url 'price-break-delete' pb.id %}"><span class='glyphicon glyphicon-trash'></span></button>
+                    <button title='Edit Price Break' class='btn btn-default btn-sm pb-edit-button' type='button' url="{% url 'price-break-edit' pb.id %}"><span class='fas fa-edit icon-green'></span></button>
+                    <button title='Delete Price Break' class='btn btn-default btn-sm pb-delete-button' type='button' url="{% url 'price-break-delete' pb.id %}"><span class='fas fa-trash-alt icon-red'></span></button>
                 </div>
             </td>
         </tr>
diff --git a/InvenTree/company/templates/company/tabs.html b/InvenTree/company/templates/company/tabs.html
index 8e01bf30c0..9fd00ceb11 100644
--- a/InvenTree/company/templates/company/tabs.html
+++ b/InvenTree/company/templates/company/tabs.html
@@ -23,6 +23,6 @@
     </li>
     {% endif %}
     <li{% if tab == 'notes' %} class='active'{% endif %}>
-        <a href="{% url 'company-notes' company.id %}">{% trans "Notes" %}{% if company.notes %} <span class='glyphicon glyphicon-small glyphicon-info-sign'></span>{% endif %}</a>
+        <a href="{% url 'company-notes' company.id %}">{% trans "Notes" %}{% if company.notes %} <span class='fas fa-info-circle'></span>{% endif %}</a>
     </li>
 </ul>
diff --git a/InvenTree/order/templates/order/order_notes.html b/InvenTree/order/templates/order/order_notes.html
index 1d2c19c6cb..237098e10d 100644
--- a/InvenTree/order/templates/order/order_notes.html
+++ b/InvenTree/order/templates/order/order_notes.html
@@ -29,7 +29,7 @@
         <h4>{% trans "Order Notes" %}</h4>
     </div>
     <div class='col-sm-6'>
-        <button title='{% trans "Edit notes" %}' class='btn btn-default btn-glyph float-right' id='edit-notes'><span class='glyphicon glyphicon-edit'></span></button>
+        <button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
     </div>
 </div>
 <hr>
diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index d0e65e8f22..9c7c90ac26 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -40,7 +40,7 @@
             </td>
             <td>
                 <button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' title='Create new supplier part for {{ part }}' type='button'>
-                    <span part-id='{{ part.id }}' class='glyphicon glyphicon-small glyphicon-plus'></span>
+                    <span part-id='{{ part.id }}' class='fas fa-plus-circle'></span>
                 </button>
             </td>
             <td>
@@ -67,7 +67,7 @@
             </td>
             <td>
                 <button class='btn btn-default btn-remove' onclick='removeOrderRowFromOrderWizard()' id='del_item_{{ part.id }}' title='Remove part' type='button'>
-                    <span row='part_row_{{ part.id }}' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                    <span row='part_row_{{ part.id }}' class='fas fa-trash-alt icon-red'></span>
                 </button>
             </td>
         </tr>
diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html
index bd6c30f71b..a24c342e0f 100644
--- a/InvenTree/order/templates/order/order_wizard/select_pos.html
+++ b/InvenTree/order/templates/order/order_wizard/select_pos.html
@@ -45,7 +45,7 @@
                     title='Create new purchase order for {{ supplier.name }}'
                     type='button'
                     onclick='newPurchaseOrderFromOrderWizard()'>
-                    <span supplier-id='{{ supplier.id }}' class='glyphicon glyphicon-small glyphicon-plus'></span>
+                    <span supplier-id='{{ supplier.id }}' class='fas fa-plus-circle'></span>
                 </button>
             </td>
             <td>
diff --git a/InvenTree/order/templates/order/po_attachments.html b/InvenTree/order/templates/order/po_attachments.html
index e8e2b4bbff..388b7197b6 100644
--- a/InvenTree/order/templates/order/po_attachments.html
+++ b/InvenTree/order/templates/order/po_attachments.html
@@ -8,7 +8,7 @@
 
 {% include 'order/po_tabs.html' with tab='attachments' %}
 
-<h4>{% trans "Purchase Order Attachments" %}
+<h4>{% trans "Purchase Order Attachments" %}</h4>
 
 <hr>
 
@@ -34,10 +34,10 @@
             <td>
                 <div class='btn-group' style='float: right;'>    
                     <button type='button' class='btn btn-default btn-glyph attachment-edit-button' url="{% url 'po-attachment-edit' attachment.id %}" data-toggle='tooltip' title='{% trans "Edit attachment" %}'>
-                        <span class='glyphicon glyphicon-edit'/>
+                        <span class='fas fa-edit'/>
                     </button>
                     <button type='button' class='btn btn-default btn-glyph attachment-delete-button' url="{% url 'po-attachment-delete' attachment.id %}" data-toggle='tooltip' title='{% trans "Delete attachment" %}'>
-                        <span class='glyphicon glyphicon-trash'/>
+                        <span class='fas fa-trash-alt icon-red'/>
                     </button>
                 </div>
             </td>
diff --git a/InvenTree/order/templates/order/po_tabs.html b/InvenTree/order/templates/order/po_tabs.html
index a04c97eba5..d5c7286c3f 100644
--- a/InvenTree/order/templates/order/po_tabs.html
+++ b/InvenTree/order/templates/order/po_tabs.html
@@ -12,6 +12,6 @@
         </a>
     </li>
     <li{% ifequal tab 'notes' %} class='active'{% endifequal %}>
-        <a href="{% url 'po-notes' order.id %}">{% trans "Notes" %}{% if order.notes %} <span class='glyphicon glyphicon-small glyphicon-info-sign'></span>{% endif %}</a>
+        <a href="{% url 'po-notes' order.id %}">{% trans "Notes" %}{% if order.notes %} <span class='fas fa-info-circle'></span>{% endif %}</a>
     </li>
 </ul>
diff --git a/InvenTree/order/templates/order/receive_parts.html b/InvenTree/order/templates/order/receive_parts.html
index 3ebaa66889..f71959cdc0 100644
--- a/InvenTree/order/templates/order/receive_parts.html
+++ b/InvenTree/order/templates/order/receive_parts.html
@@ -41,7 +41,7 @@ Receive outstanding parts for <b>{{ order }}</b> - <i>{{ order.description }}</i
             </td>
             <td>
                 <button class='btn btn-default btn-remove' onClick="removeOrderRowFromOrderWizard()" id='del_item_{{ line.id }}' title='Remove line' type='button'>
-                    <span row='line_row_{{ line.id }}' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                    <span row='line_row_{{ line.id }}' class='fas fa-trash-alt icon-red'></span>
                 </button>
             </td>
         </tr>
diff --git a/InvenTree/order/templates/order/sales_order_notes.html b/InvenTree/order/templates/order/sales_order_notes.html
index 671b592569..959746667b 100644
--- a/InvenTree/order/templates/order/sales_order_notes.html
+++ b/InvenTree/order/templates/order/sales_order_notes.html
@@ -34,7 +34,7 @@ InvenTree | {% trans "Sales Order" %}
         <h4>{% trans "Order Notes" %}</h4>
     </div>
     <div class='col-sm-6'>
-        <button title='{% trans "Edit notes" %}' class='btn btn-default btn-glyph float-right' id='edit-notes'><span class='glyphicon glyphicon-edit'></span></button>
+        <button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
     </div>
 </div>
 <hr>
diff --git a/InvenTree/order/templates/order/so_attachments.html b/InvenTree/order/templates/order/so_attachments.html
index 82248fd5eb..ca4170beff 100644
--- a/InvenTree/order/templates/order/so_attachments.html
+++ b/InvenTree/order/templates/order/so_attachments.html
@@ -34,10 +34,10 @@
             <td>
                 <div class='btn-group' style='float: right;'>    
                     <button type='button' class='btn btn-default btn-glyph attachment-edit-button' url="{% url 'so-attachment-edit' attachment.id %}" data-toggle='tooltip' title='{% trans "Edit attachment" %}'>
-                        <span class='glyphicon glyphicon-edit'/>
+                        <span class='fas fa-edit'/>
                     </button>
                     <button type='button' class='btn btn-default btn-glyph attachment-delete-button' url="{% url 'so-attachment-delete' attachment.id %}" data-toggle='tooltip' title='{% trans "Delete attachment" %}'>
-                        <span class='glyphicon glyphicon-trash'/>
+                        <span class='fas fa-trash-alt icon-red'/>
                     </button>
                 </div>
             </td>
diff --git a/InvenTree/order/templates/order/so_tabs.html b/InvenTree/order/templates/order/so_tabs.html
index cb3740a073..95ccac7933 100644
--- a/InvenTree/order/templates/order/so_tabs.html
+++ b/InvenTree/order/templates/order/so_tabs.html
@@ -20,6 +20,6 @@
         </a>
     </li>
     <li{% ifequal tab 'notes' %} class='active'{% endifequal %}>
-        <a href="{% url 'so-notes' order.id %}">{% trans "Notes" %}{% if order.notes %} <span class='glyphicon glyphicon-small glyphicon-info-sign'></span>{% endif %}</a>
+        <a href="{% url 'so-notes' order.id %}">{% trans "Notes" %}{% if order.notes %} <span class='fas fa-info-circle'></span>{% endif %}</a>
     </li>
 </ul>
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html
index 88cb965eeb..b89a40e654 100644
--- a/InvenTree/part/templates/part/attachments.html
+++ b/InvenTree/part/templates/part/attachments.html
@@ -32,10 +32,10 @@
             <td>
                 <div class='btn-group' style='float: right;'>    
                     <button type='button' class='btn btn-default btn-glyph attachment-edit-button' url="{% url 'part-attachment-edit' attachment.id %}" data-toggle='tooltip' title='{% trans "Edit attachment" %}'>
-                        <span class='glyphicon glyphicon-edit'/>
+                        <span class='fas fa-edit'/>
                     </button>
                     <button type='button' class='btn btn-default btn-glyph attachment-delete-button' url="{% url 'part-attachment-delete' attachment.id %}" data-toggle='tooltip' title='{% trans "Delete attachment" %}'>
-                        <span class='glyphicon glyphicon-trash'/>
+                        <span class='fas fa-trash-alt icon-red'/>
                     </button>
                 </div>
             </td>
diff --git a/InvenTree/part/templates/part/bom_upload/select_fields.html b/InvenTree/part/templates/part/bom_upload/select_fields.html
index 21849f31f8..d49b1c12ce 100644
--- a/InvenTree/part/templates/part/bom_upload/select_fields.html
+++ b/InvenTree/part/templates/part/bom_upload/select_fields.html
@@ -38,7 +38,7 @@
                         <input type='hidden' name='col_name_{{ forloop.counter0 }}' value='{{ col.name }}'/>
                         {{ col.name }}
                         <button class='btn btn-default btn-remove' onClick='removeColFromBomWizard()' id='del_col_{{ forloop.counter0 }}' style='display: inline; float: right;' title='Remove column'>
-                            <span col_id='{{ forloop.counter0 }}' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                            <span col_id='{{ forloop.counter0 }}' class='fas fa-trash-alt icon-red'></span>
                         </button>
                     </div>
                 </th>
@@ -67,7 +67,7 @@
             <tr>
                 <td>
                     <button class='btn btn-default btn-remove' onClick='removeRowFromBomWizard()' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='Remove row'>
-                        <span row_id='{{ forloop.counter }}' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                        <span row_id='{{ forloop.counter }}' class='fas fa-trash-alt icon-red'></span>
                     </button>
                 </td>
                 <td>{{ forloop.counter }}</td>
diff --git a/InvenTree/part/templates/part/bom_upload/select_parts.html b/InvenTree/part/templates/part/bom_upload/select_parts.html
index 9faeacc3ea..f5851e5d43 100644
--- a/InvenTree/part/templates/part/bom_upload/select_parts.html
+++ b/InvenTree/part/templates/part/bom_upload/select_parts.html
@@ -48,7 +48,7 @@
             <tr {% if row.errors %} style='background: #ffeaea;'{% endif %} part-name='{{ row.part_name }}' part-description='{{ row.description }}' part-select='#select_part_{{ row.index }}'>
                 <td>
                     <button class='btn btn-default btn-remove' onClick='removeRowFromBomWizard()' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='Remove row'>
-                            <span row_id='{{ forloop.counter }}' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                            <span row_id='{{ forloop.counter }}' class='fas fa-trash-alt icon-red'></span>
                     </button>
                 </td>
                 <td>
@@ -58,7 +58,7 @@
                 <td>
                     {% if item.column.guess == 'Part' %}
                     <button class='btn btn-default btn-create'  onClick='newPartFromBomWizard()' id='new_part_row_{{ row.index }}' title='Create new part' type='button'>
-                        <span row_id='{{ row.index }}' class='glyphicon glyphicon-small glyphicon-plus'/>
+                        <span row_id='{{ row.index }}' class='fas fa-trash-alt icon-red'/>
                     </button>
 
                     <select class='select bomselect' id='select_part_{{ row.index }}' name='part_{{ row.index }}'>
diff --git a/InvenTree/part/templates/part/notes.html b/InvenTree/part/templates/part/notes.html
index 4aace0fdae..afa215600d 100644
--- a/InvenTree/part/templates/part/notes.html
+++ b/InvenTree/part/templates/part/notes.html
@@ -29,7 +29,7 @@
         <h4>{% trans "Part Notes" %}</h4>
     </div>
     <div class='col-sm-6'>
-        <button title='{% trans "Edit notes" %}' class='btn btn-default btn-glyph float-right' id='edit-notes'><span class='glyphicon glyphicon-edit'></span></button>
+        <button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
     </div>
 </div>
 <hr>
diff --git a/InvenTree/part/templates/part/params.html b/InvenTree/part/templates/part/params.html
index f1d575d2b7..8ad4f61252 100644
--- a/InvenTree/part/templates/part/params.html
+++ b/InvenTree/part/templates/part/params.html
@@ -1,24 +1,25 @@
 {% extends "part/part_base.html" %}
 {% load static %}
+{% load i18n %}
 {% block details %}
 
 {% include "part/tabs.html" with tab='params' %}
 
-<h4>Part Parameters</h4>
+<h4>{% trans "Part Parameters" %}</h4>
 <hr>
 
 <div id='button-toolbar'>
     <div class='button-toolbar container-fluid' style='float: right;'>
-        <button class='btn btn-success' id='param-create'>New Parameter</button>
+        <button title='{% trans "Add new parameter" %}' class='btn btn-success' id='param-create'>{% trans "New Parameter" %}</button>
     </div>
 </div>
 
 <table id='param-table' class='table table-condensed table-striped' data-toolbar='#button-toolbar'>
     <thead>
         <tr>
-            <th data-field='name' data-serachable='true'>Name</th>
-            <th data-field='value' data-searchable='true'>Value</th>
-            <th data-field='units' data-searchable='true'>Units</th>
+            <th data-field='name' data-serachable='true'>{% trans "Name" %}</th>
+            <th data-field='value' data-searchable='true'>{% trans "Value" %}</th>
+            <th data-field='units' data-searchable='true'>{% trans "Units" %}</th>
         </tr>
     </thead>
     <tbody>
@@ -29,8 +30,8 @@
             <td>
                 {{ param.template.units }}
                 <div class='btn-group' style='float: right;'>
-                    <button title='Edit' class='btn btn-default btn-glyph param-edit' url="{% url 'part-param-edit' param.id %}" type='button'><span class='glyphicon glyphicon-edit'/></button>
-                    <button title='Delete' class='btn btn-default btn-glyph param-delete' url="{% url 'part-param-delete' param.id %}" type='button'><span class='glyphicon glyphicon-trash'/></button>
+                    <button title='{% trans "Edit" %}' class='btn btn-default btn-glyph param-edit' url="{% url 'part-param-edit' param.id %}" type='button'><span class='fas fa-edit'/></button>
+                    <button title='{% trans "Delete" %}' class='btn btn-default btn-glyph param-delete' url="{% url 'part-param-delete' param.id %}" type='button'><span class='fas fa-trash-alt icon-red'/></button>
                 </div>
             </td>
         </tr>
diff --git a/InvenTree/part/templates/part/part_thumb.html b/InvenTree/part/templates/part/part_thumb.html
index 04efdd383f..e0314b1c7e 100644
--- a/InvenTree/part/templates/part/part_thumb.html
+++ b/InvenTree/part/templates/part/part_thumb.html
@@ -13,8 +13,8 @@
       </div>
       <div class='btn-row part-thumb-overlay'>
           <div class='btn-group'>
-              <button type='button' class='btn btn-default btn-glyph' title="{% trans 'Select from existing images' %}" id='part-image-select'><span class='glyphicon glyphicon-th'></span></button>
-              <button type='button' class='btn btn-default btn-glyph' title="{% trans 'Upload new image' %}" id='part-image-upload'><span class='glyphicon glyphicon-upload'></span></button>
+              <button type='button' class='btn btn-default btn-glyph' title="{% trans 'Select from existing images' %}" id='part-image-select'><span class='fas fa-th'></span></button>
+              <button type='button' class='btn btn-default btn-glyph' title="{% trans 'Upload new image' %}" id='part-image-upload'><span class='fas fa-file-image'></span></button>
           </div>
       </div>
     </div>
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/set_category.html b/InvenTree/part/templates/part/set_category.html
index 71c8cc9975..36898762b4 100644
--- a/InvenTree/part/templates/part/set_category.html
+++ b/InvenTree/part/templates/part/set_category.html
@@ -1,17 +1,18 @@
 {% extends "modal_form.html" %}
+{% load i18n %}
 
 {% block form %}
 <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
     {% load crispy_forms_tags %}
     
     <label class='control-label'>Parts</label>
-    <p class='help-block'>Set category for the following parts</p>
+    <p class='help-block'>{% trans "Set category for the following parts" %}</p>
     
     <table class='table table-striped'>
         <tr>
-            <th>Part</th>
-            <th>Description</th>
-            <th>Category</th>
+            <th>{% trans "Part" %}</th>
+            <th>{% trans "Description" %}</th>
+            <th>{% trans "Category" %}</th>
             <th>
             </tr>
             {% for part in parts %}
@@ -28,8 +29,8 @@
                     {{ part.category.pathstring }}
                 </td>
                 <td>
-                    <button class='btn btn-default btn-remove' onClick='removeRowFromModalForm()' title='Remove part' type='button'>
-                        <span row='part_row_{{ part.id }}' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                    <button class='btn btn-default btn-remove' onClick='removeRowFromModalForm()' title='{% trans "Remove part" %}' type='button'>
+                        <span row='part_row_{{ part.id }}' class='fas fa-trash-alt icon-red'></span>
                     </button>
                 </td>
             </tr>
diff --git a/InvenTree/stock/templates/stock/item_notes.html b/InvenTree/stock/templates/stock/item_notes.html
index c97830a59c..31e818ef71 100644
--- a/InvenTree/stock/templates/stock/item_notes.html
+++ b/InvenTree/stock/templates/stock/item_notes.html
@@ -29,7 +29,7 @@
         <h4>{% trans "Stock Item Notes" %}</h4>
     </div>
     <div class='col-sm-6'>
-        <button title='{% trans "Edit notes" %}' class='btn btn-default btn-glyph float-right' id='edit-notes'><span class='glyphicon glyphicon-edit'></span></button>
+        <button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
     </div>
 </div>
 <hr>
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 521e73bf7e..478776c421 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -9,24 +9,24 @@
     <h3>{{ location.name }}</h3>
     <p>{{ location.description }}</p>
     {% else %}
-    <h3>Stock</h3>
-    <p>All stock items</p>
+    <h3>{% trans "Stock" %}</h3>
+    <p>{% trans "All stock items" %}</p>
     {% endif %}
     <p>
         <div class='btn-group action-buttons'>
-            <button class='btn btn-default' id='location-create' title='Create new stock location'>
+            <button class='btn btn-default' id='location-create' title='{% trans "Create new stock location" %}'>
                 <span class='fas fa-plus-circle icon-green'/>
             </button>
             {% if location %}
             {% include "qr_button.html" %}
-            <button class='btn btn-default' id='location-count' title='Count stock items'>
+            <button class='btn btn-default' id='location-count' title='{% trans "Count stock items" %}'>
                 <span class='fas fa-clipboard-list'/>
             </button>
-            <button class='btn btn-default btn-glyph' id='location-edit' title='Edit stock location'>
+            <button class='btn btn-default btn-glyph' id='location-edit' title='{% trans "Edit stock location" %}'>
                 <span class='fas fa-edit icon-blue'/>
             </button>
-            <button class='btn btn-default btn-glyph' id='location-delete' title='Delete stock location'>
-                <span class='glyphicon glyphicon-trash icon-red'/>
+            <button class='btn btn-default btn-glyph' id='location-delete' title='{% trans "Delete stock location" %}'>
+                <span class='fas fa-trash-alt icon-red'/>
             </button>
             {% endif %}
         </div>
diff --git a/InvenTree/stock/templates/stock/stock_adjust.html b/InvenTree/stock/templates/stock/stock_adjust.html
index ac9fbce58d..566640544c 100644
--- a/InvenTree/stock/templates/stock/stock_adjust.html
+++ b/InvenTree/stock/templates/stock/stock_adjust.html
@@ -40,7 +40,7 @@
             <input type='hidden' name='stock-id-{{ item.id }}' value='{{ item.new_quantity }}'/>
             {% endif %}  
           </td>
-          <td><button class='btn btn-default btn-remove' onclick='removeStockRow()' id='del-{{ item.id }}' title='Remove item' type='button'><span row='stock-row-{{ item.id }}' class='glyphicon glyphicon-small glyphicon-remove'></span></button></td>
+          <td><button class='btn btn-default btn-remove' onclick='removeStockRow()' id='del-{{ item.id }}' title='Remove item' type='button'><span row='stock-row-{{ item.id }}' class='fas fa-trash-alt icon-red'></span></button></td>
       </tr>
       {% endfor %}
     </table>
diff --git a/InvenTree/stock/templates/stock/tabs.html b/InvenTree/stock/templates/stock/tabs.html
index 378f74e28e..62ee68bc4b 100644
--- a/InvenTree/stock/templates/stock/tabs.html
+++ b/InvenTree/stock/templates/stock/tabs.html
@@ -14,6 +14,6 @@
     </li>
     {% endif %}
     <li{% ifequal tab 'notes' %} class='active'{% endifequal %}>
-        <a href="{% url 'stock-item-notes' item.id %}">{% trans "Notes" %}{% if item.notes %} <span class='glyphicon glyphicon-small glyphicon-info-sign'></span>{% endif %}</a>
+        <a href="{% url 'stock-item-notes' item.id %}">{% trans "Notes" %}{% if item.notes %} <span class='fas fa-info-circle'></span>{% endif %}</a>
     </li>
 </ul>
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/currency.html b/InvenTree/templates/InvenTree/settings/currency.html
index 4eb9420f05..9c602a67fc 100644
--- a/InvenTree/templates/InvenTree/settings/currency.html
+++ b/InvenTree/templates/InvenTree/settings/currency.html
@@ -67,8 +67,8 @@
             {
                 formatter: function(value, row, index, field) {
 
-                    var bEdit = "<button title='Edit Currency' class='cur-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='glyphicon glyphicon-edit'></span></button>";
-                    var bDel = "<button title='Delete Currency' class='cur-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='glyphicon glyphicon-trash'></span></button>";
+                    var bEdit = "<button title='Edit Currency' class='cur-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>";
+                    var bDel = "<button title='Delete Currency' class='cur-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>";
 
                     var html = "<div class='btn-group' role='group'>" + bEdit + bDel + "</div>";
 
diff --git a/InvenTree/templates/InvenTree/settings/part.html b/InvenTree/templates/InvenTree/settings/part.html
index 2bbfaf2b03..96507c7ec6 100644
--- a/InvenTree/templates/InvenTree/settings/part.html
+++ b/InvenTree/templates/InvenTree/settings/part.html
@@ -1,14 +1,15 @@
 {% extends "InvenTree/settings/settings.html" %}
+{% load i18n %}
 
 {% block tabs %}
 {% include "InvenTree/settings/tabs.html" with tab='part' %}
 {% endblock %}
 
 {% block settings %}
-<h4>Part Parameter Templates</h4>
+<h4>{% transa "Part Parameter Templates" %}</h4>
 
 <div id='param-buttons'>
-    <button class='btn btn-success' id='new-param'>New Parameter</button>
+    <button class='btn btn-success' id='new-param'>{% trans "New Parameter" %}</button>
 </div>
 
 <table class='table table-striped table-condensed' id='param-table' data-toolbar='#param-buttons'>
@@ -24,7 +25,7 @@
         queryParams: {
             ordering: 'name',
         },
-        formatNoMatches: function() { return "No part parameter templates found"; },
+        formatNoMatches: function() { return '{% trans "No part parameter templates found" %}'; },
         columns: [
             {
                 field: 'pk',
@@ -43,8 +44,8 @@
             },
             {
                 formatter: function(value, row, index, field) {
-                    var bEdit = "<button title='Edit Template' class='template-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='glyphicon glyphicon-edit'></span></button>";
-                    var bDel = "<button title='Delete Template' class='template-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='glyphicon glyphicon-trash'></span></button>";
+                    var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>";
+                    var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>";
 
                     var html = "<div class='btn-group' role='group'>" + bEdit + bDel + "</div>";
 
diff --git a/InvenTree/templates/InvenTree/settings/tabs.html b/InvenTree/templates/InvenTree/settings/tabs.html
index c33f823be2..7b049e4fc6 100644
--- a/InvenTree/templates/InvenTree/settings/tabs.html
+++ b/InvenTree/templates/InvenTree/settings/tabs.html
@@ -1,16 +1,16 @@
 <ul class='nav nav-pills nav-stacked'>
     <li{% ifequal tab 'user' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-user' %}"><span class='glyphicon glyphicon-user'></span> User</a>
+        <a href="{% url 'settings-user' %}"><span class='fas fa-user'></span> User</a>
     </li>
     <li{% ifequal tab 'currency' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-currency' %}"><span class='glyphicon glyphicon-usd'></span> Currency</a>
+        <a href="{% url 'settings-currency' %}"><span class='fas fa-dollar-sign'></span> Currency</a>
     </li>
     <li{% ifequal tab 'part' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-part' %}"><span class='glyphicon glyphicon-briefcase'></span> Part</a>
+        <a href="{% url 'settings-part' %}"><span class='fas fa-shapes'></span> Part</a>
     </li>
     {% if user.is_staff %}
     <li{% ifequal tab 'other' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-other' %}"><span class='glyphicon glyphicon-cog'></span>Other</a>
+        <a href="{% url 'settings-other' %}"><span class='fas fa-cogs'></span> Other</a>
     </li>
     {% endif %}
 </ul>
\ No newline at end of file