diff --git a/frontend/index.html b/frontend/index.html
index d2aac45e..2a376a4d 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -32,6 +32,13 @@
           document.documentElement.setAttribute('lang', locale);
           document.documentElement.setAttribute('dir', rtl[base] ? 'rtl' : 'ltr');
         } catch (e) {}
+        try {
+          var locale = localStorage.getItem('yieldvault.locale') || 'en';
+          var rtl = { ar: true, he: true, fa: true, ur: true };
+          var base = String(locale).toLowerCase().split('-')[0];
+          document.documentElement.setAttribute('lang', locale);
+          document.documentElement.setAttribute('dir', rtl[base] ? 'rtl' : 'ltr');
+        } catch (e) {}
       })();
     </script>
   </head>
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index 85cea9e0..ccf22043 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -265,6 +265,11 @@ const Navbar: FC<NavbarProps> = ({
           </NavLink>
         )}
 
+          <div className="flex items-center justify-between" style={{ marginTop: "24px" }}>
+            <ThemeToggle />
+            <LanguageSwitcher compact />
+            {walletAddress && <span>{networkLabel}</span>}
+          </div>
         <div className="flex items-center justify-between" style={{ marginTop: "24px" }}>
           <ThemeToggle />
           {walletAddress && <span>{networkLabel}</span>}