diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 379cf2ebac..3724835621 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -125,6 +125,8 @@
 
 .label-right {
     float: right;
+    margin-left: 3px;
+    margin-right: 3px;
 }
 
 /* Bootstrap table overrides */
diff --git a/InvenTree/InvenTree/static/script/inventree/part.js b/InvenTree/InvenTree/static/script/inventree/part.js
index dd03836d49..54947c949b 100644
--- a/InvenTree/InvenTree/static/script/inventree/part.js
+++ b/InvenTree/InvenTree/static/script/inventree/part.js
@@ -140,11 +140,15 @@ function loadPartTable(table, url, options={}) {
             var display = imageHoverIcon(row.thumbnail) + renderLink(name, '/part/' + row.pk + '/');
             
             if (row.is_template) {
-                display = display + "<span class='label label-info' style='float: right;'>TEMPLATE</span>";
+                display = display + `<span class='fas fa-clone label-right' title='Template part'></span>`;
             }
-
+            
+            if (row.assembly) {
+                display = display + `<span class='fas fa-tools label-right' title='Assembled part'></span>`;
+            }
+            
             if (!row.active) {
-                display = display + "<span class='label label-warning' style='float: right;'>INACTIVE</span>";
+                display = display + `<span class='fas fa-times label-right' title='Inactive part'></span>`;
             }
             return display; 
         }
@@ -173,7 +177,7 @@ function loadPartTable(table, url, options={}) {
                 return renderLink(row.category__name, "/part/category/" + row.category + "/");
             }
             else {
-                return '';
+                return 'No category';
             }
         }   
     });
diff --git a/InvenTree/templates/table_filters.html b/InvenTree/templates/table_filters.html
index 318e1ddf01..6e362ab3d4 100644
--- a/InvenTree/templates/table_filters.html
+++ b/InvenTree/templates/table_filters.html
@@ -80,7 +80,11 @@ function getAvailableTableFilters(tableKey) {
             low_stock: {
                 type: 'bool',
                 title: '{% trans "Low stock" %}',
-            }
+            },
+            assembly: {
+                type: 'bool',
+                title: '{% trans "Assembly" %}',
+            },
         };
     }