diff --git a/app/layout.tsx b/app/layout.tsx
index dca2c624f..74bbc1866 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -33,7 +33,7 @@ const inter = Inter({
 export default async function RootLayout({ children }: { children: ReactNode }) {
   return (
     <html lang="en" className={inter.variable}>
-      <body className="bg-white text-black selection:bg-teal-300 dark:bg-black dark:text-white dark:selection:bg-fuchsia-600 dark:selection:text-white">
+      <body className="bg-gray-50 text-black selection:bg-teal-300 dark:bg-dark dark:text-white dark:selection:bg-fuchsia-600 dark:selection:text-white">
         <Navbar />
         <Suspense>
           <main>{children}</main>
diff --git a/components/layout/navbar/index.tsx b/components/layout/navbar/index.tsx
index 39361625d..03f7693c5 100644
--- a/components/layout/navbar/index.tsx
+++ b/components/layout/navbar/index.tsx
@@ -13,26 +13,26 @@ export default async function Navbar() {
   const menu = await getMenu('next-js-frontend-header-menu');
 
   return (
-    <nav className="relative flex items-center justify-between p-4 bg-white dark:bg-black lg:px-6">
+    <nav className="relative flex items-center justify-between p-4 lg:px-6">
       <div className="block w-1/3 md:hidden">
         <MobileMenu menu={menu} />
       </div>
-      <div className="flex w-2/5 justify-self-center md:justify-self-start">
-        <div className="flex-none mr-6 lg:mr-10">
+      <div className="b flex w-full flex-auto text-sm md:mr-6 md:flex md:w-auto md:items-center lg:mr-10">
+        <div className="flex w-full flex-none justify-center md:mr-6 md:block md:w-auto lg:mr-10">
           <Link href="/" aria-label="Go back home" className="flex items-center">
-            <div className="relative flex items-center justify-center mr-2 text-black transition-colors border border-gray-200 rounded-md h-11 w-11 dark:border-gray-700 dark:text-white">
+            <div className="relative mr-2 flex h-11 w-11 items-center justify-center rounded-md border border-gray-200 text-black transition-colors dark:border-gray-700 dark:text-white">
               <LogoIcon className="h-8 transition-transform hover:scale-110" />
             </div>
             <div className="text-sm font-medium uppercase">Acme Store</div>
           </Link>
         </div>
         {menu.length ? (
-          <ul className="hidden w-full mr-6 b md:flex md:items-center lg:mr-10">
+          <ul className="b mr-6 hidden w-full text-sm md:flex md:items-center lg:mr-10">
             {menu.map((item: Menu) => (
               <li key={item.title}>
                 <Link
                   href={item.path}
-                  className="py-1 mr-3 text-gray-800 rounded-lg underline-offset-4 hover:text-gray-500 hover:underline dark:text-gray-500 dark:hover:text-gray-400 lg:mr-8"
+                  className="mr-3 rounded-lg py-1 text-gray-500 underline-offset-4 hover:text-black hover:underline dark:hover:text-gray-400 lg:mr-8"
                 >
                   {item.title}
                 </Link>
@@ -41,11 +41,11 @@ export default async function Navbar() {
           </ul>
         ) : null}
       </div>
-      <div className="flex-grow hidden md:block">
+      <div className="hidden flex-grow md:block md:w-auto">
         <Search />
       </div>
 
-      <div className="flex justify-end w-2/5">
+      <div className="flex w-2/5 justify-end">
         <Suspense fallback={<CartIcon className="h-6" />}>
           <Cart />
         </Suspense>
diff --git a/components/layout/navbar/search.tsx b/components/layout/navbar/search.tsx
index ce42d2377..a3f879df1 100644
--- a/components/layout/navbar/search.tsx
+++ b/components/layout/navbar/search.tsx
@@ -28,7 +28,7 @@ export default function Search() {
   return (
     <form
       onSubmit={onSubmit}
-      className="relative flex items-center w-full p-0 m-0 bg-transparent border border-gray-700 rounded-full dark:border-gray-800"
+      className="relative m-0 flex w-full items-center rounded-xl border bg-transparent p-0 dark:border-gray-800"
     >
       <input
         type="text"
@@ -36,10 +36,10 @@ export default function Search() {
         placeholder="Search for products..."
         autoComplete="off"
         defaultValue={searchParams?.get('q') || ''}
-        className="w-full px-4 py-1 text-black bg-transparent dark:text-gray-100"
+        className="w-full rounded-xl bg-white px-4 py-1 text-sm text-black placeholder:text-gray-800 dark:bg-transparent dark:text-gray-500 dark:placeholder:text-gray-500"
       />
-      <div className="absolute top-0 right-0 flex items-center h-full mr-3">
-        <MagnifyingGlassIcon className="h-5" />
+      <div className="absolute right-0 top-0 mr-3 flex h-full items-center">
+        <MagnifyingGlassIcon className="h-4" />
       </div>
     </form>
   );
