diff --git a/frontend/jest.config.js b/frontend/jest.config.js
index c2c411f..b27cb26 100644
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.js
@@ -10,8 +10,10 @@ const customJestConfig = {
   setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
   testEnvironment: 'jest-environment-jsdom',
   moduleNameMapper: {
+    '^next-intl$': '<rootDir>/tests/__mocks__/next-intl.tsx',
     '^next-intl/routing$': '<rootDir>/tests/__mocks__/next-intl-routing.tsx',
     '^next-intl/navigation$': '<rootDir>/tests/__mocks__/next-intl-navigation.tsx',
+    '^@/components/i18n$': '<rootDir>/tests/__mocks__/components-i18n.tsx',
     '^@/(.*)$': '<rootDir>/src/$1',
   },
   testMatch: ['<rootDir>/tests/**/*.test.ts', '<rootDir>/tests/**/*.test.tsx'],
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 179f935..63e3904 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -161,5 +161,11 @@
     "maxLength": "Maximum {count} characters allowed",
     "pattern": "Invalid format",
     "passwordMismatch": "Passwords do not match"
+  },
+  "locale": {
+    "en": "English",
+    "it": "Italian",
+    "switchLanguage": "Switch language",
+    "currentLanguage": "Current language"
   }
 }
diff --git a/frontend/messages/it.json b/frontend/messages/it.json
index 85a9754..dd1c414 100644
--- a/frontend/messages/it.json
+++ b/frontend/messages/it.json
@@ -161,5 +161,11 @@
     "maxLength": "Massimo {count} caratteri consentiti",
     "pattern": "Formato non valido",
     "passwordMismatch": "Le password non corrispondono"
+  },
+  "locale": {
+    "en": "Inglese",
+    "it": "Italiano",
+    "switchLanguage": "Cambia lingua",
+    "currentLanguage": "Lingua corrente"
   }
 }
diff --git a/frontend/src/components/admin/Breadcrumbs.tsx b/frontend/src/components/admin/Breadcrumbs.tsx
index 53e58fc..516c1f8 100644
--- a/frontend/src/components/admin/Breadcrumbs.tsx
+++ b/frontend/src/components/admin/Breadcrumbs.tsx
@@ -25,6 +25,7 @@ export function Breadcrumbs() {
   const pathname = usePathname();
 
   // Generate breadcrumb items from pathname
+  // Note: usePathname() from next-intl returns path WITHOUT locale prefix
   const generateBreadcrumbs = (): BreadcrumbItem[] => {
     const segments = pathname.split('/').filter(Boolean);
     const breadcrumbs: BreadcrumbItem[] = [];
diff --git a/frontend/src/components/home/Header.tsx b/frontend/src/components/home/Header.tsx
index a2b6f5f..fa9fdd9 100644
--- a/frontend/src/components/home/Header.tsx
+++ b/frontend/src/components/home/Header.tsx
@@ -10,6 +10,7 @@ import { Link } from '@/lib/i18n/routing';
 import { Menu, X, Github, Star } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
+import { LocaleSwitcher } from '@/components/i18n';
 
 interface HeaderProps {
   onOpenDemoModal: () => void;
@@ -63,6 +64,9 @@ export function Header({ onOpenDemoModal }: HeaderProps) {
               </span>
             </a>
 
+            {/* Locale Switcher */}
+            <LocaleSwitcher />
+
             {/* CTAs */}
             <Button onClick={onOpenDemoModal} variant="default" size="sm">
               Try Demo
@@ -113,6 +117,11 @@ export function Header({ onOpenDemoModal }: HeaderProps) {
                 </a>
 
                 <div className="border-t pt-4 mt-4 space-y-3">
+                  {/* Locale Switcher */}
+                  <div className="flex justify-center">
+                    <LocaleSwitcher />
+                  </div>
+
                   <Button
                     onClick={() => {
                       setMobileMenuOpen(false);
diff --git a/frontend/src/components/i18n/LocaleSwitcher.tsx b/frontend/src/components/i18n/LocaleSwitcher.tsx
new file mode 100644
index 0000000..cc8f40f
--- /dev/null
+++ b/frontend/src/components/i18n/LocaleSwitcher.tsx
@@ -0,0 +1,76 @@
+/**
+ * LocaleSwitcher Component
+ *
+ * Allows users to switch between available locales (EN, IT).
+ * Maintains the current pathname when switching languages.
+ *
+ * Features:
+ * - Dropdown menu with available locales
+ * - Shows current locale with visual indicator
+ * - Preserves pathname when switching
+ * - Accessible with proper ARIA labels
+ * - Translated labels using next-intl
+ */
+
+'use client';
+
+import { useLocale, useTranslations } from 'next-intl';
+import { usePathname, useRouter, type Locale } from '@/lib/i18n/routing';
+import { Button } from '@/components/ui/button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu';
+import { Check, Languages } from 'lucide-react';
+import { routing } from '@/lib/i18n/routing';
+import { useTransition } from 'react';
+
+export function LocaleSwitcher() {
+  const t = useTranslations('locale');
+  const locale = useLocale();
+  const router = useRouter();
+  const pathname = usePathname();
+  const [isPending, startTransition] = useTransition();
+
+  const handleLocaleChange = (newLocale: Locale) => {
+    startTransition(() => {
+      // Navigate to the same pathname with the new locale
+      router.replace(pathname, { locale: newLocale });
+    });
+  };
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button
+          variant="ghost"
+          size="sm"
+          className="gap-2"
+          disabled={isPending}
+          aria-label={t('switchLanguage')}
+        >
+          <Languages className="h-4 w-4" aria-hidden="true" />
+          <span className="uppercase text-xs font-semibold">{locale}</span>
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end">
+        {routing.locales.map((loc) => (
+          <DropdownMenuItem
+            key={loc}
+            onClick={() => handleLocaleChange(loc)}
+            className="cursor-pointer gap-2"
+          >
+            <Check
+              className={`h-4 w-4 ${locale === loc ? 'opacity-100' : 'opacity-0'}`}
+              aria-hidden="true"
+            />
+            <span>{t(loc)}</span>
+            <span className="ml-auto text-xs text-muted-foreground uppercase">{loc}</span>
+          </DropdownMenuItem>
+        ))}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
diff --git a/frontend/src/components/i18n/index.ts b/frontend/src/components/i18n/index.ts
new file mode 100644
index 0000000..cadda4d
--- /dev/null
+++ b/frontend/src/components/i18n/index.ts
@@ -0,0 +1,6 @@
+/**
+ * i18n Components
+ * Exports internationalization-related components
+ */
+
+export { LocaleSwitcher } from './LocaleSwitcher';
diff --git a/frontend/src/components/layout/Header.tsx b/frontend/src/components/layout/Header.tsx
index 14475cb..d30226d 100644
--- a/frontend/src/components/layout/Header.tsx
+++ b/frontend/src/components/layout/Header.tsx
@@ -23,6 +23,7 @@ import { Avatar, AvatarFallback } from '@/components/ui/avatar';
 import { Settings, LogOut, User, Shield } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { ThemeToggle } from '@/components/theme';
+import { LocaleSwitcher } from '@/components/i18n';
 
 /**
  * Get user initials for avatar
@@ -92,9 +93,10 @@ export function Header() {
           </nav>
         </div>
 
-        {/* Right side - Theme toggle and user menu */}
+        {/* Right side - Theme toggle, locale switcher, and user menu */}
         <div className="ml-auto flex items-center space-x-2">
           <ThemeToggle />
+          <LocaleSwitcher />
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
               <Button variant="ghost" className="relative h-10 w-10 rounded-full">
diff --git a/frontend/src/lib/i18n/request.ts b/frontend/src/lib/i18n/request.ts
index 645aec2..8d012af 100644
--- a/frontend/src/lib/i18n/request.ts
+++ b/frontend/src/lib/i18n/request.ts
@@ -32,7 +32,7 @@ export default getRequestConfig(async ({ locale }) => {
 
     // Load messages for the requested locale
     // Dynamic import ensures only the requested locale is loaded
-    messages: (await import(`../../messages/${validLocale}.json`)).default,
+    messages: (await import(`../../../messages/${validLocale}.json`)).default,
 
     // Optional: Configure time zone
     // This will be used for date/time formatting