diff --git a/InvenTree/templates/InvenTree/bom_invalid.html b/InvenTree/templates/InvenTree/bom_invalid.html
index d32d17598c..4a2fe5856c 100644
--- a/InvenTree/templates/InvenTree/bom_invalid.html
+++ b/InvenTree/templates/InvenTree/bom_invalid.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-times-circle icon-header'></span>
-{% trans "BOM Waiting Validation" %}<span class='badge' id='bom-invalid-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "BOM Waiting Validation" %}<span class='badge' id='bom-invalid-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}
diff --git a/InvenTree/templates/InvenTree/build_pending.html b/InvenTree/templates/InvenTree/build_pending.html
index 9404c0772b..1b8ebc19c2 100644
--- a/InvenTree/templates/InvenTree/build_pending.html
+++ b/InvenTree/templates/InvenTree/build_pending.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-cogs icon-header'></span>
-{% trans "Pending Builds" %}<span class='badge' id='build-pending-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "Pending Builds" %}<span class='badge' id='build-pending-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}
diff --git a/InvenTree/templates/InvenTree/latest_parts.html b/InvenTree/templates/InvenTree/latest_parts.html
index 7316c27f7b..35e55b7cd2 100644
--- a/InvenTree/templates/InvenTree/latest_parts.html
+++ b/InvenTree/templates/InvenTree/latest_parts.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-newspaper icon-header'></span>
-{% trans "Latest Parts" %}<span class='badge' id='latest-parts-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "Latest Parts" %}<span class='badge' id='latest-parts-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}
diff --git a/InvenTree/templates/InvenTree/low_stock.html b/InvenTree/templates/InvenTree/low_stock.html
index 959e9607a9..e7a3dbddc7 100644
--- a/InvenTree/templates/InvenTree/low_stock.html
+++ b/InvenTree/templates/InvenTree/low_stock.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-shopping-cart icon-header'></span>
-{% trans "Low Stock" %}<span class='badge' id='low-stock-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "Low Stock" %}<span class='badge' id='low-stock-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}
diff --git a/InvenTree/templates/InvenTree/parts_to_build.html b/InvenTree/templates/InvenTree/parts_to_build.html
deleted file mode 100644
index 156e3dda22..0000000000
--- a/InvenTree/templates/InvenTree/parts_to_build.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "collapse.html" %}
-{% block collapse_title %}
-<span class='fas fa-tools icon-header'></span>
-Parts to Build<span class='badge'>{{ to_build | length }}</span>
-{% endblock %}
-
-{% block collapse_heading %}
-There are {{ to_build | length }} parts which need building.
-{% endblock %}
-
-{% block collapse_content %}
-
-{% include "required_part_table.html" with parts=to_build table_id="to-build-table" %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/po_outstanding.html b/InvenTree/templates/InvenTree/po_outstanding.html
index 3753576889..628695fa68 100644
--- a/InvenTree/templates/InvenTree/po_outstanding.html
+++ b/InvenTree/templates/InvenTree/po_outstanding.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-sign-in-alt icon-header'></span>
-{% trans "Outstanding Purchase Orders" %}<span class='badge' id='po-outstanding-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "Outstanding Purchase Orders" %}<span class='badge' id='po-outstanding-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}
diff --git a/InvenTree/templates/InvenTree/required_stock_build.html b/InvenTree/templates/InvenTree/required_stock_build.html
index 4e5bfe6ca5..fd6ade4a4e 100644
--- a/InvenTree/templates/InvenTree/required_stock_build.html
+++ b/InvenTree/templates/InvenTree/required_stock_build.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-bullhorn icon-header'></span>
-{% trans "Require Stock To Complete Build" %}<span class='badge' id='stock-to-build-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "Require Stock To Complete Build" %}<span class='badge' id='stock-to-build-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}
diff --git a/InvenTree/templates/InvenTree/so_outstanding.html b/InvenTree/templates/InvenTree/so_outstanding.html
index 7c1c2637cf..29d0261b8b 100644
--- a/InvenTree/templates/InvenTree/so_outstanding.html
+++ b/InvenTree/templates/InvenTree/so_outstanding.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-sign-out-alt icon-header'></span>
-{% trans "Outstanding Sales Orders" %}<span class='badge' id='so-outstanding-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "Outstanding Sales Orders" %}<span class='badge' id='so-outstanding-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}
diff --git a/InvenTree/templates/InvenTree/starred_parts.html b/InvenTree/templates/InvenTree/starred_parts.html
index 4e87764237..a0801566c2 100644
--- a/InvenTree/templates/InvenTree/starred_parts.html
+++ b/InvenTree/templates/InvenTree/starred_parts.html
@@ -4,7 +4,7 @@
 
 {% block collapse_title %}
 <span class='fas fa-star icon-header'></span>
-{% trans "Starred Parts" %}<span class='badge' id='starred-parts-count'><span class='fas fa-hourglass-half'></span></span>
+{% trans "Starred Parts" %}<span class='badge' id='starred-parts-count'><span class='fas fa-spin fa-hourglass-half'></span></span>
 {% endblock %}
 
 {% block collapse_content %}