diff --git a/InvenTree/build/templates/build/auto_allocate.html b/InvenTree/build/templates/build/auto_allocate.html
index 48d1837ae0..2f2c7bbca7 100644
--- a/InvenTree/build/templates/build/auto_allocate.html
+++ b/InvenTree/build/templates/build/auto_allocate.html
@@ -6,7 +6,7 @@
 {{ block.super }}
 
 <div class='alert alert-block alert-info'>
-    <b>{% trans "Automatically Allocate Stock" %}</b><br>
+    <strong>{% trans "Automatically Allocate Stock" %}</strong><br>
     {% trans "The following stock items will be allocated to the specified build output" %}
 </div>
 {% if allocations %}
@@ -24,7 +24,7 @@
     </td>
     <td>
         {{ item.stock_item.part.full_name }}<br>
-        <i>{{ item.stock_item.part.description }}</i>
+        <em>{{ item.stock_item.part.description }}</em>
     </td>
     <td>{% decimal item.quantity %}</td>
     <td>{{ item.stock_item.location }}</td>
diff --git a/InvenTree/build/templates/build/complete.html b/InvenTree/build/templates/build/complete.html
index 527c0598d4..eeedc027dd 100644
--- a/InvenTree/build/templates/build/complete.html
+++ b/InvenTree/build/templates/build/complete.html
@@ -9,7 +9,7 @@
 </div>
 {% else %}
 <div class='alert alert-block alert-danger'>
-    <b>{% trans "Build Order is incomplete" %}</b><br>
+    <strong>{% trans "Build Order is incomplete" %}</strong><br>
     <ul>
         {% if build.incomplete_count > 0 %}
         <li>{% trans "Incompleted build outputs remain" %}</li>
diff --git a/InvenTree/build/templates/build/create_build_item.html b/InvenTree/build/templates/build/create_build_item.html
index 9ebf5bb389..cc23bd49a9 100644
--- a/InvenTree/build/templates/build/create_build_item.html
+++ b/InvenTree/build/templates/build/create_build_item.html
@@ -8,7 +8,7 @@
     </p>
     {% if output %}
     <p>
-        {% blocktrans %}The allocated stock will be installed into the following build output:<br><i>{{output}}</i>{% endblocktrans %}
+        {% blocktrans %}The allocated stock will be installed into the following build output:<br><em>{{output}}</em>{% endblocktrans %}
     </p>
     {% endif %}
 </div>
diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index d6b59a060d..421cac059c 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -40,7 +40,7 @@
                         {% if build.take_from %}
                         <a href="{% url 'stock-location-detail' build.take_from.id %}">{{ build.take_from }}</a>{% include "clip.html"%}
                         {% else %}
-                        <i>{% trans "Stock can be taken from any available location." %}</i>
+                        <em>{% trans "Stock can be taken from any available location." %}</em>
                         {% endif %}
                     </td>
                 </tr>
@@ -53,7 +53,7 @@
                             {{ build.destination }}
                         </a>{% include "clip.html"%}
                         {% else %}
-                        <i>{% trans "Destination location not specified" %}</i>
+                        <em>{% trans "Destination location not specified" %}</em>
                         {% endif %}
                     </td>
                 </tr>
@@ -127,7 +127,7 @@
                             {{ build.target_date }}{% if build.is_overdue %} <span class='fas fa-calendar-times icon-red'></span>{% endif %}
                         </td>
                         {% else %}
-                        <td><i>{% trans "No target date set" %}</i></td>
+                        <td><em>{% trans "No target date set" %}</em></td>
                         {% endif %}
                     </tr>
                     <tr>
@@ -136,7 +136,7 @@
                         {% if build.completion_date %}
                         <td>{{ build.completion_date }}{% if build.completed_by %}<span class='badge'>{{ build.completed_by }}</span>{% endif %}</td>
                         {% else %}
-                        <td><i>{% trans "Build not complete" %}</i></td>
+                        <td><em>{% trans "Build not complete" %}</em></td>
                         {% endif %}
                     </tr>
                 </table>
@@ -222,7 +222,7 @@
         </div>
         {% else %}
         <div class='alert alert-block alert-info'>
-            <b>{% trans "Create a new build output" %}</b><br>
+            <strong>{% trans "Create a new build output" %}</strong><br>
             {% trans "No incomplete build outputs remain." %}<br>
             {% trans "Create a new build output using the button above" %}
         </div>
diff --git a/InvenTree/common/templates/common/edit_setting.html b/InvenTree/common/templates/common/edit_setting.html
index c74ed7d591..c479e268a5 100644
--- a/InvenTree/common/templates/common/edit_setting.html
+++ b/InvenTree/common/templates/common/edit_setting.html
@@ -6,9 +6,9 @@
 {{ block.super }}
 <!--
     <p>
-        <b>{{ name }}</b><br>
+        <strong>{{ name }}</strong><br>
         {{ description }}<br>
-        <i>{% trans "Current value" %}: {{ value }}</i>
+        <em>{% trans "Current value" %}: {{ value }}</em>
     </p>
 -->
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index c50a9490f0..e4ca64b32e 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -78,7 +78,7 @@
         {% if company.currency %}
         {{ company.currency }}
         {% else %}
-        <i>{% trans "Uses default currency" %}</i>
+        <em>{% trans "Uses default currency" %}</em>
         {% endif %}
     </td>
 </tr>
diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index cc2dd68840..13e81aaa90 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -225,7 +225,7 @@ $("#multi-parameter-delete").click(function() {
         <ul>`;
 
     selections.forEach(function(item) {
-        text += `<li>${item.name} - <i>${item.value}</i></li>`;
+        text += `<li>${item.name} - <em>${item.value}</em></li>`;
     });
 
     text += `
diff --git a/InvenTree/order/templates/order/order_wizard/match_fields.html b/InvenTree/order/templates/order/order_wizard/match_fields.html
index cd81142341..c1a3618d8d 100644
--- a/InvenTree/order/templates/order/order_wizard/match_fields.html
+++ b/InvenTree/order/templates/order/order_wizard/match_fields.html
@@ -57,7 +57,7 @@
                 {% for duplicate in duplicates %}
                     {% if duplicate == col.value %}
                     <div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'>
-                        <b>{% trans "Duplicate selection" %}</b>
+                        <strong>{% trans "Duplicate selection" %}</strong>
                     </div>
                     {% endif %}
                 {% endfor %}
diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index a02113fa18..e456b234b6 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -38,7 +38,7 @@
         <tr id='part_row_{{ part.id }}'>
             <td>
                 {% include "hover_image.html" with image=part.image hover=False %}
-                {{ part.full_name }} <small><i>{{ part.description }}</i></small>
+                {{ part.full_name }} <small><em>{{ part.description }}</em></small>
             </td>
             <td>
                 <button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' part='{{ part.pk }}' title='{% trans "Create new supplier part" %}' type='button'>
@@ -62,7 +62,7 @@
                         </select>
                     </div>
                     {% if not part.order_supplier %}
-                    <span class='help-inline'>{% blocktrans with name=part.name %}Select a supplier for <i>{{name}}</i>{% endblocktrans %}</span>
+                    <span class='help-inline'>{% blocktrans with name=part.name %}Select a supplier for <em>{{name}}</em>{% endblocktrans %}</span>
                     {% endif %}
                 </div>
             </td>
diff --git a/InvenTree/order/templates/order/receive_parts.html b/InvenTree/order/templates/order/receive_parts.html
index 847c21b0a3..7b12101f7f 100644
--- a/InvenTree/order/templates/order/receive_parts.html
+++ b/InvenTree/order/templates/order/receive_parts.html
@@ -5,7 +5,7 @@
 
 {% block form %}
 
-{% blocktrans with desc=order.description %}Receive outstanding parts for <b>{{order}}</b> - <i>{{desc}}</i>{% endblocktrans %}
+{% blocktrans with desc=order.description %}Receive outstanding parts for <strong>{{order}}</strong> - <em>{{desc}}</em>{% endblocktrans %}
 
 <form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
     {% csrf_token %}
diff --git a/InvenTree/order/templates/order/sales_order_ship.html b/InvenTree/order/templates/order/sales_order_ship.html
index 0060561e71..763d3fca57 100644
--- a/InvenTree/order/templates/order/sales_order_ship.html
+++ b/InvenTree/order/templates/order/sales_order_ship.html
@@ -22,7 +22,7 @@
 {% endif %}
 
 <div class='alert alert-block alert-info'>
-    <b>{% trans "Sales Order" %} {{ order.reference }} - {{ order.customer.name }}</b>
+    <strong>{% trans "Sales Order" %} {{ order.reference }} - {{ order.customer.name }}</strong>
     <br>
     {% trans "Shipping this order means that the order will no longer be editable." %}
 </div>
diff --git a/InvenTree/order/templates/order/so_allocation_delete.html b/InvenTree/order/templates/order/so_allocation_delete.html
index e4cbe0b602..34cf20083b 100644
--- a/InvenTree/order/templates/order/so_allocation_delete.html
+++ b/InvenTree/order/templates/order/so_allocation_delete.html
@@ -6,9 +6,9 @@
 <div class='alert alert-block alert-warning'>
     {% trans "This action will unallocate the following stock from the Sales Order" %}:
     <br>
-    <b>
+    <strong>
         {% decimal allocation.get_allocated %} x {{ allocation.line.part.full_name }}
         {% if allocation.item.location %} ({{ allocation.get_location }}){% endif %}
-    </b>
+    </strong>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index 4376c23ab9..750e205e04 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -11,13 +11,13 @@
 <div class='alert alert-block alert-info'>
 {% else %}
 <div class='alert alert-block alert-danger'>
-    {% blocktrans with part=part.full_name %}The BOM for <i>{{ part }}</i> has changed, and must be validated.<br>{% endblocktrans %}
+    {% blocktrans with part=part.full_name %}The BOM for <em>{{ part }}</em> has changed, and must be validated.<br>{% endblocktrans %}
 {% endif %}
-    {% blocktrans with part=part.full_name checker=part.bom_checked_by check_date=part.bom_checked_date %}The BOM for <i>{{ part }}</i> was last checked by {{ checker }} on {{ check_date }}{% endblocktrans %}
+    {% blocktrans with part=part.full_name checker=part.bom_checked_by check_date=part.bom_checked_date %}The BOM for <em>{{ part }}</em> was last checked by {{ checker }} on {{ check_date }}{% endblocktrans %}
 </div>
 {% else %}
 <div class='alert alert-danger alert-block'>
-    <b>{% blocktrans with part=part.full_name %}The BOM for <i>{{ part }}</i> has not been validated.{% endblocktrans %}</b>
+    <strong>{% blocktrans with part=part.full_name %}The BOM for <em>{{ part }}</em> has not been validated.{% endblocktrans %}</strong>
 </div>
 {% endif %}
 
diff --git a/InvenTree/part/templates/part/bom_duplicate.html b/InvenTree/part/templates/part/bom_duplicate.html
index 7fd45afcbf..1d8ccc7d1a 100644
--- a/InvenTree/part/templates/part/bom_duplicate.html
+++ b/InvenTree/part/templates/part/bom_duplicate.html
@@ -9,7 +9,7 @@
 
 {% if part.has_bom %}
 <div class='alert alert-block alert-danger'>
-    <b>{% trans "Warning" %}</b><br>
+    <strong>{% trans "Warning" %}</strong><br>
     {% trans "This part already has a Bill of Materials" %}<br>
 </div>
 {% endif %}
diff --git a/InvenTree/part/templates/part/bom_upload/match_fields.html b/InvenTree/part/templates/part/bom_upload/match_fields.html
index 3bd51c1855..75ab03ad8f 100644
--- a/InvenTree/part/templates/part/bom_upload/match_fields.html
+++ b/InvenTree/part/templates/part/bom_upload/match_fields.html
@@ -57,7 +57,7 @@
                 {% for duplicate in duplicates %}
                     {% if duplicate == col.value %}
                     <div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'>
-                        <b>{% trans "Duplicate selection" %}</b>
+                        <strong>{% trans "Duplicate selection" %}</strong>
                     </div>
                     {% endif %}
                 {% endfor %}
diff --git a/InvenTree/part/templates/part/bom_upload/upload_file.html b/InvenTree/part/templates/part/bom_upload/upload_file.html
index 23916ddda6..2fa60c5575 100644
--- a/InvenTree/part/templates/part/bom_upload/upload_file.html
+++ b/InvenTree/part/templates/part/bom_upload/upload_file.html
@@ -43,9 +43,9 @@
 
         {% block form_alert %}
         <div class='alert alert-info alert-block'>
-            <b>{% trans "Requirements for BOM upload" %}:</b>
+            <strong>{% trans "Requirements for BOM upload" %}:</strong>
             <ul>
-                <li>{% trans "The BOM file must contain the required named columns as provided in the " %} <b><a href="/part/bom_template/">{% trans "BOM Upload Template" %}</a></b></li>
+                <li>{% trans "The BOM file must contain the required named columns as provided in the " %} <strong><a href="/part/bom_template/">{% trans "BOM Upload Template" %}</a></strong></li>
                 <li>{% trans "Each part must already exist in the database" %}</li>
             </ul>
         </div>
diff --git a/InvenTree/part/templates/part/bom_validate.html b/InvenTree/part/templates/part/bom_validate.html
index 6b3aff6eac..3554f9c56a 100644
--- a/InvenTree/part/templates/part/bom_validate.html
+++ b/InvenTree/part/templates/part/bom_validate.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block pre_form_content %}
-{% blocktrans with part.full_name as part %}Confirm that the Bill of Materials (BOM) is valid for:<br><i>{{ part }}</i>{% endblocktrans %}
+{% blocktrans with part.full_name as part %}Confirm that the Bill of Materials (BOM) is valid for:<br><em>{{ part }}</em>{% endblocktrans %}
 
 <div class='alert alert-warning alert-block'>
     {% trans 'This will validate each line in the BOM.' %}
diff --git a/InvenTree/part/templates/part/create_part.html b/InvenTree/part/templates/part/create_part.html
index 31ef1cb7e6..9587a4f92b 100644
--- a/InvenTree/part/templates/part/create_part.html
+++ b/InvenTree/part/templates/part/create_part.html
@@ -8,13 +8,13 @@
 
 {% if matches %}
 <div class='alert alert-block alert-warning'>
-    <b>{% trans "Possible Matching Parts" %}</b>
+    <strong>{% trans "Possible Matching Parts" %}</strong>
     <p>{% trans "The new part may be a duplicate of these existing parts" %}:</p>
     <ul class='list-group'>
     {% for match in matches %}
     <li class='list-group-item list-group-item-condensed'>
         {% decimal match.ratio as match_per %}
-        {% blocktrans with full_name=match.part.full_name desc=match.part.description %}{{full_name}} - <i>{{desc}}</i> ({{match_per}}% match){% endblocktrans %}
+        {% blocktrans with full_name=match.part.full_name desc=match.part.description %}{{full_name}} - <em>{{desc}}</em> ({{match_per}}% match){% endblocktrans %}
     </li>
     {% endfor %}
 </ul>
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 41332eeec5..6bad2bbbdf 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -18,7 +18,7 @@
     <div class='panel-content'>
         {% if part.is_template %}
         <div class='alert alert-info alert-block'>
-            {% blocktrans with full_name=part.full_name%}Showing stock for all variants of <i>{{full_name}}</i>{% endblocktrans %}
+            {% blocktrans with full_name=part.full_name%}Showing stock for all variants of <em>{{full_name}}</em>{% endblocktrans %}
         </div>
         {% endif %}
         {% include "stock_table.html" %}
diff --git a/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html b/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html
index 293ddbc4d8..6984ef11ac 100644
--- a/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html
+++ b/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html
@@ -50,7 +50,7 @@
                 {% for duplicate in duplicates %}
                     {% if duplicate == col.value %}
                     <div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'>
-                        <b>{% trans "Duplicate selection" %}</b>
+                        <strong>{% trans "Duplicate selection" %}</strong>
                     </div>
                     {% endif %}
                 {% endfor %}
diff --git a/InvenTree/part/templates/part/import_wizard/match_fields.html b/InvenTree/part/templates/part/import_wizard/match_fields.html
index ba709bc639..0467532ff9 100644
--- a/InvenTree/part/templates/part/import_wizard/match_fields.html
+++ b/InvenTree/part/templates/part/import_wizard/match_fields.html
@@ -57,7 +57,7 @@
                 {% for duplicate in duplicates %}
                     {% if duplicate == col.value %}
                     <div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'>
-                        <b>{% trans "Duplicate selection" %}</b>
+                        <strong>{% trans "Duplicate selection" %}</strong>
                     </div>
                     {% endif %}
                 {% endfor %}
diff --git a/InvenTree/part/templates/part/part_pricing.html b/InvenTree/part/templates/part/part_pricing.html
index b24a89f5c9..9ec80882af 100644
--- a/InvenTree/part/templates/part/part_pricing.html
+++ b/InvenTree/part/templates/part/part_pricing.html
@@ -37,7 +37,7 @@
     {% else %}
     <tr>
         <td colspan='3'>
-            <span class='warning-msg'><i>{% trans 'No supplier pricing available' %}</i></span>
+            <span class='warning-msg'><em>{% trans 'No supplier pricing available' %}</em></span>
         </td>
     </tr>
     {% endif %}
@@ -78,14 +78,14 @@
     {% if part.has_complete_bom_pricing == False %}
     <tr>
         <td colspan='3'>
-            <span class='warning-msg'><i>{% trans 'Note: BOM pricing is incomplete for this part' %}</i></span>
+            <span class='warning-msg'><em>{% trans 'Note: BOM pricing is incomplete for this part' %}</em></span>
         </td>
     </tr>
     {% endif %}
     {% else %}
     <tr>
         <td colspan='3'>
-            <span class='warning-msg'><i>{% trans 'No BOM pricing available' %}</i></span>
+            <span class='warning-msg'><em>{% trans 'No BOM pricing available' %}</em></span>
         </td>
     </tr>
     {% endif %}
diff --git a/InvenTree/part/templates/part/partial_delete.html b/InvenTree/part/templates/part/partial_delete.html
index 95f69cec55..993d7a418c 100644
--- a/InvenTree/part/templates/part/partial_delete.html
+++ b/InvenTree/part/templates/part/partial_delete.html
@@ -4,7 +4,7 @@
 {% block pre_form_content %}
 
 <div class='alert alert-block alert-danger'>
-    {% blocktrans with full_name=part.full_name %}Are you sure you want to delete part '<b>{{full_name}}</b>'?{% endblocktrans %}
+    {% blocktrans with full_name=part.full_name %}Are you sure you want to delete part '<strong>{{full_name}}</strong>'?{% endblocktrans %}
 </div>
 
 {% if part.used_in_count %}
diff --git a/InvenTree/part/templates/part/prices.html b/InvenTree/part/templates/part/prices.html
index 2f71a38919..69412ab2bb 100644
--- a/InvenTree/part/templates/part/prices.html
+++ b/InvenTree/part/templates/part/prices.html
@@ -18,7 +18,7 @@
             {% if part.supplier_count > 0 %}
                 {% if min_total_buy_price %}
                     <tr>
-                        <td><b>{% trans 'Supplier Pricing' %}</b>
+                        <td><strong>{% trans 'Supplier Pricing' %}</strong>
                             <a href="#supplier-cost" title='{% trans "Show supplier cost" %}'><span class="fas fa-search-dollar"></span></a>
                             <a href="#purchase-price" title='{% trans "Show purchase price" %}'><span class="fas fa-chart-bar"></span></a>
                         </td>
@@ -37,7 +37,7 @@
                 {% else %}
                     <tr>
                         <td colspan='4'>
-                            <span class='warning-msg'><i>{% trans 'No supplier pricing available' %}</i></span>
+                            <span class='warning-msg'><em>{% trans 'No supplier pricing available' %}</em></span>
                         </td>
                     </tr>
                 {% endif %}
@@ -46,7 +46,7 @@
             {% if part.bom_count > 0 %}
                 {% if min_total_bom_price %}
                     <tr>
-                        <td><b>{% trans 'BOM Pricing' %}</b>
+                        <td><strong>{% trans 'BOM Pricing' %}</strong>
                             <a href="#bom-cost" title='{% trans "Show BOM cost" %}'><span class="fas fa-search-dollar"></span></a>
                         </td>
                         <td>{% trans 'Unit Cost' %}</td>
@@ -83,14 +83,14 @@
                     {% if part.has_complete_bom_pricing == False %}
                         <tr>
                             <td colspan='4'>
-                                <span class='warning-msg'><i>{% trans 'Note: BOM pricing is incomplete for this part' %}</i></span>
+                                <span class='warning-msg'><em>{% trans 'Note: BOM pricing is incomplete for this part' %}</em></span>
                             </td>
                         </tr>
                     {% endif %}
                 {% else %}
                     <tr>
                         <td colspan='4'>
-                            <span class='warning-msg'><i>{% trans 'No BOM pricing available' %}</i></span>
+                            <span class='warning-msg'><em>{% trans 'No BOM pricing available' %}</em></span>
                         </td>
                     </tr>
                 {% endif %}
@@ -99,7 +99,7 @@
             {% if show_internal_price and roles.sales_order.view %}
             {% if total_internal_part_price %}
                 <tr>
-                    <td><b>{% trans 'Internal Price' %}</b></td>
+                    <td><strong>{% trans 'Internal Price' %}</strong></td>
                     <td>{% trans 'Unit Cost' %}</td>
                     <td colspan='2'>{% include "price.html" with price=unit_internal_part_price %}</td>
                 </tr>
@@ -113,7 +113,7 @@
         
             {% if total_part_price %}
                 <tr>
-                    <td><b>{% trans 'Sale Price' %}</b>
+                    <td><strong>{% trans 'Sale Price' %}</strong>
                         <a href="#sale-cost" title='{% trans "Show sale cost" %}'><span class="fas fa-search-dollar"></span></a>
                         <a href="#sale-price" title='{% trans "Show sale price" %}'><span class="fas fa-chart-bar"></span></a>
                     </td>
@@ -179,7 +179,7 @@
 </div>
 <div class='panel-content'>
     <h4>{% trans 'Stock Pricing' %}
-        <i class="fas fa-info-circle" title="Shows the purchase prices of stock for this part.&#10;The Supplier Unit Cost is the current purchase price for that supplier part."></i>
+        <i class="fas fa-info-circle" title="Shows the purchase prices of stock for this part.&#10;The Supplier Unit Cost is the current purchase price for that supplier part."></em>
     </h4>
         {% if price_history|length > 0 %}
             <div style="max-width: 99%; min-height: 300px">
diff --git a/InvenTree/part/templates/part/variant_part.html b/InvenTree/part/templates/part/variant_part.html
index 48a058db55..8a6064711f 100644
--- a/InvenTree/part/templates/part/variant_part.html
+++ b/InvenTree/part/templates/part/variant_part.html
@@ -6,8 +6,8 @@
 {{ block.super }}
 
 <div class='alert alert-info alert-block'>
-    <b>{% trans "Create new part variant" %}</b><br>
-    {% blocktrans with full_name=part.full_name %}Create a new variant of template <i>'{{full_name}}'</i>.{% endblocktrans %}
+    <strong>{% trans "Create new part variant" %}</strong><br>
+    {% blocktrans with full_name=part.full_name %}Create a new variant of template <em>'{{full_name}}'</em>.{% endblocktrans %}
 </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/report/templates/report/inventree_build_order_base.html b/InvenTree/report/templates/report/inventree_build_order_base.html
index 2d2d2766bb..20e6a6ffd0 100644
--- a/InvenTree/report/templates/report/inventree_build_order_base.html
+++ b/InvenTree/report/templates/report/inventree_build_order_base.html
@@ -128,7 +128,7 @@ content: "v{{report_revision}} - {{ date.isoformat }}";
                     {% if build.target_date %}
                     {{ build.target_date }}
                     {% else %}
-                    <i>Not specified</i>
+                    <em>Not specified</em>
                     {% endif %}
                 </td>
             </tr>
@@ -138,7 +138,7 @@ content: "v{{report_revision}} - {{ date.isoformat }}";
                     {% if build.sales_order %}
                     {% internal_link build.sales_order.get_absolute_url build.sales_order %}
                     {% else %}
-                    <i>Not specified</i>
+                    <em>Not specified</em>
                     {% endif %}
                 </td>
             </tr>
diff --git a/InvenTree/report/templates/report/inventree_test_report_base.html b/InvenTree/report/templates/report/inventree_test_report_base.html
index d6d9c5644f..d702973c30 100644
--- a/InvenTree/report/templates/report/inventree_test_report_base.html
+++ b/InvenTree/report/templates/report/inventree_test_report_base.html
@@ -68,8 +68,8 @@ content: "{% trans 'Stock Item Test Report' %}";
             {{ part.full_name }}
         </h2>
         <p>{{ part.description }}</p>
-        <p><i>{{ stock_item.location }}</i></p>
-        <p><i>Stock Item ID: {{ stock_item.pk }}</i></p>
+        <p><em>{{ stock_item.location }}</em></p>
+        <p><em>Stock Item ID: {{ stock_item.pk }}</em></p>
     </div>
     <div class='img-right'>
         <img class='part-img' src="{% part_image part %}">
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index fa5e9da428..759732fe6e 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -182,7 +182,7 @@
 
         {% if item.build %}
         <a href="{% url 'build-detail' item.build.id %}">
-            <b>{{ item.build }}</b>
+            <strong>{{ item.build }}</strong>
         </a>
         {% endif %}
 
@@ -300,7 +300,7 @@
         {% if item.location %}
         <td><a href="{% url 'stock-location-detail' item.location.id %}">{{ item.location.name }}</a></td>
         {% else %}
-        <td><i>{% trans "No location set" %}</i></td>
+        <td><em>{% trans "No location set" %}</em></td>
         {% endif %}
     </tr>
     {% endif %}
@@ -367,7 +367,7 @@
         {% if item.supplier_part.manufacturer_part.manufacturer %}
             <td><a href="{% url 'company-detail' item.supplier_part.manufacturer_part.manufacturer.id %}">{{ item.supplier_part.manufacturer_part.manufacturer.name }}</a></td>
         {% else %}
-            <td><i>{% trans "No manufacturer set" %}</i></td>
+            <td><em>{% trans "No manufacturer set" %}</em></td>
         {% endif %}
 
     </tr>
@@ -414,7 +414,7 @@
         {% if item.stocktake_date %}
         <td>{{ item.stocktake_date }} <span class='badge'>{{ item.stocktake_user }}</span></td>
         {% else %}
-        <td><i>{% trans "No stocktake performed" %}</i></td>
+        <td><em>{% trans "No stocktake performed" %}</em></td>
         {% endif %}
     </tr>
     <tr>
diff --git a/InvenTree/stock/templates/stock/item_delete.html b/InvenTree/stock/templates/stock/item_delete.html
index cf23c0bbf2..df83a88e37 100644
--- a/InvenTree/stock/templates/stock/item_delete.html
+++ b/InvenTree/stock/templates/stock/item_delete.html
@@ -9,7 +9,7 @@
 {% trans "Are you sure you want to delete this stock item?" %}
 <br>
 {% decimal item.quantity as qty %}
-{% blocktrans with full_name=item.part.full_name %}This will remove <b>{{qty}}</b> units of <b>{{full_name}}</b> from stock.{% endblocktrans %}
+{% blocktrans with full_name=item.part.full_name %}This will remove <strong>{{qty}}</strong> units of <strong>{{full_name}}</strong> from stock.{% endblocktrans %}
 </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/loc_link.html b/InvenTree/stock/templates/stock/loc_link.html
index 37169b0ff2..bd18714674 100644
--- a/InvenTree/stock/templates/stock/loc_link.html
+++ b/InvenTree/stock/templates/stock/loc_link.html
@@ -3,7 +3,7 @@
 <div class="navigation">
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
-    <li><a href='#' title='Toggle Stock Tree' id='toggle-stock-tree'><b><span class='fas fa-stream'></span></b></a></li>  
+    <li><a href='#' title='Toggle Stock Tree' id='toggle-stock-tree'><strong><span class='fas fa-stream'></span></strong></a></li>  
     <li class="breadcrumb-item{% if location is None %} active" aria-current="page{% endif %}"><a href="/stock/">{% trans "Stock" %}</a></li>
 {% if location %}
 {% for path_item in location.parentpath %}
diff --git a/InvenTree/stock/templates/stock/location_delete.html b/InvenTree/stock/templates/stock/location_delete.html
index 68e34b987b..22b4168173 100644
--- a/InvenTree/stock/templates/stock/location_delete.html
+++ b/InvenTree/stock/templates/stock/location_delete.html
@@ -20,7 +20,7 @@ the top level 'Stock' location.
 
 <ul class='list-group'>
     {% for loc in location.children.all %}
-    <li class='list-group-item'><b>{{ loc.name }}</b> - <i>{{ loc.description}}</i></li>
+    <li class='list-group-item'><strong>{{ loc.name }}</strong> - <em>{{ loc.description}}</em></li>
     {% endfor %}
 </ul>
 {% endif %}
@@ -36,7 +36,7 @@ If this location is deleted, these items will be moved to the top level 'Stock'
 
 <ul class='list-group'>
     {% for item in location.stock_items.all %}
-    <li class='list-group-item'><b>{{ item.part.full_name }}</b> - <i>{{ item.part.description }}</i><span class='badge'>{% decimal item.quantity %}</span></li>
+    <li class='list-group-item'><strong>{{ item.part.full_name }}</strong> - <em>{{ item.part.description }}</em><span class='badge'>{% decimal item.quantity %}</span></li>
     {% endfor %}
 </ul>
 {% endif %}
diff --git a/InvenTree/stock/templates/stock/stock_adjust.html b/InvenTree/stock/templates/stock/stock_adjust.html
index 5ee02c7ca3..60a9ec2658 100644
--- a/InvenTree/stock/templates/stock/stock_adjust.html
+++ b/InvenTree/stock/templates/stock/stock_adjust.html
@@ -24,7 +24,7 @@
       {% for item in stock_items %}
       <tr id='stock-row-{{ item.id }}' class='error'>
           <td>{% include "hover_image.html" with image=item.part.image hover=True %}
-            {{ item.part.full_name }} <small><i>{{ item.part.description }}</i></small></td> 
+            {{ item.part.full_name }} <small><em>{{ item.part.description }}</em></small></td> 
           <td>{{ item.location.pathstring }}</td> 
           <td>{% decimal item.quantity %}</td>
           <td>
diff --git a/InvenTree/stock/templates/stock/stockitem_convert.html b/InvenTree/stock/templates/stock/stockitem_convert.html
index 9d0b1f77b8..d4e3487567 100644
--- a/InvenTree/stock/templates/stock/stockitem_convert.html
+++ b/InvenTree/stock/templates/stock/stockitem_convert.html
@@ -4,13 +4,13 @@
 {% block pre_form_content %}
 
 <div class='alert alert-block alert-info'>
-    <b>{% trans "Convert Stock Item" %}</b><br>
-    {% blocktrans with part=item.part %}This stock item is current an instance of <i>{{part}}</i>{% endblocktrans %}<br>
+    <strong>{% trans "Convert Stock Item" %}</strong><br>
+    {% blocktrans with part=item.part %}This stock item is current an instance of <em>{{part}}</em>{% endblocktrans %}<br>
     {% trans "It can be converted to one of the part variants listed below." %}
 </div>
 
 <div class='alert alert-block alert-warning'>
-    <b>{% trans "Warning" %}</b>
+    <strong>{% trans "Warning" %}</strong>
     {% trans "This action cannot be easily undone" %}
 </div>
 
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index 51f8d2ed45..14fc31531a 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -34,7 +34,7 @@
 function addHeaderTitle(title) {
     // Add a header block to the action list
     $("#action-item-list").append(
-        `<li class='list-group-item'><b>${title}</b></li>`
+        `<li class='list-group-item'><strong>${title}</strong></li>`
     );
 }
 
diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html
index 33edc2eb32..af0711bc35 100644
--- a/InvenTree/templates/InvenTree/search.html
+++ b/InvenTree/templates/InvenTree/search.html
@@ -21,7 +21,7 @@
 {% if query %}
 {% else %}
 <div id='empty-search-query'>
-    <h4><i>{% trans "Enter a search query" %}</i></h4>
+    <h4><em>{% trans "Enter a search query" %}</em></h4>
 </div>
 {% endif %}
 
@@ -47,7 +47,7 @@
     function addItemTitle(title) {
         // Add header block to the results list
         $('#search-item-list').append(
-            `<li class='list-group-item'><b>${title}</b></li>`
+            `<li class='list-group-item'><strong>${title}</strong></li>`
         );
     }
 
@@ -268,7 +268,7 @@
                             var text = "{% trans "Shipped to customer" %}";
                             return renderLink(text, `/company/${row.customer}/assigned-stock/`);
                         } else {
-                            return '<i>{% trans "No stock location set" %}</i>';
+                            return '<em>{% trans "No stock location set" %}</em>';
                         }
                     }
                 }
diff --git a/InvenTree/templates/InvenTree/settings/currencies.html b/InvenTree/templates/InvenTree/settings/currencies.html
index 85274e91aa..08434cc704 100644
--- a/InvenTree/templates/InvenTree/settings/currencies.html
+++ b/InvenTree/templates/InvenTree/settings/currencies.html
@@ -40,7 +40,7 @@
                 {% if rates_updated %}
                 {{ rates_updated }}
                 {% else %}
-                <i>{% trans "Never" %}</i>
+                <em>{% trans "Never" %}</em>
                 {% endif %}
                 <form action='{% url "settings-currencies-refresh" %}' method='post'>
                     <div id='refresh-rates-form'>
diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html
index e7ea17f91f..ebf24bffb1 100644
--- a/InvenTree/templates/InvenTree/settings/navbar.html
+++ b/InvenTree/templates/InvenTree/settings/navbar.html
@@ -9,7 +9,7 @@
     </li>
 
     <li class='list-group-item'>
-        <b>{% trans "User Settings" %}</b>
+        <strong>{% trans "User Settings" %}</strong>
     </li>
 
     <li class='list-group-item' title='{% trans "Account" %}'>
@@ -53,7 +53,7 @@
     {% if user.is_staff %}
 
     <li class='list-group-item'>
-        <b>{% trans "InvenTree Settings" %}</b>
+        <strong>{% trans "InvenTree Settings" %}</strong>
     </li>
 
     <li class='list-group-item' title='{% trans "Server" %}'>
diff --git a/InvenTree/templates/InvenTree/settings/setting.html b/InvenTree/templates/InvenTree/settings/setting.html
index 1d6c785b29..de3439a647 100644
--- a/InvenTree/templates/InvenTree/settings/setting.html
+++ b/InvenTree/templates/InvenTree/settings/setting.html
@@ -13,7 +13,7 @@
         <span class='fas {{ icon }}'></span>
         {% endif %}
     </td>
-    <td><b>{% trans setting.name %}</b></td>
+    <td><strong>{% trans setting.name %}</strong></td>
     <td>
         {% if setting.is_bool %}
         <div>
@@ -21,15 +21,15 @@
         </div>
         {% else %}
         <div id='setting-{{ setting.pk }}'>
-            <b>
+            <strong>
             <span id='setting-value-{{ setting.key.upper }}' fieldname='{{ setting.key.upper }}'>
                 {% if setting.value %}
                 {{ setting.value }}
                 {% else %}
-                <i>{% trans "No value set" %}</i>
+                <em>{% trans "No value set" %}</em>
                 {% endif %}
             </span>
-            </b>
+            </strong>
             {{ setting.units }}
         </div>
         {% endif %}
diff --git a/InvenTree/templates/about.html b/InvenTree/templates/about.html
index 358d468ca8..5b589bf47c 100644
--- a/InvenTree/templates/about.html
+++ b/InvenTree/templates/about.html
@@ -87,7 +87,7 @@
                                 <td>
                                     <span style="display: none;" id="about-copy-text">{% include "version.html" %}</span>
                                     <span class="float-right">
-                                    <button class="btn clip-btn-version" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><i class="fas fa-copy"></i> {% trans "copy version information" %}</button>
+                                    <button class="btn clip-btn-version" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><i class="fas fa-copy"></em> {% trans "copy version information" %}</button>
                                     </span>
                                 </td>
                             </tr>
diff --git a/InvenTree/templates/clip.html b/InvenTree/templates/clip.html
index a56ece838c..d4232b02b4 100644
--- a/InvenTree/templates/clip.html
+++ b/InvenTree/templates/clip.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 
 <span class="float-right">
-    <button class="btn clip-btn" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><i class="fas fa-copy"></i></button>
+    <button class="btn clip-btn" type="button" data-toggle='tooltip' title='{% trans "copy to clipboard" %}'><i class="fas fa-copy"></em></button>
 </span>
\ No newline at end of file
diff --git a/InvenTree/templates/modals.html b/InvenTree/templates/modals.html
index 11ddc40938..ac26a5fa9a 100644
--- a/InvenTree/templates/modals.html
+++ b/InvenTree/templates/modals.html
@@ -14,7 +14,7 @@
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
               </button>
-              <h3 id='modal-title'><i>Form Title Here</i></h3>
+              <h3 id='modal-title'><em>Form Title Here</em></h3>
             </div>
             <div class='modal-form-content-wrapper'>
               <div class='alert alert-block alert-danger' id='form-validation-warning' style='display: none;'>
@@ -40,7 +40,7 @@
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                   </button>
-                  <h3 id='modal-title'><i>Form Title Here</i></h3>
+                  <h3 id='modal-title'><em>Form Title Here</em></h3>
                 </div>
                 <div class='modal-form-content-wrapper'>
                   <div class='alert alert-block alert-danger' id='form-validation-warning' style="display: none;">
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index 39719edba0..b109bd9daf 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -80,7 +80,7 @@
               <span class='fas fa-info-circle icon-green'></span>
               {% endif %}
               {% endif %}
-              <span class="fas fa-user"></span> <b>{{ user.get_username }}</b></a>
+              <span class="fas fa-user"></span> <strong>{{ user.get_username }}</strong></a>
             <ul class='dropdown-menu'>
                 {% if user.is_authenticated %}
                 {% if user.is_staff %}
diff --git a/InvenTree/templates/registration/login.html b/InvenTree/templates/registration/login.html
index 708a69531a..7ea6668958 100644
--- a/InvenTree/templates/registration/login.html
+++ b/InvenTree/templates/registration/login.html
@@ -80,7 +80,7 @@
 
                         {% if form.errors %}
                         <div class='login-error'>
-                            <b>{% trans "Username / password combination is incorrect" %}</b>
+                            <strong>{% trans "Username / password combination is incorrect" %}</strong>
                         </div>
                         {% endif %}
 
diff --git a/InvenTree/templates/stats.html b/InvenTree/templates/stats.html
index eab8a8c9b6..2d2a9ccbf7 100644
--- a/InvenTree/templates/stats.html
+++ b/InvenTree/templates/stats.html
@@ -6,7 +6,7 @@
     <col width='25'>
 
     <tr>
-        <td colspan="3"><b>{% trans "Server" %}</b></td>
+        <td colspan="3"><strong>{% trans "Server" %}</strong></td>
     </tr>
     <tr>
         <td><span class='fas fa-server'></span></td>
@@ -77,7 +77,7 @@
     {% endif %}
 
     <tr>
-        <td colspan='3'><b>{% trans "Parts" %}</b></td>
+        <td colspan='3'><strong>{% trans "Parts" %}</strong></td>
     </tr>
     <tr>
         <td><span class='fas fa-sitemap'></span></td>
@@ -90,7 +90,7 @@
         <td>{{ part_count }}</td>
     </tr>
     <tr>
-        <td colspan="3"><b>{% trans "Stock Items" %}</b></td>
+        <td colspan="3"><strong>{% trans "Stock Items" %}</strong></td>
     </tr>
     <tr>
         <td><span class='fas fa-map-marker-alt'></span></td>