From 74b9670c79e0bd7483dbe0b2048747489be01b25 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 20 Jun 2026 22:16:38 -0400
Subject: [PATCH] x

---
 apps/website/src/app/[lang]/layout.tsx |  2 +-
 apps/website/src/components/Footer.tsx |  2 +-
 apps/website/src/components/Navbar.tsx | 12 ++++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/website/src/app/[lang]/layout.tsx b/apps/website/src/app/[lang]/layout.tsx
index b706acb..6194bb5 100644
--- a/apps/website/src/app/[lang]/layout.tsx
+++ b/apps/website/src/app/[lang]/layout.tsx
@@ -108,7 +108,7 @@ export default async function RootLayout({
       <body className="min-h-screen bg-pop-bg text-pop-black font-sans antialiased">
         <ClientProviders>
           <Navbar categories={categories} initialMenu={initialMenu} settings={settings} />
-          <main className="global-main pt-[72px]">
+          <main className="global-main">
             {children}
           </main>
           <Footer
diff --git a/apps/website/src/components/Footer.tsx b/apps/website/src/components/Footer.tsx
index 0e5b18c..c8d4387 100644
--- a/apps/website/src/components/Footer.tsx
+++ b/apps/website/src/components/Footer.tsx
@@ -61,7 +61,7 @@ export default function Footer({
         {/* Col 1 — Brand */}
         <div className="space-y-6">
           <div className="text-2xl font-bold tracking-widest">
-            {brandName}
+            {settings?.logoUrl ? <img src={settings.logoUrl} alt={brandName} className="h-8 md:h-10 object-contain" /> : brandName}
           </div>
           <p className="text-sm leading-relaxed text-gray-600">
             {resolveLocalized(settings?.footerDescription, effectiveLang) || t('footer.catchphrase')}
diff --git a/apps/website/src/components/Navbar.tsx b/apps/website/src/components/Navbar.tsx
index 2220698..e2a3c29 100644
--- a/apps/website/src/components/Navbar.tsx
+++ b/apps/website/src/components/Navbar.tsx
@@ -5,7 +5,7 @@ import { getPathWithoutLocale, getPathWithLocale } from '../lib/locales'
 import { useRouter, usePathname } from 'next/navigation'
 import { useState, useEffect, useMemo, useRef } from 'react'
 import type { Category } from '@homaroma/types'
-import { Check, Globe, Heart, Menu as MenuIcon, ShoppingBag, User, X } from 'lucide-react'
+import { Check, Globe, Heart, Menu as MenuIcon, ShoppingBag, User, X, Search } from 'lucide-react'
 import { useCartStore } from '../store/cartStore'
 import { useWishlistStore } from '../store/wishlistStore'
 import { useAuthStore } from '../store/authStore'
@@ -198,7 +198,7 @@ export default function Navbar({ categories = [], initialMenu = [], settings = n
               onClick={() => setMobileOpen(false)}
               className="shrink-0 text-xl font-bold uppercase italic tracking-widest text-pop-black md:text-2xl"
             >
-              {brandName}
+              {settings?.logoUrl ? <img src={settings.logoUrl} alt={brandName} className="h-8 md:h-10 object-contain" /> : brandName}
             </Link>
           </div>
 
@@ -215,9 +215,7 @@ export default function Navbar({ categories = [], initialMenu = [], settings = n
               className={iconButtonClass}
               aria-label="Search"
             >
-              <svg className="h-4 w-4 transition-colors" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M21 21l-6-6m2-5a7 7 0 11-14 0 0114 0z" />
-              </svg>
+              <Search className="h-4 w-4 transition-colors" />
             </button>
 
             <Link
@@ -338,9 +336,7 @@ export default function Navbar({ categories = [], initialMenu = [], settings = n
 
             <form onSubmit={handleSearch}>
               <div className="flex overflow-hidden rounded-2xl border-2 border-pop-black/10 bg-white shadow-sm transition-colors focus-within:border-pop-pink">
-                <svg className="m-4 h-5 w-5 shrink-0 text-pop-black/35" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M21 21l-6-6m2-5a7 7 0 11-14 0 0114 0z" />
-                </svg>
+                <Search className="m-4 h-5 w-5 shrink-0 text-pop-black/35" />
                 <input
                   type="text"
                   value={searchQuery}