diff --git a/includes/resident_header.php b/includes/resident_header.php
index 98045ab..8042e5c 100644
--- a/includes/resident_header.php
+++ b/includes/resident_header.php
@@ -2,29 +2,31 @@
 $current_page = basename($_SERVER['PHP_SELF']);
 ?>
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <a class="navbar-brand" href="resident_dashboard.php">Continuum Nexus</a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#residentNavbar" aria-controls="residentNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="residentNavbar">
-        <ul class="navbar-nav mr-auto">
-            <li class="nav-item <?php echo ($current_page == 'resident_dashboard.php') ? 'active' : ''; ?>">
-                <a class="nav-link" href="resident_dashboard.php"><i class="fas fa-tachometer-alt"></i> Dashboard</a>
-            </li>
-            <li class="nav-item <?php echo ($current_page == 'messages.php' || $current_page == 'view_message.php' || $current_page == 'resident_compose_message.php') ? 'active' : ''; ?>">
-                <a class="nav-link" href="messages.php"><i class="fas fa-envelope"></i> Messages</a>
-            </li>
-            <li class="nav-item <?php echo ($current_page == 'calendar.php') ? 'active' : ''; ?>">
-                <a class="nav-link" href="calendar.php"><i class="far fa-calendar-alt"></i> Calendar</a>
-            </li>
-            <li class="nav-item <?php echo ($current_page == 'resources.php') ? 'active' : ''; ?>">
-                <a class="nav-link" href="resources.php"><i class="fas fa-book"></i> Resources</a>
-            </li>
-        </ul>
-        <ul class="navbar-nav ml-auto">
-            <li class="nav-item">
-                <a class="nav-link" href="logout.php"><i class="fas fa-sign-out-alt"></i> Logout</a>
-            </li>
-        </ul>
+    <div class="container-fluid">
+        <a class="navbar-brand" href="resident_dashboard.php">Continuum Nexus</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#residentNavbar" aria-controls="residentNavbar" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="residentNavbar">
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                <li class="nav-item">
+                    <a class="nav-link <?php echo ($current_page == 'resident_dashboard.php') ? 'active' : ''; ?>" href="resident_dashboard.php"><i class="bi bi-grid-fill"></i> Dashboard</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link <?php echo ($current_page == 'messages.php' || $current_page == 'view_message.php' || $current_page == 'resident_compose_message.php') ? 'active' : ''; ?>" href="messages.php"><i class="bi bi-inbox-fill"></i> Messages</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link <?php echo ($current_page == 'calendar.php') ? 'active' : ''; ?>" href="calendar.php"><i class="bi bi-calendar-event-fill"></i> Calendar</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link <?php echo ($current_page == 'resources.php') ? 'active' : ''; ?>" href="resources.php"><i class="bi bi-journal-bookmark-fill"></i> Resources</a>
+                </li>
+            </ul>
+            <ul class="navbar-nav">
+                <li class="nav-item">
+                    <a class="nav-link" href="logout.php"><i class="bi bi-box-arrow-right"></i> Logout</a>
+                </li>
+            </ul>
+        </div>
     </div>
 </nav>
diff --git a/partner_dashboard.php b/partner_dashboard.php
index bf1689c..4e7e9c6 100644
--- a/partner_dashboard.php
+++ b/partner_dashboard.php
@@ -102,6 +102,9 @@ if (!$partner) {
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
         <div class="container-fluid">
             <a class="navbar-brand" href="partner_dashboard.php">Continuum Nexus</a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">