diff --git a/InvenTree/build/templates/build/allocation_item.html b/InvenTree/build/templates/build/allocation_item.html
index 920012e953..ebe05ce4d4 100644
--- a/InvenTree/build/templates/build/allocation_item.html
+++ b/InvenTree/build/templates/build/allocation_item.html
@@ -6,10 +6,7 @@
 {% block collapse_panel_setup %}class='panel part-allocation' id='allocation-panel-{{ item.sub_part.id }}'{% endblock %}
 
 {% block collapse_title %}
-    <div class='hover-icon media-left' style='float: left;'>
-        <img class='hover-img-thumb' src="{% if item.sub_part.image %}{{ item.sub_part.image.url }}{% endif %}">
-        <img class='hover-img-large' src="{% if item.sub_part.image %}{{ item.sub_part.image.url }}{% endif %}">
-    </div>
+    {% include "hover_image.html" with image=item.sub_part.image %}
     <div>
         {{ item.sub_part.full_name }}
         <small><i>{{ item.sub_part.description }}</i></small>
diff --git a/InvenTree/build/templates/build/auto_allocate.html b/InvenTree/build/templates/build/auto_allocate.html
index dc2160a006..72d328df9b 100644
--- a/InvenTree/build/templates/build/auto_allocate.html
+++ b/InvenTree/build/templates/build/auto_allocate.html
@@ -21,10 +21,7 @@ Automatically allocate stock to this build?
 {% for item in allocations %}
 <tr>
     <td>
-        <a class='hover-icon'>
-            <img class='hover-img-thumb' src='{% if item.stock_item.part.image %}{{ item.stock_item.part.image.url }}{% endif %}'>
-            <img class='hover-img-large' src='{% if item.stock_item.part.image %}{{ item.stock_item.part.image.url }}{% endif %}'>
-        </a>
+        {% include "hover_image.html" with image=item.stock_item.part.image %}
     </td>
     <td>
         {{ item.stock_item.part.full_name }}<br>
diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html
index b2102ed74b..7cb5a2d659 100644
--- a/InvenTree/build/templates/build/build_base.html
+++ b/InvenTree/build/templates/build/build_base.html
@@ -30,7 +30,7 @@ InvenTree | Build - {{ build }}
                     </tr>
                     <tr>
                         <td>Part</td>
-                        <td>{{ build.part.full_name }}</td>
+                        <td><a href="{% url 'part-detail' build.part.id %}">{{ build.part.full_name }}</a></td>
                     </tr>
                     <tr>
                         <td>Quantity</td>
diff --git a/InvenTree/build/templates/build/complete.html b/InvenTree/build/templates/build/complete.html
index 9f41bee54e..0a8f094614 100644
--- a/InvenTree/build/templates/build/complete.html
+++ b/InvenTree/build/templates/build/complete.html
@@ -18,10 +18,7 @@ The following items will be removed from stock:
 {% for item in taking %}
 <tr>
     <td>
-        <a class='hover-icon'>
-            <img class='hover-img-thumb' src='{{ item.stock_item.part.image.url }}'>
-            <img class='hover-img-large' src='{{ item.stock_item.part.image.url }}'>
-        </a>
+        {% include "hover_image.html" with image=item.stock_item.part.image %}
     </td>
     <td>
         {{ item.stock_item.part.full_name }}<br>
@@ -38,10 +35,7 @@ No parts have been allocated to this build.
 <hr>
 The following items will be created:
 <div class='panel panel-default'>
-    <a class='hover-icon'>
-        <img class='hover-img-thumb' src='{{ build.part.image.url }}'>
-        <img class='hover-img-large' src='{{ build.part.image.url }}'>
-    </a>
+    {% include "hover_image.html" with image=build.part.image %}
     {{ build.quantity }} x {{ build.part.full_name }}
 </div>
 
diff --git a/InvenTree/build/templates/build/required.html b/InvenTree/build/templates/build/required.html
index 6ab16032ab..66aea7d48a 100644
--- a/InvenTree/build/templates/build/required.html
+++ b/InvenTree/build/templates/build/required.html
@@ -19,10 +19,7 @@
     {% for item in build.required_parts %}
     <tr>
         <td>
-            <a class='hover-icon'>
-                <img class='hover-img-thumb' src='{% if item.part.image %}{{ item.part.image.url }}{% endif %}'>
-                <img class='hover-img-large' src='{% if item.part.image %}{{ item.part.image.url }}{% endif %}'>
-            </a>
+            {% include "hover_image.html" with image=item.part.image %}
             <a class='hover-icon'a href="{% url 'part-detail' item.part.id %}">{{ item.part.full_name }}</a>
         </td>
         <td>{{ item.part.total_stock }}</td>
diff --git a/InvenTree/part/templates/part/variants.html b/InvenTree/part/templates/part/variants.html
index 98ac08a8d3..8061e32e7a 100644
--- a/InvenTree/part/templates/part/variants.html
+++ b/InvenTree/part/templates/part/variants.html
@@ -33,12 +33,7 @@
     {% for variant in part.variants.all %}
         <tr>
             <td>
-                <div class='hover-icon media-left' style='float: left;'>
-                        <img class='hover-img-thumb' src="{% if variant.image %}{{ variant.image.url }}{% else %}{% static 'img/blank_image.png' %}{% endif %}">
-                        {% if variant.image %}
-                        <img class='hover-img-large' src="{{ variant.image.url }}">
-                        {% endif %}
-                    </div>
+                {% include "hover_image.html" with image=variant.image %}
                 <a href="{% url 'part-detail' variant.id %}">{{ variant.full_name }}</a>
             </td>
             <td>{{ variant.description }}</td>
diff --git a/InvenTree/templates/hover_image.html b/InvenTree/templates/hover_image.html
new file mode 100644
index 0000000000..0853c4fc12
--- /dev/null
+++ b/InvenTree/templates/hover_image.html
@@ -0,0 +1,12 @@
+{% load static %}
+
+<div class='hover-icon media-left' style='float: left;'>
+    {% if image %}
+    <a class='hover-icon'>
+    {% endif %}
+        <img class='hover-img-thumb' {% if image %}src='{{ image.url }}'{% else %}src='{% static "img/blank_image.png" %}'{% endif %}>
+    {% if image %}
+        <img class='hover-img-large' src='{{ image.url }}'>
+    </a>
+    {% endif %}
+</div>
\ No newline at end of file