diff --git a/artifacts/ehsan-poc/src/components/layout/Header.tsx b/artifacts/ehsan-poc/src/components/layout/Header.tsx
index fea55d8..75c07e1 100644
--- a/artifacts/ehsan-poc/src/components/layout/Header.tsx
+++ b/artifacts/ehsan-poc/src/components/layout/Header.tsx
@@ -120,12 +120,12 @@ export function Header() {
         </Link>
 
         {/* Desktop nav */}
-        <nav className="hidden lg:flex items-center gap-1 flex-1 justify-center">
+        <nav className="hidden lg:flex items-stretch self-stretch gap-1 flex-1 justify-center">
           <Link
             href="/"
-            className={`px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
+            className={`px-4 flex items-center text-sm font-medium transition-colors ${
               isActive("/")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold rounded-b-lg"
                 : "text-foreground hover:text-primary"
             }`}
             data-testid="nav-home"
@@ -135,9 +135,9 @@ export function Header() {
 
           <Link
             href="/waqf"
-            className={`px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
+            className={`px-4 flex items-center text-sm font-medium transition-colors ${
               isActive("/waqf")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold rounded-b-lg"
                 : "text-foreground hover:text-primary"
             }`}
             data-testid="nav-waqf"
@@ -147,9 +147,9 @@ export function Header() {
 
           <Link
             href="/opportunities"
-            className={`px-4 py-2 rounded-lg inline-flex items-center gap-1 text-sm transition-colors ${
+            className={`px-4 flex items-center gap-1 text-sm transition-colors ${
               isActive("/opportunities")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold rounded-b-lg"
                 : "text-foreground font-medium hover:text-primary"
             }`}
             data-testid="nav-opportunities"
@@ -162,7 +162,7 @@ export function Header() {
             ref={servicesTriggerRef}
             type="button"
             onClick={() => setServicesOpen((v) => !v)}
-            className={`px-3 py-2 inline-flex items-center gap-1 text-sm font-medium transition-colors ${
+            className={`px-3 flex items-center gap-1 text-sm font-medium transition-colors ${
               servicesOpen ? "text-primary" : "text-foreground hover:text-primary"
             }`}
             data-testid="nav-services"
@@ -180,7 +180,7 @@ export function Header() {
             ref={aboutTriggerRef}
             type="button"
             onClick={() => setAboutOpen((v) => !v)}
-            className={`px-3 py-2 inline-flex items-center gap-1 text-sm font-medium transition-colors ${
+            className={`px-3 flex items-center gap-1 text-sm font-medium transition-colors ${
               aboutOpen || location.startsWith("/about")
                 ? "text-primary"
                 : "text-foreground hover:text-primary"
@@ -198,9 +198,9 @@ export function Header() {
 
           <Link
             href="/baraem"
-            className={`px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
+            className={`px-4 flex items-center text-sm font-medium transition-colors ${
               isActive("/baraem")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold rounded-b-lg"
                 : "text-foreground hover:text-primary"
             }`}
             data-testid="nav-baraem"
@@ -369,7 +369,7 @@ export function Header() {
             onClick={() => setMobileOpen(false)}
             className={`block px-3 py-2 rounded-md text-sm hover:bg-muted ${
               isActive("/")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold"
                 : "text-foreground font-medium"
             }`}
           >
@@ -380,7 +380,7 @@ export function Header() {
             onClick={() => setMobileOpen(false)}
             className={`block px-3 py-2 rounded-md text-sm hover:bg-muted ${
               isActive("/waqf")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold"
                 : "text-foreground font-medium"
             }`}
           >
@@ -391,7 +391,7 @@ export function Header() {
             onClick={() => setMobileOpen(false)}
             className={`block px-3 py-2 rounded-md text-sm hover:bg-muted ${
               isActive("/opportunities")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold"
                 : "text-foreground font-medium"
             }`}
           >
@@ -447,7 +447,7 @@ export function Header() {
             onClick={() => setMobileOpen(false)}
             className={`block px-3 py-2 rounded-md text-sm hover:bg-muted ${
               isActive("/baraem")
-                ? "bg-primary text-primary-foreground font-bold"
+                ? "bg-[#1B8354] text-white font-bold"
                 : "text-foreground font-medium"
             }`}
           >