diff --git a/apps/infoalloggi/src/components/navbar/ricerca_command.tsx b/apps/infoalloggi/src/components/navbar/ricerca_command.tsx
index 5862297..ced587c 100644
--- a/apps/infoalloggi/src/components/navbar/ricerca_command.tsx
+++ b/apps/infoalloggi/src/components/navbar/ricerca_command.tsx
@@ -26,8 +26,8 @@ export function RicercaCommand() {
 		<>
 			<Dialog onOpenChange={setOpen} open={open}>
 				<DialogTrigger asChild>
-					<Button aria-label="ricercaBtn" variant="ghost">
-						<Search className="size-6" />
+					<Button aria-label="ricercaBtn" className="p-2" variant="ghost">
+						<Search className="size-5" />
 					</Button>
 				</DialogTrigger>
 				<DialogContent className="border-none bg-transparent sm:max-w-xl [&_[data-slot=dialog-close]]:hidden">
diff --git a/apps/infoalloggi/src/components/navbar/site-header.tsx b/apps/infoalloggi/src/components/navbar/site-header.tsx
index a10f523..3f0eca3 100644
--- a/apps/infoalloggi/src/components/navbar/site-header.tsx
+++ b/apps/infoalloggi/src/components/navbar/site-header.tsx
@@ -5,8 +5,7 @@ import { UserHeaderSection } from "~/components/navbar/login-button";
 import { MainNav } from "~/components/navbar/main-nav";
 import { MobileNav } from "~/components/navbar/mobile-nav";
 import { RicercaCommand } from "~/components/navbar/ricerca_command";
-import { LangToggle } from "./lang-toggle";
-import { ThemeSwitch } from "./theme-toggle";
+import { SettingsPopover } from "./settings-modal";
 
 export function SiteHeader() {
 	const pathname = usePathname();
@@ -37,8 +36,7 @@ export function SiteHeader() {
 					<RicercaCommand />
 
 					<div className="hidden w-fit items-center gap-2 md:flex">
-						<LangToggle />
-						<ThemeSwitch />
+						<SettingsPopover />
 					</div>
 					<UserHeaderSection
 						key={pathname}
diff --git a/apps/infoalloggi/src/components/navbar/theme-toggle.tsx b/apps/infoalloggi/src/components/navbar/theme-toggle.tsx
index b521541..ebf628b 100644
--- a/apps/infoalloggi/src/components/navbar/theme-toggle.tsx
+++ b/apps/infoalloggi/src/components/navbar/theme-toggle.tsx
@@ -46,15 +46,15 @@ const ThemeSwitchContent = () => {
 			type="button"
 		>
 			<motion.div
-				animate={{ opacity: 1 }}
+				//animate={{ opacity: 1 }}
 				className={cn(
 					"flex size-5.5 items-center justify-center rounded-full bg-black",
 					theme === "light" ? "bg-yellow-300" : "bg-gray-800/60",
 				)}
-				initial={{ opacity: 0 }}
+				//initial={{ opacity: 0 }}
 				layout
 				transition={{
-					opacity: { duration: 0.1, ease: "easeInOut", delay: 0.5 }, // Fast fade in
+					//opacity: { duration: 0.1, ease: "easeInOut", delay: 0.5 }, // Fast fade in
 					layout: spring, // Spring for position change
 				}}
 			>