diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py
index 7ea72e4cc9..9086d66f1f 100644
--- a/InvenTree/company/models.py
+++ b/InvenTree/company/models.py
@@ -10,6 +10,7 @@ import os
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
+from django.contrib.staticfiles.templatetags.staticfiles import static
 
 
 def rename_company_image(instance, filename):
@@ -85,7 +86,7 @@ class Company(models.Model):
         if self.image:
             return os.path.join(settings.MEDIA_URL, str(self.image.url))
         else:
-            return ''
+            return static('/img/blank_image.png')
 
     @property
     def part_count(self):
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 2ffdd08e98..deaf2a799a 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -19,6 +19,7 @@ from django.conf import settings
 from django.db import models
 from django.core.validators import MinValueValidator
 
+from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.contrib.auth.models import User
 from django.db.models.signals import pre_delete
 from django.dispatch import receiver
@@ -130,7 +131,7 @@ class Part(models.Model):
         if self.image:
             return os.path.join(settings.MEDIA_URL, str(self.image.url))
         else:
-            return ''
+            return static('/img/blank_image.png')
 
     # Short name of the part
     name = models.CharField(max_length=100, unique=True, blank=False, help_text='Part name (must be unique)')
diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css
index 50d10547e1..752885145d 100644
--- a/InvenTree/static/css/inventree.css
+++ b/InvenTree/static/css/inventree.css
@@ -6,6 +6,10 @@
     font-size: 20px;
 }
 
+.glyphicon-small {
+    font-size: 14px;
+}
+
 .starred-part {
     color: #ffcc00;
 }
diff --git a/InvenTree/static/script/inventree/bom.js b/InvenTree/static/script/inventree/bom.js
index b96ae49050..e88e617945 100644
--- a/InvenTree/static/script/inventree/bom.js
+++ b/InvenTree/static/script/inventree/bom.js
@@ -42,6 +42,8 @@ function downloadBom(options = {}) {
 
     modalSetContent(modal, content);
 
+    modalEnable(modal, true);
+
     $(modal).on('click', '#modal-form-submit', function() {
         $(modal).modal('hide');
 
@@ -91,7 +93,7 @@ function loadBomTable(table, options) {
             title: 'Part',
             sortable: true,
             formatter: function(value, row, index, field) {
-                return renderLink(value.name, value.url);
+                return imageHoverIcon(value.image_url) + renderLink(value.name, value.url);
             }
         }
     );
@@ -127,8 +129,8 @@ function loadBomTable(table, options) {
     if (options.editable) {
         cols.push({
             formatter: function(value, row, index, field) {
-                var bEdit = "<button class='btn btn-success bom-edit-button btn-sm' type='button' url='/part/bom/" + row.pk + "/edit'>Edit</button>";
-                var bDelt = "<button class='btn btn-danger bom-delete-button btn-sm' type='button' url='/part/bom/" + row.pk + "/delete'>Delete</button>";
+                var bEdit = "<button title='Edit BOM Item' class='btn btn-success bom-edit-button btn-sm' type='button' url='/part/bom/" + row.pk + "/edit'><span class='glyphicon glyphicon-small glyphicon-pencil'></span></button>";
+                var bDelt = "<button title='Delete BOM Item' class='btn btn-danger bom-delete-button btn-sm' type='button' url='/part/bom/" + row.pk + "/delete'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>";
                 
                 return "<div class='btn-group'>" + bEdit + bDelt + "</div>";
             }