diff --git a/InvenTree/build/templates/build/notes.html b/InvenTree/build/templates/build/notes.html
index a7a4677c96..ede15651ab 100644
--- a/InvenTree/build/templates/build/notes.html
+++ b/InvenTree/build/templates/build/notes.html
@@ -10,6 +10,9 @@
 
 {% block heading %}
 {% trans "Build Notes" %}
+{% if roles.build.change and not editing %}
+<button title='{% trans "Edit notes" %}' class='btn btn-default' id='edit-notes'><span class='fas fa-edit'></span></button>
+{% endif %}
 {% endblock %}
 
 {% block details %}
@@ -20,14 +23,13 @@
         
     {{ form }}
     <hr>
-    <input type="submit" value='{% trans "Save" %}'/>
+    <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
     
 </form>
 
 {{ form.media }}
 
 {% else %}
-<button title='{% trans "Edit notes" %}' class='btn btn-default action-button' id='edit-notes'><span class='fas fa-edit'></span></button>
 
 {{ build.notes | markdownify }}
 {% endif %}
diff --git a/InvenTree/company/templates/company/notes.html b/InvenTree/company/templates/company/notes.html
index 63fab7ca32..580fa84d52 100644
--- a/InvenTree/company/templates/company/notes.html
+++ b/InvenTree/company/templates/company/notes.html
@@ -9,6 +9,9 @@
 
 {% block heading %}
 {% trans "Company Notes" %}
+{% if not editing %}
+<button title='{% trans "Edit notes" %}' class='btn btn-default' id='edit-notes'><span class='fas fa-edit'></span></button>
+{% endif %}
 {% endblock %}
 
 {% block details %}
@@ -18,7 +21,7 @@
         
     {{ form }}
     <hr>
-    <input type="submit" value='{% trans "Save" %}'/>
+    <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
     
 </form>
 
@@ -26,7 +29,6 @@
 
 {% else %}
 
-<button title='{% trans "Edit notes" %}' class='btn btn-default action-button' id='edit-notes'><span class='fas fa-edit'></span></button>
 {{ company.notes | markdownify }}
 {% endif %}
 
diff --git a/InvenTree/order/templates/order/order_notes.html b/InvenTree/order/templates/order/order_notes.html
index f392816120..cdd121c412 100644
--- a/InvenTree/order/templates/order/order_notes.html
+++ b/InvenTree/order/templates/order/order_notes.html
@@ -11,6 +11,9 @@
 
 {% block heading %}
 {% trans "Order Notes" %}
+{% if roles.purchase_order.change and not editing %}
+<button title='{% trans "Edit notes" %}' class='btn btn-default' id='edit-notes'><span class='fas fa-edit'></span></button>
+{% endif %}
 {% endblock %}
 
 {% block details %}
@@ -21,21 +24,19 @@
 
     {{ form }}
     <hr>
-    <input type='submit' value='{% trans "Save" %}'/>
+    <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
 </form>
 
 {{ form.media }}
 
 {% else %}
-{% if roles.purchase_order.change %}
-<button title='{% trans "Edit notes" %}' class='btn btn-default action-button' id='edit-notes'><span class='fas fa-edit'></span></button>
-{% endif %}
-{% endif %}
+
 <div class='panel panel-default'>
     <div class='panel-content'>
         {{ order.notes | markdownify }}
     </div>
 </div>
+{% endif %}
 
 {% endblock %}
 
diff --git a/InvenTree/order/templates/order/sales_order_notes.html b/InvenTree/order/templates/order/sales_order_notes.html
index 947ea339db..0a2e105b2e 100644
--- a/InvenTree/order/templates/order/sales_order_notes.html
+++ b/InvenTree/order/templates/order/sales_order_notes.html
@@ -12,6 +12,9 @@
 
 {% block heading %}
 {% trans "Sales Order Notes" %}
+{% if roles.sales_order.change and not editing %}
+<button title='{% trans "Edit notes" %}' class='btn btn-default' id='edit-notes'><span class='fas fa-edit'></span></button>
+{% endif %}
 {% endblock %}
 
 {% block details %}
@@ -23,13 +26,12 @@
 
     {{ form }}
     <hr>
-    <input type='submit' value='{% trans "Save" %}'/>
+    <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
 </form>
 
 {{ form.media }}
 
 {% else %}
-<button title='{% trans "Edit notes" %}' class='btn btn-default action-button float-right' id='edit-notes'><span class='fas fa-edit'></span></button>
 <div class='panel panel-default'>
     <div class='panel-content'>
         {{ order.notes | markdownify }}
diff --git a/InvenTree/part/templates/part/notes.html b/InvenTree/part/templates/part/notes.html
index 7b3fe8ca0f..8397c32b88 100644
--- a/InvenTree/part/templates/part/notes.html
+++ b/InvenTree/part/templates/part/notes.html
@@ -10,35 +10,34 @@
 
 {% block heading %}
 {% trans "Part Notes" %}
+{% if roles.part.change and not editing %}
+<button title='{% trans "Edit notes" %}' class='btn btn-default' id='edit-notes'><span class='fas fa-edit'></span></button>
+{% endif %}
 {% endblock %}
 
 {% block details %}
 
-
-
 {% if editing %}
 <form method='POST'>
     {% csrf_token %}
         
     {{ form }}
     <hr>
-    <input type="submit" value='{% trans "Save" %}'/>
+
+    <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
     
 </form>
 
 {{ form.media }}
 
 {% else %}
-{% if roles.part.change %}
-<button title='{% trans "Edit notes" %}' class='btn btn-default action-button' id='edit-notes'><span class='fas fa-edit'></span></button>
-{% endif %}
 
 <div class='panel panel-default'>
+    {% if part.notes %}
     <div class='panel-content'>
-        {% if part.notes %}
         {{ part.notes | markdownify }}
-        {% endif %}
     </div>
+    {% endif %}
 </div>
 
 {% endif %}
diff --git a/InvenTree/stock/templates/stock/item_notes.html b/InvenTree/stock/templates/stock/item_notes.html
index a50f0e8acd..788f7fb3bd 100644
--- a/InvenTree/stock/templates/stock/item_notes.html
+++ b/InvenTree/stock/templates/stock/item_notes.html
@@ -11,6 +11,9 @@
 
 {% block heading %}
 {% trans "Stock Item Notes" %}
+{% if roles.stock.change and not editing %}
+<button title='{% trans "Edit notes" %}' class='btn btn-default' id='edit-notes'><span class='fas fa-edit'></span></button>
+{% endif %}
 {% endblock %}
 
 {% block details %}
@@ -20,13 +23,12 @@
 
     {{ form }}
     <hr>
-    <input type='submit' value='{% trans "Save" %}'/>
+    <button type="submit" class='btn btn-default'>{% trans "Save" %}</button>
 </form>
 
 {{ form.media }}
 
 {% else %}
-<button title='{% trans "Edit notes" %}' class='btn btn-default action-button' id='edit-notes'><span class='fas fa-edit'></span></button>
 {% if item.notes %}
 {{ item.notes | markdownify }}
 {% endif %}