diff --git a/InvenTree/company/forms.py b/InvenTree/company/forms.py
index 15f380ae44..079e871b84 100644
--- a/InvenTree/company/forms.py
+++ b/InvenTree/company/forms.py
@@ -12,7 +12,6 @@ from django.utils.translation import ugettext_lazy as _
 import django.forms
 
 from .models import Company
-from .models import ManufacturerPart
 from .models import SupplierPart
 from .models import SupplierPriceBreak
 
@@ -35,25 +34,6 @@ class CompanyImageDownloadForm(HelperForm):
         ]
 
 
-class EditManufacturerPartForm(HelperForm):
-    """ Form for editing a ManufacturerPart object """
-
-    field_prefix = {
-        'link': 'fa-link',
-        'MPN': 'fa-hashtag',
-    }
-
-    class Meta:
-        model = ManufacturerPart
-        fields = [
-            'part',
-            'manufacturer',
-            'MPN',
-            'description',
-            'link',
-        ]
-
-
 class EditSupplierPartForm(HelperForm):
     """ Form for editing a SupplierPart object """
 
diff --git a/InvenTree/company/templates/company/detail_manufacturer_part.html b/InvenTree/company/templates/company/detail_manufacturer_part.html
index 4990874059..0ff261ec67 100644
--- a/InvenTree/company/templates/company/detail_manufacturer_part.html
+++ b/InvenTree/company/templates/company/detail_manufacturer_part.html
@@ -60,9 +60,13 @@
                 manufacturer: {
                     value: {{ company.pk }},
                 },
-                MPN: {},
+                MPN: {
+                    icon: 'fa-hashtag',
+                },
                 description: {},
-                link: {},
+                link: {
+                    icon: 'fa-link',
+                },
             },
             method: 'POST',
             title: '{% trans "Add Manufacturer Part" %}',
diff --git a/InvenTree/company/templates/company/manufacturer_part_base.html b/InvenTree/company/templates/company/manufacturer_part_base.html
index 8fdcd79f71..ed1612ea76 100644
--- a/InvenTree/company/templates/company/manufacturer_part_base.html
+++ b/InvenTree/company/templates/company/manufacturer_part_base.html
@@ -118,9 +118,13 @@ $('#edit-part').click(function () {
         fields: {
             part: {},
             manufacturer: {},
-            MPN: {},
+            MPN: {
+                icon: 'fa-hashtag',
+            },
             description: {},
-            link: {},
+            link: {
+                icon: 'fa-link',
+            },
         },
         title: '{% trans "Edit Manufacturer Part" %}',
         reload: true,
diff --git a/InvenTree/company/views.py b/InvenTree/company/views.py
index afdf2b87dc..03fe03d411 100644
--- a/InvenTree/company/views.py
+++ b/InvenTree/company/views.py
@@ -29,7 +29,6 @@ from .models import SupplierPart
 
 from part.models import Part
 
-from .forms import EditManufacturerPartForm
 from .forms import EditSupplierPartForm
 from .forms import CompanyImageDownloadForm