diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5c52d76..bf80054 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,8 @@
     },
     "[typescriptreact]": {
         "editor.defaultFormatter": "vscode.typescript-language-features"
+    },
+    "[css]": {
+        "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
     }
 }
\ No newline at end of file
diff --git a/src/app/globals.css b/src/app/globals.css
index cdbeffc..f5e78cf 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -5,20 +5,6 @@
     --foreground: #171717;
 }
 
-@theme inline {
-    --color-background: var(--background);
-    --color-foreground: var(--foreground);
-    --font-sans: var(--font-geist-sans);
-    --font-mono: var(--font-geist-mono);
-}
-
-/* @media (prefers-color-scheme: dark) {
-  :root {
-    --background: #0a0a0a;
-    --foreground: #ededed;
-  }
-} */
-
 body {
     background: var(--background);
     color: var(--foreground);
@@ -28,3 +14,7 @@ body {
 .code-block {
     font-family: var(--font-geist-mono), monospace;
 }
+
+.navbar-btn {
+    @apply border-0 bg-transparent hover:bg-black/30 shadow-none;
+}
diff --git a/src/components/LanguageSettings.tsx b/src/components/layout/LanguageSettings.tsx
similarity index 95%
rename from src/components/LanguageSettings.tsx
rename to src/components/layout/LanguageSettings.tsx
index de6cccf..643bee0 100644
--- a/src/components/LanguageSettings.tsx
+++ b/src/components/layout/LanguageSettings.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { GhostButton } from "./ui/buttons";
+import { GhostButton } from "../ui/buttons";
 import { useState } from "react";
 import { Languages } from "lucide-react";
 
@@ -15,7 +15,7 @@ export function LanguageSettings() {
     };
     return (
         <>
-            <Languages />
+            <Languages onClick={handleLanguageClick} size={28} className="navbar-btn" />
             <div className="relative">
                 {showLanguageMenu && (
                     <div>
diff --git a/src/components/layout/Navbar.tsx b/src/components/layout/Navbar.tsx
index 8502626..d253ab7 100644
--- a/src/components/layout/Navbar.tsx
+++ b/src/components/layout/Navbar.tsx
@@ -1,7 +1,7 @@
 import Image from "next/image";
 import { IMAGES } from "@/config/images";
 import { Folder, Home, User } from "lucide-react";
-import { LanguageSettings } from "../LanguageSettings";
+import { LanguageSettings } from "./LanguageSettings";
 import { auth } from "@/auth";
 import { headers } from "next/headers";
 import { getTranslations } from "next-intl/server";
@@ -24,7 +24,7 @@ export async function Navbar() {
       <div className="flex text-base md:text-xl gap-0.5 justify-center items-center flex-wrap">
         <LanguageSettings />
         <GhostButton
-          className="md:hidden! block! border-0 bg-transparent hover:bg-black/30 shadow-none p-2"
+          className="md:hidden! block! navbar-btn p-2"
           href="https://github.com/GoddoNebianU/learn-languages"
         >
           <Image
@@ -34,14 +34,14 @@ export async function Navbar() {
             height={20}
           />
         </GhostButton>
-        <GhostButton href="/folders" className="md:block! hidden! border-0 bg-transparent hover:bg-black/30 shadow-none">
+        <GhostButton href="/folders" className="md:block! hidden! navbar-btn">
           {t("folders")}
         </GhostButton>
-        <GhostButton href="/folders" className="md:hidden! block! border-0 bg-transparent hover:bg-black/30 shadow-none p-2">
+        <GhostButton href="/folders" className="md:hidden! block! navbar-btn p-2">
           <Folder size={20} />
         </GhostButton>
         <GhostButton
-          className="hidden! md:block! border-0 bg-transparent hover:bg-black/30 shadow-none"
+          className="hidden! md:block! navbar-btn"
           href="https://github.com/GoddoNebianU/learn-languages"
         >
           {t("sourceCode")}
@@ -50,18 +50,17 @@ export async function Navbar() {
           (() => {
             return session &&
               <>
-                <GhostButton href="/profile" className="hidden! md:block! text-sm md:text-base border-0 bg-transparent hover:bg-black/30 shadow-none px-2 py-1">{t("profile")}</GhostButton>
-                <GhostButton href="/profile" className="md:hidden! block! border-0 bg-transparent hover:bg-black/30 shadow-none p-2">
+                <GhostButton href="/profile" className="hidden! md:block! text-sm md:text-base navbar-btn px-2 py-1">{t("profile")}</GhostButton>
+                <GhostButton href="/profile" className="md:hidden! block! navbar-btn p-2">
                   <User size={20} />
                 </GhostButton>
               </>
               || <>
-                <GhostButton href="/auth" className="hidden! md:block! text-sm md:text-base border-0 bg-transparent hover:bg-black/30 shadow-none px-2 py-1">{t("sign_in")}</GhostButton>
-                <GhostButton href="/auth" className="md:hidden! block! border-0 bg-transparent hover:bg-black/30 shadow-none p-2">
+                <GhostButton href="/auth" className="hidden! md:block! text-sm md:text-base navbar-btn px-2 py-1">{t("sign_in")}</GhostButton>
+                <GhostButton href="/auth" className="md:hidden! block! navbar-btn p-2">
                   <User size={20} />
                 </GhostButton>
               </>;
-
           })()
         }
       </div>