diff --git a/InvenTree/part/templates/part/part_app_base.html b/InvenTree/part/templates/part/part_app_base.html
index 0b578aaadd..c7b38f9cc2 100644
--- a/InvenTree/part/templates/part/part_app_base.html
+++ b/InvenTree/part/templates/part/part_app_base.html
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block breadcrumbs %}
-<a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><i class="fas fa-bars"></i></a>
+<a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><span class="fas fa-bars"></span></a>
 {% if part %}
 {% include "part/cat_link.html" with category=part.category part=part %}
 {% else %}
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index af558ced12..cb4ecc3059 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block breadcrumbs %}
-<a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><i class="fas fa-bars"></i></a>
+<a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><span class="fas fa-bars"></span></a>
 {% include 'stock/loc_link.html' with location=item.location %}
 {% endblock %}
 
diff --git a/InvenTree/stock/templates/stock/stock_app_base.html b/InvenTree/stock/templates/stock/stock_app_base.html
index 93994ebd21..cf30a3221a 100644
--- a/InvenTree/stock/templates/stock/stock_app_base.html
+++ b/InvenTree/stock/templates/stock/stock_app_base.html
@@ -18,7 +18,7 @@
 {% endblock %}
 
 {% block breadcrumbs %}
-<a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><i class="fas fa-bars"></i></a>
+<a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><span class="fas fa-bars"></span></a>
 {% if item %}
 {% include 'stock/loc_link.html' with location=item.location %}
 {% else %}
diff --git a/InvenTree/templates/InvenTree/settings/plugin.html b/InvenTree/templates/InvenTree/settings/plugin.html
index 7b428e161f..caee7c92bf 100644
--- a/InvenTree/templates/InvenTree/settings/plugin.html
+++ b/InvenTree/templates/InvenTree/settings/plugin.html
@@ -77,7 +77,7 @@
                 {% endif %}
 
                 {% if plugin.website %}
-                <a href="{{ plugin.website }}"><i class="fas fa-globe"></i></a>
+                <a href="{{ plugin.website }}"><span class="fas fa-globe"></span></a>
                 {% endif %}
             </td>
             <td>{{ plugin.author }}</td>
diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html
index 9bd0dba26e..32bc4d43e7 100644
--- a/InvenTree/templates/InvenTree/settings/user.html
+++ b/InvenTree/templates/InvenTree/settings/user.html
@@ -65,7 +65,7 @@
                     <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked" {%endif %} value="{{emailaddress.email}}" />
 
                     {% if emailaddress.primary %}
-                    <b>{{ emailaddress.email }}</b>
+                    <strong>{{ emailaddress.email }}</strong>
                     {% else %}
                     {{ emailaddress.email }}
                     {% endif %}
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index fd3e496f80..05d0712e6a 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -94,7 +94,7 @@
                 {% if server_restart_required and not demo_mode %}
                 <div id='alert-restart-server' class='alert alert-danger' role='alert'>
                     <span class='fas fa-server'></span>
-                    <b>{% trans "Server Restart Required" %}</b>
+                    <strong>{% trans "Server Restart Required" %}</strong>
                     <small>
                         <br>
                         {% trans "A configuration option has been changed which requires a server restart" %}. {% trans "Contact your system administrator for further information" %}
diff --git a/InvenTree/templates/sidebar_header.html b/InvenTree/templates/sidebar_header.html
index 1aac8c9f7b..6e79b4f6d6 100644
--- a/InvenTree/templates/sidebar_header.html
+++ b/InvenTree/templates/sidebar_header.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <span title='{{ text }}' class="list-group-item sidebar-list-group-item border-end d-inline-block text-truncate bg-light" data-bs-parent="#sidebar">
     <h6>
-        <i class="bi bi-bootstrap"></i>
+        <span class="bi bi-bootstrap"></span>
         {% if icon %}<span class='sidebar-item-icon fas {{ icon }}'></span>{% endif %}
         {% if text %}<span class='sidebar-item-text' style='display: none;'><strong>{{ text }}</strong></span>{% endif %}
     </h6>
diff --git a/InvenTree/templates/sidebar_item.html b/InvenTree/templates/sidebar_item.html
index adc934f0b8..d7b90d8a3d 100644
--- a/InvenTree/templates/sidebar_item.html
+++ b/InvenTree/templates/sidebar_item.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <a href="#" id='select-{{ label }}' title='{{ text }}' class="list-group-item sidebar-list-group-item border-end d-inline-block text-truncate sidebar-selector" data-bs-parent="#sidebar">
-    <i class="bi bi-bootstrap"></i>
+    <span class="bi bi-bootstrap"></span>
     <span class='sidebar-item-icon fas {{ icon|default:"fa-circle" }}'></span>
     <span class='sidebar-item-text' style='display: none;'>{{ text }}</span>
     {% if badge %}
diff --git a/InvenTree/templates/sidebar_link.html b/InvenTree/templates/sidebar_link.html
index d0d77e93ae..4d885f88a0 100644
--- a/InvenTree/templates/sidebar_link.html
+++ b/InvenTree/templates/sidebar_link.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 <a href="{{ url }}" class="list-group-item sidebar-list-group-item border-end d-inline-block text-truncate" data-bs-parent="#sidebar">
-    <i class="bi bi-bootstrap"></i><span class='sidebar-item-icon fas {{ icon }}'></span><span class='sidebar-item-text' style='display: none;'>{{ text }}</span>
+    <span class="bi bi-bootstrap"></span><span class='sidebar-item-icon fas {{ icon }}'></span><span class='sidebar-item-text' style='display: none;'>{{ text }}</span>
 </a>
diff --git a/InvenTree/templates/sidebar_toggle.html b/InvenTree/templates/sidebar_toggle.html
index 2e119d408d..b5751e3400 100644
--- a/InvenTree/templates/sidebar_toggle.html
+++ b/InvenTree/templates/sidebar_toggle.html
@@ -1,4 +1,4 @@
 <a href="#" id='{{ target }}-toggle' class="list-group-item sidebar-list-group-item border-end d-inline-block text-truncate sidebar-toggle" data-bs-parent="#sidebar" style='display: none;'>
-    <i class="bi bi-bootstrap"></i><span id='sidebar-toggle-icon' class='sidebar-item-icon fas fa-chevron-left'></span>
+    <span class="bi bi-bootstrap"></span><span id='sidebar-toggle-icon' class='sidebar-item-icon fas fa-chevron-left'></span>
     {% if text %}<span class='sidebar-item-text' style='display: none;'>{{ text }}</span>{% endif %}
 </a>