diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 591a4a3760..19b92e2817 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -111,24 +111,20 @@
     color: rgb(13, 245, 25);
 }
 
-.glyphicon-ok {
-    color: #5C5;
+.icon-red {
+    color: #c55;
 }
 
-.glyphicon-ok-circle {
+.icon-green {
+    color: #5c5;
+}
+
+.icon-blue {
     color: #55c;
 }
 
-.glyphicon-remove {
-    color: #C55;
-}
-
-.glyphicon-trash {
-    color: #C55;
-}
-
-.glyphicon-plus {
-    color: #5C5;
+.icon-yellow {
+    color: #CC2;
 }
 
 /* CSS overrides for treeview */
@@ -330,11 +326,15 @@
     padding-bottom: 2px;
 }
 
-.btn-large {
-    font-size: 150%;
+.action-buttons .btn {
+    font-size: 175%;
     align-content: center;
     vertical-align: middle;
-}
+    padding-left: 6px;
+    padding-right: 6px;
+    padding-top: 3px;
+    padding-bottom: 2px;
+};
 
 .badge {
     float: right;
diff --git a/InvenTree/InvenTree/static/script/inventree/part.js b/InvenTree/InvenTree/static/script/inventree/part.js
index b7e5fc3155..92460a51a7 100644
--- a/InvenTree/InvenTree/static/script/inventree/part.js
+++ b/InvenTree/InvenTree/static/script/inventree/part.js
@@ -50,7 +50,7 @@ function toggleStar(options) {
                         {
                             method: 'POST',
                             success: function(response, status) {
-                                $(options.button).removeClass('glyphicon-star-empty').addClass('glyphicon-star');
+                                $(options.button).addClass('icon-yellow');
                             },
                         }
                     );
@@ -64,7 +64,7 @@ function toggleStar(options) {
                         {
                             method: 'DELETE',
                             success: function(response, status) {
-                                $(options.button).removeClass('glyphicon-star').addClass('glyphicon-star-empty');
+                                $(options.button).removeClass('icon-yellow');
                             },
                         }
                     );
diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html
index cd238a2299..f7c8ace219 100644
--- a/InvenTree/build/templates/build/build_base.html
+++ b/InvenTree/build/templates/build/build_base.html
@@ -22,21 +22,21 @@ src="{% static 'img/blank_image.png' %}"
 <hr>
 <h4>{{ build.quantity }} x {{ build.part.full_name }}</h4>
 <div class='btn-row'>
-    <div class='btn-group'>
-        <button type='button' class='btn btn-default btn-glyph' id='build-edit' title='Edit Build'>
-            <span class='glyphicon glyphicon-edit'/>
+    <div class='btn-group action-buttons'>
+        <button type='button' class='btn btn-default' id='build-edit' title='Edit Build'>
+            <span class='fas fa-edit icon-green'/>
         </button>
         {% if build.is_active %}
-        <button type='button' class='btn btn-default btn-glyph' id='build-complete' title="Complete Build">
-            <span class='glyphicon glyphicon-send'/>
+        <button type='button' class='btn btn-default' id='build-complete' title="Complete Build">
+            <span class='fas fa-paper-plane'/>
         </button>
         <button type='button' class='btn btn-default btn-glyph' id='build-cancel' title='Cancel Build'>
-            <span class='glyphicon glyphicon-remove'/>
+            <span class='fas fa-times-circle icon-red'/>
         </button>
         {% endif %}
         {% if build.status == BuildStatus.CANCELLED %}
         <button type='button' class='btn btn-default btn-glyph' id='build-delete' title='Delete Build'>
-            <span class='glyphicon glyphicon-trash'/>
+            <span class='fas fa-trash-alt icon-red'/>
         </button>
         {% endif %}
     </div>
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index 8e1a743d10..da73a7b7b3 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -23,17 +23,17 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
 <hr>
 <h4>{{ company.name }}</h4>
 <p>{{ company.description }}</p>
-<div class='btn-group'>
+<div class='btn-group action-buttons'>
     {% if company.is_supplier %}
-    <button type='button' class='btn btn-default btn-glyph' id='company-order-2' title='Create purchase order'>
-        <span class='glyphicon glyphicon-shopping-cart'/>
+    <button type='button' class='btn btn-default' id='company-order-2' title='Create purchase order'>
+        <span class='fas fa-shopping-cart'/>
     </button>
     {% endif %}
-    <button type='button' class='btn btn-default btn-glyph' id='company-edit' title='Edit company information'>
-        <span class='glyphicon glyphicon-edit'/>
+    <button type='button' class='btn btn-default' id='company-edit' title='Edit company information'>
+        <span class='fas fa-edit icon-green'/>
     </button>
-    <button type='button' class='btn btn-default btn-glyph' id='company-delete' title='Delete company'>
-        <span class='glyphicon glyphicon-trash'/>
+    <button type='button' class='btn btn-default' id='company-delete' title='Delete company'>
+        <span class='fas fa-trash-alt icon-red'/>
     </button>
 </div>
 {% endblock %}
diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html
index 3840457a5e..85d766a02e 100644
--- a/InvenTree/order/templates/order/order_base.html
+++ b/InvenTree/order/templates/order/order_base.html
@@ -26,27 +26,27 @@ src="{% static 'img/blank_image.png' %}"
 <p>{{ order.description }}</p>
 <p>
     <div class='btn-row'>
-        <div class='btn-group'>
-            <button type='button' class='btn btn-default btn-glyph btn-large' id='edit-order' title='Edit order information'>
+        <div class='btn-group action-buttons'>
+            <button type='button' class='btn btn-default' id='edit-order' title='Edit order information'>
                 <span class='fas fa-edit'></span>
             </button>
-            <button type='button' class='btn btn-default btn-glyph btn-large' id='export-order' title='Export order to file'>
+            <button type='button' class='btn btn-default' id='export-order' title='Export order to file'>
                 <span class='fas fa-file-download'></span>
             </button>
             {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %}
-            <button type='button' class='btn btn-default btn-glyph btn-large' id='place-order' title='Place order'>
+            <button type='button' class='btn btn-default' id='place-order' title='Place order'>
                 <span class='fas fa-paper-plane'></span>
             </button>
             {% elif order.status == OrderStatus.PLACED %}
-            <button type='button' class='btn btn-default btn-glyph btn-large' id='receive-order' title='Receive items'>
+            <button type='button' class='btn btn-default' id='receive-order' title='Receive items'>
                 <span class='fas fa-clipboard-check'></span>
             </button>
-            <button type='button' class='btn btn-default btn-glyph btn-large' id='complete-order' title='Mark order as complete'>
+            <button type='button' class='btn btn-default' id='complete-order' title='Mark order as complete'>
                 <span class='fas fa-check-circle'></span>
             </button>
             {% endif %}
             {% if order.status == OrderStatus.PENDING or order.status == OrderStatus.PLACED %}
-            <button type='button' class='btn btn-default btn-glyph btn-large' id='cancel-order' title='Cancel order'>
+            <button type='button' class='btn btn-default' id='cancel-order' title='Cancel order'>
                 <span class='fas fa-times-circle'></span>
             </button>
             {% endif %}
diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html
index 77db9793dc..85eaeb6ba8 100644
--- a/InvenTree/order/templates/order/sales_order_base.html
+++ b/InvenTree/order/templates/order/sales_order_base.html
@@ -33,11 +33,11 @@ src="{% static 'img/blank_image.png' %}"
 <h4>{{ order }}</h4>
 <p>{{ order.description }}</p>
 <div class='btn-row'>
-    <div class='btn-group'>
-        <button type='button' class='btn btn-default btn-glyph btn-large' id='edit-order' title='Edit order information'>
+    <div class='btn-group action-buttons'>
+        <button type='button' class='btn btn-default' id='edit-order' title='Edit order information'>
             <span class='fas fa-edit'></span>
         </button>
-        <button type='button' class='btn btn-default btn-glyph btn-large' id='packing-list' title='{% trans "Packing List" %}'>
+        <button type='button' class='btn btn-default' id='packing-list' title='{% trans "Packing List" %}'>
             <span class='fas fa-clipboard-list'></span>
         </button>
     </div>
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 9382259cce..672edfb587 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -14,16 +14,16 @@
         <p>{% trans "All parts" %}</p>
         {% endif %}
         <p>
-            <div class='btn-group'>
-                <button class='btn btn-default btn-glyph' id='cat-create' title='Create new part category'>
-                    <span class='glyphicon glyphicon-plus'/>
+            <div class='btn-group action-buttons'>
+                <button class='btn btn-default' id='cat-create' title='Create new part category'>
+                    <span class='fas fa-plus-circle icon-green'/>
                 </button>
                 {% if category %}
-                <button class='btn btn-default btn-glyph' id='cat-edit' title='Edit part category'>
-                    <span class='glyphicon glyphicon-edit'/>
+                <button class='btn btn-default' id='cat-edit' title='Edit part category'>
+                    <span class='fas fa-edit icon-blue'/>
                 </button>
-                <button class='btn btn-default btn-glyph' id='cat-delete' title='Delete part category'>
-                    <span class='glyphicon glyphicon-trash'/>
+                <button class='btn btn-default' id='cat-delete' title='Delete part category'>
+                    <span class='fas fa-trash-alt icon-red'/>
                 </button>
                 {% endif %}
             </div>
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index c4f0483ec2..0c329c72be 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -34,37 +34,37 @@
         <p><i>{{ part.description }}</i></p>
         <p>
             <div class='btn-row'>
-                <div class='btn-group'>
-                    <button type='button' class='btn btn-default btn-glyph' id='toggle-starred' title='{% trans "Star this part" %}'>
-                        <span id='part-star-icon' class='starred-part glyphicon {% if starred %}glyphicon-star{% else %}glyphicon-star-empty{% endif %}'/>
+                <div class='btn-group action-buttons'>
+                    <button type='button' class='btn btn-default' id='toggle-starred' title='{% trans "Star this part" %}'>
+                        <span id='part-star-icon' class='fas fa-star {% if starred %}icon-yellow{% endif %}'/>
                     </button>
                     {% if part.is_template == False %}
                     {% include "qr_button.html" %}
                     {% if part.active %}
-                    <button type='button' class='btn btn-default btn-glyph' id='price-button' title='{% trans "Show pricing information" %}'>
-                        <span id='part-price-icon' class='part-price glyphicon glyphicon-usd'/>
+                    <button type='button' class='btn btn-default' id='price-button' title='{% trans "Show pricing information" %}'>
+                        <span id='part-price-icon' class='fas fa-dollar-sign'/>
                     </button>
                     {% if not part.virtual %}
-                    <button type='button' class='btn btn-default btn-glyph' id='part-count' title='Count part stock'>
-                        <span class='glyphicon glyphicon-ok-circle'/>
+                    <button type='button' class='btn btn-default' id='part-count' title='Count part stock'>
+                        <span class='fas fa-clipboard-list'/>
                     </button>
                     {% endif %}
                     {% if part.purchaseable %}
-                    <button type='button' class='btn btn-default btn-glyph' id='part-order' title='Order part'>
-                        <span id='part-order-icon' class='part-order glyphicon glyphicon-shopping-cart'/>
+                    <button type='button' class='btn btn-default' id='part-order' title='Order part'>
+                        <span id='part-order-icon' class='fas fa-shopping-cart'/>
                     </button>
                     {% endif %}
                     {% endif %}
                     {% endif %}
-                    <button type='button' class='btn btn-default btn-glyph' id='part-duplicate' title='Duplicate part'>
-                        <span id='part-duplicate-icon' class='part-duplicate glyphicon glyphicon-duplicate'/>
+                    <button type='button' class='btn btn-default' id='part-duplicate' title='Duplicate part'>
+                        <span id='part-duplicate-icon' class='fas fa-copy'/>
                     </button>
-                    <button type='button' class='btn btn-default btn-glyph' id='part-edit' title='Edit part'>
-                        <span id='part-edit-icon' class='glyphicon glyphicon-edit'/>
+                    <button type='button' class='btn btn-default' id='part-edit' title='Edit part'>
+                        <span id='part-edit-icon' class='fas fa-edit icon-blue'/>
                     </button>
                     {% if not part.active %}
-                    <button type='button' class='btn btn-default btn-glyph' id='part-delete' title='Delete part'>
-                        <span id='part-delete-icon' class='glyphicon glyphicon-trash'/>
+                    <button type='button' class='btn btn-default' id='part-delete' title='Delete part'>
+                        <span id='part-delete-icon' class='fas fa-trash-alt icon-red'/>
                     </button>
                     {% endif %}
                 </div>
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index e0a69e15fb..c90a062fa1 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -63,38 +63,38 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 {% endif %}
 </h4>
 
-<div class='btn-group'>
+<div class='btn-group action-buttons'>
     {% include "qr_button.html" %}
     {% if item.in_stock %}
     {% if not item.serialized %}
-    <button type='button' class='btn btn-default btn-glyph' id='stock-add' title='Add to stock'>
-        <span class='glyphicon glyphicon-plus-sign' style='color: #1a1;'/>
+    <button type='button' class='btn btn-default' id='stock-add' title='Add to stock'>
+        <span class='fas fa-plus-circle' style='color: #1a1;'/>
     </button>
-    <button type='button' class='btn btn-default btn-glyph' id='stock-remove' title='Take from stock'>
-        <span class='glyphicon glyphicon-minus-sign' style='color: #a11;'/>
+    <button type='button' class='btn btn-default' id='stock-remove' title='Take from stock'>
+        <span class='fas fa-minus-circle' style='color: #a11;'/>
     </button>
-    <button type='button' class='btn btn-default btn-glyph' id='stock-count' title='Count stock'>
-        <span class='glyphicon glyphicon-ok-circle'/>
+    <button type='button' class='btn btn-default' id='stock-count' title='Count stock'>
+        <span class='fas fa-clipboard-list'/>
     </button>
     {% if item.part.trackable %}
-    <button type='button' class='btn btn-default btn-glyph' id='stock-serialize' title='Serialize stock'>
-        <span class='glyphicon glyphicon-th-list'/>
+    <button type='button' class='btn btn-default' id='stock-serialize' title='Serialize stock'>
+        <span class='fas fa-hashtag'/>
     </button>
     {% endif %}
     {% endif %}
-    <button type='button' class='btn btn-default btn-glyph' id='stock-move' title='Transfer stock'>
-        <span class='glyphicon glyphicon-transfer' style='color: #11a;'/>
+    <button type='button' class='btn btn-default' id='stock-move' title='Transfer stock'>
+        <span class='fas fa-exchange-alt icon-blue'/>
     </button>
-    <button type='button' class='btn btn-default btn-glyph' id='stock-duplicate' title='Duplicate stock item'>
-        <span class='glyphicon glyphicon-duplicate'/>
+    <button type='button' class='btn btn-default' id='stock-duplicate' title='Duplicate stock item'>
+        <span class='fas fa-copy'/>
     </button>
     {% endif %}
-    <button type='button' class='btn btn-default btn-glyph' id='stock-edit' title='Edit stock item'>
-        <span class='glyphicon glyphicon-edit'/>
+    <button type='button' class='btn btn-default' id='stock-edit' title='Edit stock item'>
+        <span class='fas fa-edit'/>
     </button>
     {% if item.can_delete %}
-    <button type='button' class='btn btn-default btn-glyph' id='stock-delete' title='Edit stock item'>
-        <span class='glyphicon glyphicon-trash'/>
+    <button type='button' class='btn btn-default' id='stock-delete' title='Edit stock item'>
+        <span class='fas fa-trash-alt icon-red'/>
     </button>
     {% endif %}
 </div>
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 7117e54c60..f7b5a7a70d 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -13,20 +13,20 @@
     <p>All stock items</p>
     {% endif %}
     <p>
-        <div class='btn-group'>
-            <button class='btn btn-default btn-glyph' id='location-create' title='Create new stock location'>
-                <span class='glyphicon glyphicon-plus'/>
+        <div class='btn-group action-buttons'>
+            <button class='btn btn-default' id='location-create' title='Create new stock location'>
+                <span class='fas fa-plus-circle icon-green'/>
             </button>
             {% if location %}
             {% include "qr_button.html" %}
-            <button class='btn btn-default btn-glyph' id='location-count' title='Count stock items'>
-                <span class='glyphicon glyphicon-ok-circle'/>
+            <button class='btn btn-default' id='location-count' title='Count stock items'>
+                <span class='fas fa-clipboard-list'/>
             </button>
             <button class='btn btn-default btn-glyph' id='location-edit' title='Edit stock location'>
-                <span class='glyphicon glyphicon-edit'/>
+                <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'/>
+                <span class='glyphicon glyphicon-trash icon-red'/>
             </button>
             {% endif %}
         </div>
diff --git a/InvenTree/templates/qr_button.html b/InvenTree/templates/qr_button.html
index 7aafd834bc..cc10e0cd26 100644
--- a/InvenTree/templates/qr_button.html
+++ b/InvenTree/templates/qr_button.html
@@ -1 +1 @@
-<button type='button' class='btn btn-default btn-glyph' id='show-qr-code' title='Show QR code'><span class='glyphicon glyphicon-qrcode'></span></button>
\ No newline at end of file
+<button type='button' class='btn btn-default' id='show-qr-code' title='Show QR code'><span class='fas fa-qrcode'></span></button>
\ No newline at end of file