diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 7c6afebf33..ea5efc59e9 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -512,22 +512,6 @@
     width: 30%;
 }
 
-/* !pricing table widths */
-
-.action-button {
-    font-size: 125%;
-}
-
-.action-buttons .btn {
-    font-size: 175%;
-    align-content: center;
-    vertical-align: middle;
-    padding-left: 6px;
-    padding-right: 6px;
-    padding-top: 3px;
-    padding-bottom: 2px;
-}
-
 .panel-heading .badge {
     float: right;
 }
diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index 3e4da8a7c9..c1cfed21bf 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -10,7 +10,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-details'>
+<div class='panel panel-inventree panel-hidden' id='panel-details'>
     <div class='panel-heading'>
         <h4>{% trans "Build Details" %}</h4>
     </div>
@@ -152,7 +152,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-children'>
+<div class='panel panel-inventree panel-hidden' id='panel-children'>
     <div class='panel-heading'>
         <h4>{% trans "Child Build Orders" %}</h4>
     </div>
@@ -168,7 +168,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-allocate'>
+<div class='panel panel-inventree panel-hidden' id='panel-allocate'>
     <div class='panel-heading'>
         <h4>{% trans "Allocate Stock to Build" %}</h4>
     </div>
@@ -219,7 +219,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-outputs'>
+<div class='panel panel-inventree panel-hidden' id='panel-outputs'>
     <div class='panel-heading'>
         <h4>{% trans "Incomplete Build Outputs" %}</h4>
     </div>
@@ -248,7 +248,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-completed'>
+<div class='panel panel-inventree panel-hidden' id='panel-completed'>
     <div class='panel-heading'>
         <h4>
             {% trans "Completed Build Outputs" %}
@@ -260,7 +260,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-attachments'>
+<div class='panel panel-inventree panel-hidden' id='panel-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -269,7 +269,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-notes'>
+<div class='panel panel-inventree panel-hidden' id='panel-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index c3f2af2a87..418fc38e65 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -9,7 +9,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-supplier-parts'>
+<div class='panel panel-inventree panel-hidden' id='panel-supplier-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Parts" %}</h4>
     </div>
@@ -53,7 +53,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-manufacturer-parts'>
+<div class='panel panel-inventree panel-hidden' id='panel-manufacturer-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Manufacturer Parts" %}</h4>
     </div>
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-company-stock'>
+<div class='panel panel-inventree panel-hidden' id='panel-company-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Stock" %}</h4>
     </div>
@@ -105,7 +105,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-purchase-orders'>
+<div class='panel panel-inventree panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Orders" %}</h4>
     </div>
@@ -127,7 +127,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-sales-orders'>
+<div class='panel panel-inventree panel-hidden' id='panel-sales-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Sales Orders" %}</h4>
     </div>
@@ -150,7 +150,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-assigned-stock'>
+<div class='panel panel-inventree panel-hidden' id='panel-assigned-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Assigned Stock" %}</h4>
     </div>
@@ -166,7 +166,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-company-notes'>
+<div class='panel panel-inventree panel-hidden' id='panel-company-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index 43c1cebefe..6339cb0545 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -100,7 +100,7 @@ src="{% static 'img/blank_image.png' %}"
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-supplier-parts'>
+<div class='panel panel-inventree panel-hidden' id='panel-supplier-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Suppliers" %}</h4>
     </div>
@@ -124,7 +124,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-parameters'>
+<div class='panel panel-inventree panel-hidden' id='panel-parameters'>
     <div class='panel-heading'>
         <h4>{% trans "Parameters" %}</h4>
     </div>
diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html
index ae69703fd6..b6e3a4507e 100644
--- a/InvenTree/company/templates/company/supplier_part.html
+++ b/InvenTree/company/templates/company/supplier_part.html
@@ -133,7 +133,7 @@ src="{% static 'img/blank_image.png' %}"
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-stock'>
+<div class='panel panel-inventree panel-hidden' id='panel-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Part Stock" %}</h4>
     </div>
@@ -142,7 +142,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-purchase-orders'>
+<div class='panel panel-inventree panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Part Orders" %}</h4>
     </div>
@@ -160,7 +160,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-pricing'>
+<div class='panel panel-inventree panel-hidden' id='panel-pricing'>
     <div class='panel-heading'>
         <h4>{% trans "Pricing Information" %}</h4>
     </div>
diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html
index 7c2dea1af9..35cf552159 100644
--- a/InvenTree/order/templates/order/order_wizard/po_upload.html
+++ b/InvenTree/order/templates/order/order_wizard/po_upload.html
@@ -21,7 +21,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree' id='panel-upload-file'>
+<div class='panel panel-inventree' id='panel-upload-file'>
     <div class='panel-heading'>
         {% block heading %}
         <h4>{% trans "Upload File for Purchase Order" %}</h4>
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index 987ab79d58..b3b03fb31d 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -12,7 +12,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-items'>
+<div class='panel panel-inventree panel-hidden' id='panel-order-items'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Order Items" %}</h4>
     </div>
@@ -42,7 +42,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-received-items'>
+<div class='panel panel-inventree panel-hidden' id='panel-received-items'>
     <div class='panel-heading'>
         <h4>{% trans "Received Items" %}</h4>
     </div>
@@ -51,7 +51,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-attachments'>
+<div class='panel panel-inventree panel-hidden' id='panel-order-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Order Attachments" %}</h4>
     </div>
@@ -60,7 +60,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-notes'>
+<div class='panel panel-inventree panel-hidden' id='panel-order-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html
index cddba74cd6..c6b97b6847 100644
--- a/InvenTree/order/templates/order/sales_order_detail.html
+++ b/InvenTree/order/templates/order/sales_order_detail.html
@@ -12,7 +12,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-items'>
+<div class='panel panel-inventree panel-hidden' id='panel-order-items'>
     <div class='panel-heading'>
         <h4>{% trans "Sales Order Items" %}</h4>
     </div>
@@ -33,7 +33,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-builds'>
+<div class='panel panel-inventree panel-hidden' id='panel-order-builds'>
     <div class='panel-heading'>
         <h4>{% trans "Build Orders" %}</h4>
     </div>
@@ -42,7 +42,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-attachments'>
+<div class='panel panel-inventree panel-hidden' id='panel-order-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -51,7 +51,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-order-notes'>
+<div class='panel panel-inventree panel-hidden' id='panel-order-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/part/templates/part/bom_upload/upload_file.html b/InvenTree/part/templates/part/bom_upload/upload_file.html
index 2fa60c5575..38d7792dd1 100644
--- a/InvenTree/part/templates/part/bom_upload/upload_file.html
+++ b/InvenTree/part/templates/part/bom_upload/upload_file.html
@@ -21,7 +21,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree' id='panel-upload-file'>
+<div class='panel panel-inventree' id='panel-upload-file'>
     <div class='panel-heading'>
         {% block heading %}
         <h4>{% trans "Upload Bill of Materials" %}</h4>
diff --git a/InvenTree/part/templates/part/cat_link.html b/InvenTree/part/templates/part/cat_link.html
index fd6ca31c07..274cb83710 100644
--- a/InvenTree/part/templates/part/cat_link.html
+++ b/InvenTree/part/templates/part/cat_link.html
@@ -6,5 +6,8 @@
 {% for path_item in category.parentpath %}
 <li class="breadcrumb-item"><a href="{% url 'category-detail' path_item.id %}">{{ path_item.name }}</a></li>
 {% endfor %}
-<li class="breadcrumb-item active" aria-current="page"><a href="{% url 'category-detail' category.id %}">{{ category.name }}</a></li>
+<li class="breadcrumb-item"><a href="{% url 'category-detail' category.id %}">{{ category.name }}</a></li>
 {% endif %}
+{% if part %}
+<li class="breadcrumb-item" aria-current="page"><a href="{% url 'part-detail' part.id %}">{{ part.name }}</a></li>
+{% endif %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 41f6437e6d..8f62afd557 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -17,7 +17,7 @@
 {% endif %}
 
 
-<div class='panel panel-default panel-inventree'>
+<div class='panel panel-inventree'>
     <div class='row'>
         <div class='col-sm-6'>
             {% if category %}
@@ -115,7 +115,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-parts'>
+<div class='panel panel-inventree panel-hidden' id='panel-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Parts" %}</h4>
     </div>
@@ -160,7 +160,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-parameters'>
+<div class='panel panel-inventree panel-hidden' id='panel-parameters'>
     <div class='panel-heading'>
         <h4>{% trans "Part Parameters" %}</h4>
     </div>
@@ -170,7 +170,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-subcategories'>
+<div class='panel panel-inventree panel-hidden' id='panel-subcategories'>
     <div class='panel-heading'>
         <h4>{% trans "Subcategories" %}</h4>
     </div>
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index d55b2511b2..65d47678e0 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -11,7 +11,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-part-stock'>
+<div class='panel panel-inventree panel-hidden' id='panel-part-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Part Stock" %}</h4>
     </div>
@@ -25,7 +25,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-test-templates'>
+<div class='panel panel-inventree panel-hidden' id='panel-test-templates'>
     <div class='panel-heading'>
         <h4>{% trans "Part Test Templates" %}</h4>
     </div>
@@ -45,7 +45,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-purchase-orders'>
+<div class='panel panel-inventree panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Orders" %}</h4>
     </div>
@@ -66,7 +66,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-sales-orders'>
+<div class='panel panel-inventree panel-hidden' id='panel-sales-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Sales Orders" %}</h4>
     </div>
@@ -94,11 +94,11 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-pricing'>
+<div class='panel panel-inventree panel-hidden' id='panel-pricing'>
     {% include "part/prices.html" %}
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-part-notes'>
+<div class='panel panel-inventree panel-hidden' id='panel-part-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
@@ -121,11 +121,11 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-pricing'>
+<div class='panel panel-inventree panel-hidden' id='panel-pricing'>
     <!-- TODO -->
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-variants'>
+<div class='panel panel-inventree panel-hidden' id='panel-variants'>
     <div class='panel-heading'>
         <h4>{% trans "Part Variants" %}</h4>
     </div>
@@ -150,7 +150,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-part-parameters'>
+<div class='panel panel-inventree panel-hidden' id='panel-part-parameters'>
     <div class='panel-heading'>
         <h4>{% trans "Parameters" %}</h4>
     </div>
@@ -168,7 +168,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-part-attachments'>
+<div class='panel panel-inventree panel-hidden' id='panel-part-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -177,7 +177,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-related-parts'>
+<div class='panel panel-inventree panel-hidden' id='panel-related-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Related Parts" %}</h4>
     </div>
@@ -223,7 +223,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-bom'>
+<div class='panel panel-inventree panel-hidden' id='panel-bom'>
     <div class='panel-heading'>
         <h4>{% trans "Bill of Materials" %}</h4>
     </div>
@@ -232,7 +232,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-used-in'>
+<div class='panel panel-inventree panel-hidden' id='panel-used-in'>
     <div class='panel-heading'>
         <h4>{% trans "Assemblies" %}</h4>
     </div>
@@ -248,7 +248,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-build-orders'>
+<div class='panel panel-inventree panel-hidden' id='panel-build-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Part Builds" %}</h4>
     </div>
@@ -278,7 +278,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-suppliers'>
+<div class='panel panel-inventree panel-hidden' id='panel-suppliers'>
     <div class='panel-heading'>
         <h4>{% trans "Part Suppliers" %}</h4>
     </div>
diff --git a/InvenTree/part/templates/part/import_wizard/part_upload.html b/InvenTree/part/templates/part/import_wizard/part_upload.html
index b898cfbc98..344cd3e881 100644
--- a/InvenTree/part/templates/part/import_wizard/part_upload.html
+++ b/InvenTree/part/templates/part/import_wizard/part_upload.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block content %}
-    <div class='panel panel-default panel-inventree'>
+    <div class='panel panel-inventree'>
         <div class='panel-heading'>
             <h4>
                 {% trans "Import Parts from File" %}
diff --git a/InvenTree/part/templates/part/part_app_base.html b/InvenTree/part/templates/part/part_app_base.html
index 9476a6ec25..ec26dac282 100644
--- a/InvenTree/part/templates/part/part_app_base.html
+++ b/InvenTree/part/templates/part/part_app_base.html
@@ -19,7 +19,7 @@
 
 {% block breadcrumbs %}
 {% if part %}
-{% include "part/cat_link.html" with category=part.category %}
+{% include "part/cat_link.html" with category=part.category part=part %}
 {% else %}
 {% include 'part/cat_link.html' with category=category %}
 {% endif %}
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 9d3d94829c..788fa13a24 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -10,7 +10,7 @@
 
 {% block content %}
 
-<div class="panel panel-default panel-inventree">
+<div class="panel panel-inventree">
     <!-- Default panel contents -->
     <div class="panel-heading"><h3>{{ part.full_name }}</h3></div>
     <div class="panel-body">
@@ -64,39 +64,39 @@
                     </h3>
                 </p>
 
-                <div class='btn-group action-buttons' role='group'>
-                    <button type='button' class='btn btn-default' id='toggle-starred' title='{% trans "Star this part" %}'>
+                <div class='btn-group' role='group'>
+                    <button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Star this part" %}'>
                         <span id='part-star-icon' class='fas fa-star {% if starred %}icon-yellow{% endif %}'/>
                     </button>
 
                     {% if barcodes %}
                     <!-- Barcode actions menu -->
                     <div class='btn-group'>
-                        <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-default dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-qrcode'></span> <span class='caret'></span></button>
+                        <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'><span class='fas fa-qrcode'></span> <span class='caret'></span></button>
                         <ul class='dropdown-menu'>
-                            <li><a href='#' id='show-qr-code'><span class='fas fa-qrcode'></span> {% trans "Show QR Code" %}</a></li>
-                            <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
+                            <li><a class='dropdown-item' href='#' id='show-qr-code'><span class='fas fa-qrcode'></span> {% trans "Show QR Code" %}</a></li>
+                            <li><a class='dropdown-item' href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
                         </ul>
                     </div>
                     {% endif %}
                     {% if part.active %}
-                    <button type='button' class='btn btn-default' id='price-button' title='{% trans "Show pricing information" %}'>
+                    <button type='button' class='btn btn-outline-secondary' id='price-button' title='{% trans "Show pricing information" %}'>
                         <span id='part-price-icon' class='fas fa-dollar-sign'/>
                     </button>
                     {% if roles.stock.change %}
                     <div class='btn-group'>
-                        <button id='stock-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-bs-toggle='dropdown'>
+                        <button id='stock-actions' title='{% trans "Stock actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
                             <span class='fas fa-boxes'></span> <span class='caret'></span>
                         </button>
                         <ul class='dropdown-menu'>
                             <li>
-                                <a href='#' id='part-count'>
+                                <a class='dropdown-item' href='#' id='part-count'>
                                     <span class='fas fa-clipboard-list'></span>
                                     {% trans "Count part stock" %}
                                 </a>
                             </li>
                             <li>
-                                <a href='#' id='part-move'>
+                                <a class='dropdown-item' href='#' id='part-move'>
                                     <span class='fas fa-exchange-alt'></span>
                                     {% trans "Transfer part stock" %}
                                 </a>
@@ -105,7 +105,7 @@
                     </div>
                     {% endif %}
                     {% if part.purchaseable and roles.purchase_order.add %}
-                    <button type='button' class='btn btn-default' id='part-order' title='{% trans "Order part" %}'>
+                    <button type='button' class='btn btn-outline-secondary' id='part-order' title='{% trans "Order part" %}'>
                         <span id='part-order-icon' class='fas fa-shopping-cart'/>
                     </button>
                     {% endif %}
@@ -113,16 +113,16 @@
                     <!-- Part actions -->
                     {% if roles.part.add or roles.part.change or roles.part.delete %}
                     <div class='btn-group'>
-                        <button id='part-actions' title='{% trans "Part actions" %}' class='btn btn-default dropdown-toggle' type='button' data-bs-toggle='dropdown'> <span class='fas fa-shapes'></span> <span class='caret'></span></button>
+                        <button id='part-actions' title='{% trans "Part actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'> <span class='fas fa-shapes'></span> <span class='caret'></span></button>
                         <ul class='dropdown-menu'>
                             {% if roles.part.add %}
-                            <li><a href='#' id='part-duplicate'><span class='fas fa-copy'></span> {% trans "Duplicate part" %}</a></li>
+                            <li><a class='dropdown-item' href='#' id='part-duplicate'><span class='fas fa-copy'></span> {% trans "Duplicate part" %}</a></li>
                             {% endif %}
                             {% if roles.part.change %}
-                            <li><a href='#' id='part-edit'><span class='fas fa-edit icon-blue'></span> {% trans "Edit part" %}</a></li>
+                            <li><a class='dropdown-item' href='#' id='part-edit'><span class='fas fa-edit icon-blue'></span> {% trans "Edit part" %}</a></li>
                             {% endif %}
                             {% if roles.part.delete %}
-                            <li><a href='#' id='part-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete part" %}</a></li>
+                            <li><a class='dropdown-item' href='#' id='part-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete part" %}</a></li>
                             {% endif %}
                         </ul>
                     </div>
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index 0ac9c285a6..172c0e0a7f 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -12,7 +12,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-history'>
+<div class='panel panel-inventree panel-hidden' id='panel-history'>
     <div class='panel-heading'>
         <h4>{% trans "Stock Tracking Information" %}</h4>
     </div>
@@ -38,7 +38,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-children'>
+<div class='panel panel-inventree panel-hidden' id='panel-children'>
     <div class='panel-heading'>
         <h4>{% trans "Child Stock Items" %}</h4>
     </div>
@@ -53,7 +53,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-test-data'>
+<div class='panel panel-inventree panel-hidden' id='panel-test-data'>
     <div class='panel-heading'>
         <h4>{% trans "Test Data" %}</h4>
     </div>
@@ -83,7 +83,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-attachments'>
+<div class='panel panel-inventree panel-hidden' id='panel-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -92,7 +92,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-notes'>
+<div class='panel panel-inventree panel-hidden' id='panel-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
@@ -115,7 +115,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-installed-items'>
+<div class='panel panel-inventree panel-hidden' id='panel-installed-items'>
     <div class='panel-heading'>
         <h4>{% trans "Installed Stock Items" %}</h4>
     </div>
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 0181f62c61..30ae429172 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -9,7 +9,7 @@
 
 {% block content %}
 
-<div class='panel panel-default panel-inventree'>
+<div class='panel panel-inventree'>
 
     <div class='panel-heading'>
         <h4>
@@ -147,7 +147,7 @@
 
 {% block location_content %}
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-stock'>
+<div class='panel panel-inventree panel-hidden' id='panel-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Stock Items" %}</h4>
     </div>
@@ -156,7 +156,7 @@
     </div>
 </div>
 
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-sublocations'>
+<div class='panel panel-inventree panel-hidden' id='panel-sublocations'>
     <div class='panel-heading'>
         <h4>{% trans "Sublocations" %}</h4>
     </div>
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index 81264305c5..1eae7ebdc8 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -12,14 +12,14 @@
 <hr>
 
 <div class='col-sm-3' id='item-panel'>
-    <div class='panel panel-default panel-inventree'>
+    <div class='panel panel-inventree'>
         <ul class='list-group' id='action-item-list'>
         </ul>
     </div>
 </div>
 <div class='col-sm-9' id='details-panel'>
     <ul class='list-group' id='detail-item-list'>
-        <li class='list-group-item panel panel-default panel-inventree'>
+        <li class='list-group-item panel panel-inventree'>
             <div class='container'>
                 <img class='index-bg' src='{% static "img/inventree.png" %}'>
             </div>
@@ -56,7 +56,7 @@ function addHeaderAction(label, title, icon, options) {
 
     // Add a detail item to the detail item-panel
     $("#detail-item-list").append(
-        `<li class='list-group-item panel panel-default panel-inventree' id='detail-${label}'>
+        `<li class='list-group-item panel panel-inventree' id='detail-${label}'>
             <h4>${title}</h4>
             <table class='table table-condensed table-striped' id='table-${label}'></table>
         </li>`
diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html
index d1d22e420a..d2cd74ad26 100644
--- a/InvenTree/templates/InvenTree/search.html
+++ b/InvenTree/templates/InvenTree/search.html
@@ -26,14 +26,14 @@
 {% endif %}
 
 <div class='col-sm-3' id='item-panel'>
-    <div class='panel panel-default panel-inventree'>
+    <div class='panel panel-inventree'>
         <ul class='list-group' id='search-item-list'>
         </ul>
     </div>
 </div>
 <div class='col-sm-9' id='details-panel'>
     <ul class='list-group' id='search-result-list'>
-        <li class='list-group-item panel panel-default panel-inventree'>
+        <li class='list-group-item panel panel-inventree'>
             <div class='container'>
                 <img class='index-bg' src='{% static "img/inventree.png" %}'>
             </div>
@@ -69,7 +69,7 @@
 
         // Add a results table
         $('#search-result-list').append(
-            `<li class='list-group-item panel panel-default panel-inventree' id='search-result-${label}'>
+            `<li class='list-group-item panel panel-inventree' id='search-result-${label}'>
                 <h4>${title}</h4>
                 <table class='table table-condensed table-striped' id='table-${label}'></table>
             </li>`
diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js
index fce8fc6792..c6680040a1 100644
--- a/InvenTree/templates/js/translated/modals.js
+++ b/InvenTree/templates/js/translated/modals.js
@@ -532,7 +532,7 @@ function renderErrorMessage(xhr) {
 
     html += `
     <div class='panel-group'>
-        <div class='panel panel-default'>
+        <div class='panel'>
             <div class='panel panel-heading'>
                 <div class='panel-title'>
                     <a data-bs-toggle='collapse' href="#collapse-error-info">{% trans "Show Error Information" %}</a>
diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js
index 0de423b489..9cebec9995 100644
--- a/InvenTree/templates/js/translated/part.js
+++ b/InvenTree/templates/js/translated/part.js
@@ -792,7 +792,7 @@ function partGridTile(part) {
     var html = `
     
     <div class='product-card card'>
-        <div class='panel panel-default panel-inventree product-card-panel'>
+        <div class='panel panel-inventree product-card-panel'>
             <div class='panel-heading'>
                 <a href='/part/${part.pk}/'>
                     <b>${part.full_name}</b>
diff --git a/InvenTree/templates/panel.html b/InvenTree/templates/panel.html
index 4fb2e87bc7..ef2c0fbc0f 100644
--- a/InvenTree/templates/panel.html
+++ b/InvenTree/templates/panel.html
@@ -1,4 +1,4 @@
-<div class='panel panel-default panel-inventree panel-hidden' id='panel-{% block label %}name{% endblock %}'>
+<div class='panel panel-inventree panel-hidden' id='panel-{% block label %}name{% endblock %}'>
     {% block panel_heading %}
     <div class='panel-heading'>
         <h4>{% block heading %}HEADING{% endblock %}</h4>