diff --git a/client/src/pages/Home.tsx b/client/src/pages/Home.tsx
index 8cb7a7e..03cc43b 100644
--- a/client/src/pages/Home.tsx
+++ b/client/src/pages/Home.tsx
@@ -144,6 +144,60 @@ export default function Home() {
                     Admin Dashboard
                   </Button>
                   
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button 
+                        variant="ghost" 
+                        size="sm"
+                        data-testid="button-settings"
+                      >
+                        <Settings className="h-4 w-4" />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent align="end" className="w-56">
+                      <DropdownMenuLabel>Theme</DropdownMenuLabel>
+                      <DropdownMenuItem 
+                        onClick={() => handleThemeChange('light')}
+                        className="cursor-pointer"
+                        data-testid="theme-light"
+                      >
+                        <Sun className="h-4 w-4 mr-2" />
+                        Light
+                      </DropdownMenuItem>
+                      <DropdownMenuItem 
+                        onClick={() => handleThemeChange('dark')}
+                        className="cursor-pointer"
+                        data-testid="theme-dark"
+                      >
+                        <Moon className="h-4 w-4 mr-2" />
+                        Dark
+                      </DropdownMenuItem>
+                      <DropdownMenuItem 
+                        onClick={() => handleThemeChange('system')}
+                        className="cursor-pointer"
+                        data-testid="theme-system"
+                      >
+                        <Monitor className="h-4 w-4 mr-2" />
+                        System
+                      </DropdownMenuItem>
+                      
+                      <DropdownMenuSeparator />
+                      
+                      <DropdownMenuLabel>Language</DropdownMenuLabel>
+                      {languages.map((lang) => (
+                        <DropdownMenuItem 
+                          key={lang.code}
+                          onClick={() => handleLanguageChange(lang.code)}
+                          className="cursor-pointer"
+                          data-testid={`language-${lang.code}`}
+                        >
+                          <Globe className="h-4 w-4 mr-2" />
+                          {lang.name}
+                        </DropdownMenuItem>
+                      ))}
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                  
                   <DropdownMenu>
                     <DropdownMenuTrigger asChild>
                       <div className="flex items-center space-x-2 px-3 py-1 bg-gray-100 rounded-md cursor-pointer hover:bg-gray-200 transition-colors" data-testid="user-profile-chip">
@@ -168,69 +222,71 @@ export default function Home() {
                   </DropdownMenu>
                 </>
               ) : (
-                <Button 
-                  variant="ghost" 
-                  size="sm"
-                  onClick={() => setIsLoginModalOpen(true)}
-                  data-testid="button-login"
-                >
-                  <User className="h-4 w-4" />
-                </Button>
-              )}
-              
-              <DropdownMenu>
-                <DropdownMenuTrigger asChild>
+                <>
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button 
+                        variant="ghost" 
+                        size="sm"
+                        data-testid="button-settings"
+                      >
+                        <Settings className="h-4 w-4" />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent align="end" className="w-56">
+                      <DropdownMenuLabel>Theme</DropdownMenuLabel>
+                      <DropdownMenuItem 
+                        onClick={() => handleThemeChange('light')}
+                        className="cursor-pointer"
+                        data-testid="theme-light"
+                      >
+                        <Sun className="h-4 w-4 mr-2" />
+                        Light
+                      </DropdownMenuItem>
+                      <DropdownMenuItem 
+                        onClick={() => handleThemeChange('dark')}
+                        className="cursor-pointer"
+                        data-testid="theme-dark"
+                      >
+                        <Moon className="h-4 w-4 mr-2" />
+                        Dark
+                      </DropdownMenuItem>
+                      <DropdownMenuItem 
+                        onClick={() => handleThemeChange('system')}
+                        className="cursor-pointer"
+                        data-testid="theme-system"
+                      >
+                        <Monitor className="h-4 w-4 mr-2" />
+                        System
+                      </DropdownMenuItem>
+                      
+                      <DropdownMenuSeparator />
+                      
+                      <DropdownMenuLabel>Language</DropdownMenuLabel>
+                      {languages.map((lang) => (
+                        <DropdownMenuItem 
+                          key={lang.code}
+                          onClick={() => handleLanguageChange(lang.code)}
+                          className="cursor-pointer"
+                          data-testid={`language-${lang.code}`}
+                        >
+                          <Globe className="h-4 w-4 mr-2" />
+                          {lang.name}
+                        </DropdownMenuItem>
+                      ))}
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                  
                   <Button 
                     variant="ghost" 
                     size="sm"
-                    data-testid="button-settings"
+                    onClick={() => setIsLoginModalOpen(true)}
+                    data-testid="button-login"
                   >
-                    <Settings className="h-4 w-4" />
+                    <User className="h-4 w-4" />
                   </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent align="end" className="w-56">
-                  <DropdownMenuLabel>Theme</DropdownMenuLabel>
-                  <DropdownMenuItem 
-                    onClick={() => handleThemeChange('light')}
-                    className="cursor-pointer"
-                    data-testid="theme-light"
-                  >
-                    <Sun className="h-4 w-4 mr-2" />
-                    Light
-                  </DropdownMenuItem>
-                  <DropdownMenuItem 
-                    onClick={() => handleThemeChange('dark')}
-                    className="cursor-pointer"
-                    data-testid="theme-dark"
-                  >
-                    <Moon className="h-4 w-4 mr-2" />
-                    Dark
-                  </DropdownMenuItem>
-                  <DropdownMenuItem 
-                    onClick={() => handleThemeChange('system')}
-                    className="cursor-pointer"
-                    data-testid="theme-system"
-                  >
-                    <Monitor className="h-4 w-4 mr-2" />
-                    System
-                  </DropdownMenuItem>
-                  
-                  <DropdownMenuSeparator />
-                  
-                  <DropdownMenuLabel>Language</DropdownMenuLabel>
-                  {languages.map((lang) => (
-                    <DropdownMenuItem 
-                      key={lang.code}
-                      onClick={() => handleLanguageChange(lang.code)}
-                      className="cursor-pointer"
-                      data-testid={`language-${lang.code}`}
-                    >
-                      <Globe className="h-4 w-4 mr-2" />
-                      {lang.name}
-                    </DropdownMenuItem>
-                  ))}
-                </DropdownMenuContent>
-              </DropdownMenu>
+                </>
+              )}
             </div>
           </div>
         </div>