diff --git a/netbox/templates/layout.html b/netbox/templates/layout.html
index ce2ac71ae..da378ef59 100644
--- a/netbox/templates/layout.html
+++ b/netbox/templates/layout.html
@@ -22,8 +22,7 @@
     </nav>
 
     <main class="col-md-9 ms-sm-auto col-lg-10 px-0">
-      <nav class="navbar navbar-light sticky-top flex-md-nowrap py-4 bg-white">
-        <div class="container-fluid">
+      <nav class="navbar navbar-light sticky-top flex-md-nowrap py-4 bg-white container-fluid">
           <button
             type="button"
             aria-expanded="false"
@@ -35,9 +34,8 @@
           >
             <span class="navbar-toggler-icon"></span>
           </button>
-
           {% search_options %} {% include './profile_button.html' %}
-        </div>
+        
       </nav>
 
       <div class="px-4">
diff --git a/netbox/templates/profile_button.html b/netbox/templates/profile_button.html
index 8e150ed78..50246f767 100644
--- a/netbox/templates/profile_button.html
+++ b/netbox/templates/profile_button.html
@@ -4,28 +4,28 @@
     type="button"
     aria-expanded="false"
     data-bs-toggle="dropdown"
-    class="btn btn-outline-secondary dropdown-toggle mx-4"
+    class="btn btn-outline-secondary dropdown-toggle ms-4"
   >
-    <i class="bi bi-person-fill"></i>
+    <i class="mdi mdi-account"></i>
     <span id="navbar_user">{{ request.user|truncatechars:"30" }}</span>
   </button>
   <ul class="dropdown-menu dropdown-menu-end">
     <li class="dropdown-item">
       {% if request.user.is_staff %}
       <a class="text-decoration-none" href="{% url 'admin:index' %}">
-        <i class="bi bi-gear-wide-connected"></i> Admin
+        <i class="mdi mdi-cog"></i> Admin
       </a>
       {% endif %}
     </li>
     <li class="dropdown-item">
       <a class="text-decoration-none" href="{% url 'user:profile' %}">
-        <i class="bi bi-person-fill"></i> Profile
+        <i class="mdi mdi-account"></i> Profile
       </a>
     </li>
     <li><hr class="dropdown-divider" /></li>
     <li class="dropdown-item">
       <a class="text-decoration-none" href="{% url 'logout' %}">
-        <i class="bi bi-box-arrow-right"></i> Log out
+        <i class="mdi mdi-logout-variant"></i> Log Out
       </a>
     </li>
   </ul>
@@ -37,7 +37,7 @@
     type="button"
     href="{% url 'login' %}"
   >
-    <i class="bi bi-box-arrow-in-right"></i> Log in
+    <i class="mdi mdi-login-variant"></i> Log In
   </a>
 </div>
 {% endif %}
diff --git a/netbox/templates/search.html b/netbox/templates/search.html
index 273bec2ca..a555f2935 100644
--- a/netbox/templates/search.html
+++ b/netbox/templates/search.html
@@ -13,7 +13,7 @@
                         <h3 id="{{ obj_type.name|lower }}">{{ obj_type.name|bettertitle }}</h3>
                         {% include 'panel_table.html' with table=obj_type.table %}
                         <a href="{{ obj_type.url }}" class="btn btn-primary float-end my-3">
-                            <span class="mdi mdi-arrow-right-bold" aria-hidden="true"></span>
+                            <i class="mdi mdi-arrow-right-bold" aria-hidden="true"></i>
                             {% if obj_type.table.page.has_next %}
                                 See All {{ obj_type.table.page.paginator.count }} Results
                             {% else %}
diff --git a/netbox/utilities/templates/search/searchbar.html b/netbox/utilities/templates/search/searchbar.html
index 47ae17092..60e89dee1 100644
--- a/netbox/utilities/templates/search/searchbar.html
+++ b/netbox/utilities/templates/search/searchbar.html
@@ -17,7 +17,7 @@
     data-bs-toggle="dropdown"
     class="btn btn-outline-secondary dropdown-toggle"
   >
-    <i class="bi-filter"></i>
+    <i class="mdi mdi-filter-variant"></i>
   </button>
   <ul id="object-type-selector" class="dropdown-menu dropdown-menu-end">
     {% for option in options %} {% if option.items|length == 0 %}
@@ -47,6 +47,7 @@
     {% endif %} {% endfor %}
   </ul>
   <button class="btn btn-primary" type="submit" id="search-button">
-    <i class="bi bi-search"></i>
+    <i class="mdi mdi-magnify"></i>
   </button>
+  
 </form>