diff --git a/assets/css/custom.css b/assets/css/custom.css
index ad03751..b7a3877 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -65,9 +65,44 @@ body {
     font-weight: 500;
 }
 
-.btn-primary:hover {
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary:focus-visible {
     background-color: #2563eb;
     border-color: #2563eb;
+    color: #ffffff !important;
+    box-shadow: 0 0 0 0.25rem rgba(59, 130, 246, 0.5);
+    outline: none;
+}
+
+.nav-link.active {
+    color: #3b82f6 !important;
+}
+
+.navbar-nav .nav-link.active {
+    border-bottom: 2px solid #3b82f6;
+}
+
+.nav-pills .nav-link.active,
+.nav-pills .nav-link.active:hover,
+.nav-pills .nav-link.active:focus,
+.nav-pills .nav-link.active:active {
+    background-color: #3b82f6 !important;
+    color: #ffffff !important;
+    border-bottom: none !important;
+    box-shadow: 0 0 0 0.25rem rgba(59, 130, 246, 0.25);
+}
+
+.btn-check:checked + .btn-outline-primary,
+.btn-check:active + .btn-outline-primary,
+.btn-outline-primary:active,
+.btn-outline-primary.active,
+.btn-outline-primary.dropdown-toggle.show {
+    color: #ffffff !important;
+    background-color: #3b82f6 !important;
+    border-color: #3b82f6 !important;
 }
 
 .table {
diff --git a/employee_detail.php b/employee_detail.php
index 1d2401a..68b34bb 100644
--- a/employee_detail.php
+++ b/employee_detail.php
@@ -97,7 +97,7 @@ function formatBytes($bytes, $precision = 2) {
             <p class="text-muted mb-0"><?= htmlspecialchars($employee['position'] ?? 'Staff') ?> • Joined <?= $employee['start_date'] ? date('M j, Y', strtotime($employee['start_date'])) : 'N/A' ?></p>
         </div>
         <div class="d-flex gap-2">
-            <button class="btn btn-outline-primary btn-sm"><i class="bi bi-pencil me-1"></i> Edit Employee</button>
+            <button class="btn btn-secondary btn-sm"><i class="bi bi-pencil me-1"></i> Edit Employee</button>
             <a href="labour.php?employee_id=<?= $id ?>" class="btn btn-primary btn-sm"><i class="bi bi-plus-lg me-1"></i> Add Labour</a>
         </div>
     </div>
@@ -259,7 +259,7 @@ function formatBytes($bytes, $precision = 2) {
                                             <td class="small text-muted"><?= formatBytes((int)$f['file_size']) ?></td>
                                             <td class="small text-muted"><?= date('M j, Y', strtotime($f['created_at'])) ?></td>
                                             <td class="text-end pe-3">
-                                                <a href="<?= htmlspecialchars($f['file_path']) ?>" target="_blank" class="btn btn-sm btn-outline-primary py-0 px-2">View</a>
+                                                <a href="<?= htmlspecialchars($f['file_path']) ?>" target="_blank" class="btn btn-sm btn-primary py-0 px-2">View</a>
                                             </td>
                                         </tr>
                                     <?php endforeach; ?>
diff --git a/employees.php b/employees.php
index ad21778..7346ac0 100644
--- a/employees.php
+++ b/employees.php
@@ -122,8 +122,8 @@ include __DIR__ . '/includes/header.php';
                         <td><span class="fw-bold text-success">$<?= number_format((float)($e['current_wage'] ?? 0), 2) ?>/h</span></td>
                         <td><span class="badge <?= $e['is_limited'] ? 'bg-secondary' : 'bg-primary' ?>"><?= $e['is_limited'] ? 'Limited' : 'Regular' ?></span></td>
                         <td class="text-end">
-                            <a href="employee_detail.php?id=<?= $e['id'] ?>" class="btn btn-sm btn-outline-primary me-1">View</a>
-                            <button class="btn btn-sm btn-outline-secondary">Edit</button>
+                            <a href="employee_detail.php?id=<?= $e['id'] ?>" class="btn btn-sm btn-primary me-1">View</a>
+                            <button class="btn btn-sm btn-secondary">Edit</button>
                         </td>
                     </tr>
                     <?php endforeach; ?>
diff --git a/expenses.php b/expenses.php
index 8129c27..0b878d8 100644
--- a/expenses.php
+++ b/expenses.php
@@ -147,7 +147,7 @@ include __DIR__ . '/includes/header.php';
                 <div class="col-md-2">
                     <div class="d-flex gap-2">
                         <button type="submit" class="btn btn-sm btn-primary w-100">Filter</button>
-                        <a href="expenses.php" class="btn btn-sm btn-outline-secondary w-100">Reset</a>
+                        <a href="expenses.php" class="btn btn-sm btn-secondary w-100">Reset</a>
                     </div>
                 </div>
             </form>
@@ -194,7 +194,7 @@ include __DIR__ . '/includes/header.php';
                             <small class="extra-small text-muted"><?= (float)$ex['allocation_percent'] ?>% SR&ED</small>
                         </td>
                         <td class="text-end">
-                            <button class="btn btn-sm btn-outline-secondary">Details</button>
+                            <button class="btn btn-sm btn-secondary">Details</button>
                         </td>
                     </tr>
                     <?php endforeach; ?>
diff --git a/includes/header.php b/includes/header.php
index 5129896..d03580e 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -15,12 +15,6 @@ $currentPage = basename($_SERVER['PHP_SELF']);
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
     <link href="assets/css/custom.css?v=<?= time() ?>" rel="stylesheet">
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-    <style>
-        .nav-link.active {
-            color: #3b82f6 !important;
-            border-bottom: 2px solid #3b82f6;
-        }
-    </style>
 </head>
 <body>
 
diff --git a/labour.php b/labour.php
index e28bb17..0d5b0f8 100644
--- a/labour.php
+++ b/labour.php
@@ -179,7 +179,7 @@ include __DIR__ . '/includes/header.php';
         <h2 class="fw-bold mb-0">Labour Tracking</h2>
         <div>
             <a href="api/export_labour.php?<?= http_build_query($_GET) ?>" class="btn btn-primary me-2"><i class="bi bi-file-earmark-excel me-1"></i> Export to Excel</a>
-            <button class="btn btn-outline-primary me-2" data-bs-toggle="modal" data-bs-target="#bulkLabourModal"><i class="bi bi-calendar3 me-1"></i> Bulk Add</button>
+            <button class="btn btn-primary me-2" data-bs-toggle="modal" data-bs-target="#bulkLabourModal"><i class="bi bi-calendar3 me-1"></i> Bulk Add</button>
             <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addLabourModal">+ Add Labour Entry</button>
         </div>
     </div>
@@ -237,7 +237,7 @@ include __DIR__ . '/includes/header.php';
                 <div class="col-md-2">
                     <div class="d-flex gap-1">
                         <button type="submit" class="btn btn-sm btn-primary flex-grow-1">Filter</button>
-                        <a href="labour.php" class="btn btn-sm btn-outline-secondary">Reset</a>
+                        <a href="labour.php" class="btn btn-sm btn-secondary">Reset</a>
                     </div>
                 </div>
             </form>
@@ -281,7 +281,7 @@ include __DIR__ . '/includes/header.php';
                         </td>
                         <td class="small text-muted"><?= htmlspecialchars($l['notes'] ?? '') ?></td>
                         <td class="text-end">
-                            <button class="btn btn-sm btn-outline-secondary">Details</button>
+                            <button class="btn btn-sm btn-secondary">Details</button>
                         </td>
                     </tr>
                     <?php endforeach; ?>
diff --git a/projects.php b/projects.php
index ed31bbd..0aa66f5 100644
--- a/projects.php
+++ b/projects.php
@@ -173,7 +173,7 @@ include __DIR__ . '/includes/header.php';
                 <div class="col-md-2 text-end">
                     <div class="d-flex gap-2">
                         <button type="submit" class="btn btn-sm btn-primary flex-grow-1">Filter</button>
-                        <a href="projects.php" class="btn btn-sm btn-outline-secondary">Reset</a>
+                        <a href="projects.php" class="btn btn-sm btn-secondary">Reset</a>
                     </div>
                 </div>
             </form>
@@ -228,7 +228,7 @@ include __DIR__ . '/includes/header.php';
                                 <td><span class="status-badge status-<?= str_replace('_', '-', $p['status']) ?>"><?= ucfirst(str_replace('_', ' ', $p['status'])) ?></span></td>
                                 <td class="text-end">
                                     <div class="dropdown">
-                                        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown">Actions</button>
+                                        <button class="btn btn-sm btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown">Actions</button>
                                         <ul class="dropdown-menu">
                                             <li><a class="dropdown-item" href="project_detail.php?id=<?= $p['id'] ?>">View Details</a></li>
                                             <li><hr class="dropdown-divider"></li>
diff --git a/reports.php b/reports.php
index a592d34..fd30ee6 100644
--- a/reports.php
+++ b/reports.php
@@ -192,7 +192,7 @@ include __DIR__ . '/includes/header.php';
                     <div class="card-header bg-white d-flex justify-content-between align-items-center">
                         <h6 class="mb-0 fw-bold">Detailed Labour Records</h6>
                         <div class="btn-group">
-                            <button class="btn btn-sm btn-outline-secondary" onclick="window.print()"><i class="bi bi-printer"></i> Print</button>
+                            <button class="btn btn-sm btn-secondary" onclick="window.print()"><i class="bi bi-printer"></i> Print</button>
                             <a href="api/export_labour.php?<?= http_build_query($_GET) ?>" class="btn btn-sm btn-primary"><i class="bi bi-file-earmark-excel"></i> Export to Excel</a>
                             <a href="export_pdf.php?<?= http_build_query($_GET) ?>" class="btn btn-sm btn-primary ms-1"><i class="bi bi-file-earmark-pdf"></i> Download PDF</a>
                         </div>
@@ -278,7 +278,7 @@ include __DIR__ . '/includes/header.php';
             <div class="card-header bg-white d-flex justify-content-between align-items-center">
                 <h6 class="mb-0 fw-bold">Monthly Labour Calendar - <?= date('F Y', strtotime($cal_month)) ?></h6>
                 <div class="btn-group">
-                    <button class="btn btn-sm btn-outline-secondary" onclick="window.print()"><i class="bi bi-printer"></i> Print</button>
+                    <button class="btn btn-sm btn-secondary" onclick="window.print()"><i class="bi bi-printer"></i> Print</button>
                     <a href="export_pdf.php?<?= http_build_query($_GET) ?>" class="btn btn-sm btn-primary"><i class="bi bi-file-earmark-pdf"></i> Download PDF</a>
                 </div>
             </div>