diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
index d468c7bbe..678d4d447 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Check, ChevronUp, Laptop, Languages, LogOut, Moon, Settings, Sun } from "lucide-react";
+import { ChevronUp, Laptop, Languages, LogOut, Moon, Settings, Sun } from "lucide-react";
 import { useTranslations } from "next-intl";
 import {
 	DropdownMenu,
@@ -195,14 +195,13 @@ export function SidebarUserProfile({
 													key={themeOption.value}
 													onClick={() => handleThemeChange(themeOption.value)}
 													className={cn(
-														"mb-1 last:mb-0",
-														!isSelected && "focus:bg-transparent hover:bg-transparent",
-														isSelected && "bg-accent focus:!bg-accent hover:!bg-accent"
+														"mb-1 last:mb-0 transition-all",
+														"hover:bg-accent/50",
+														isSelected && "bg-accent/80"
 													)}
 												>
 													<Icon className="mr-2 h-4 w-4" />
 													<span className="flex-1">{t(themeOption.value)}</span>
-													{isSelected && <Check className="ml-2 h-4 w-4" />}
 												</DropdownMenuItem>
 											);
 										})}
@@ -225,9 +224,9 @@ export function SidebarUserProfile({
 												key={language.code}
 												onClick={() => handleLanguageChange(language.code)}
 												className={cn(
-													"mb-1 last:mb-0",
-													!isSelected && "focus:bg-transparent hover:bg-transparent",
-													isSelected && "bg-accent focus:!bg-accent hover:!bg-accent"
+													"mb-1 last:mb-0 transition-all",
+													"hover:bg-accent/50",
+													isSelected && "bg-accent/80"
 												)}
 											>
 												<span className="mr-2">{language.flag}</span>
@@ -312,14 +311,13 @@ export function SidebarUserProfile({
 												key={themeOption.value}
 												onClick={() => handleThemeChange(themeOption.value)}
 												className={cn(
-													"mb-1 last:mb-0",
-													!isSelected && "focus:bg-transparent hover:bg-transparent",
-													isSelected && "bg-accent focus:!bg-accent hover:!bg-accent"
+													"mb-1 last:mb-0 transition-all",
+													"hover:bg-accent/50",
+													isSelected && "bg-accent/80"
 												)}
 											>
 												<Icon className="mr-2 h-4 w-4" />
 												<span className="flex-1">{t(themeOption.value)}</span>
-												{isSelected && <Check className="ml-2 h-4 w-4" />}
 											</DropdownMenuItem>
 										);
 									})}
@@ -342,9 +340,9 @@ export function SidebarUserProfile({
 												key={language.code}
 												onClick={() => handleLanguageChange(language.code)}
 												className={cn(
-													"mb-1 last:mb-0",
-													!isSelected && "focus:bg-transparent hover:bg-transparent",
-													isSelected && "bg-accent focus:!bg-accent hover:!bg-accent"
+													"mb-1 last:mb-0 transition-all",
+													"hover:bg-accent/50",
+													isSelected && "bg-accent/80"
 												)}
 											>
 												<span className="mr-2">{language.flag}</span>
diff --git a/surfsense_web/components/new-chat/model-selector.tsx b/surfsense_web/components/new-chat/model-selector.tsx
index 34abf251d..dba29dfcd 100644
--- a/surfsense_web/components/new-chat/model-selector.tsx
+++ b/surfsense_web/components/new-chat/model-selector.tsx
@@ -182,7 +182,7 @@ export function ModelSelector({ onEdit, onAddNew, className }: ModelSelectorProp
 					{isLoading ? (
 						<>
 							<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
-							<span className="text-muted-foreground hidden md:inline">Loading...</span>
+							<span className="text-muted-foreground hidden md:inline">Loading</span>
 						</>
 					) : currentConfig ? (
 						<>
@@ -259,9 +259,9 @@ export function ModelSelector({ onEdit, onAddNew, className }: ModelSelectorProp
 											value={`global-${config.id}`}
 											onSelect={() => handleSelectConfig(config)}
 											className={cn(
-												"mx-2 rounded-lg mb-1 cursor-pointer",
-												!isSelected && "data-[selected=true]:bg-transparent hover:bg-transparent",
-												isSelected && "bg-accent/80 data-[selected=true]:!bg-accent/80 hover:!bg-accent/80"
+												"mx-2 rounded-lg mb-1 cursor-pointer transition-all",
+												"hover:bg-accent/50",
+												isSelected && "bg-accent/80"
 											)}
 										>
 											<div className="flex items-center justify-between w-full gap-2">
@@ -321,9 +321,9 @@ export function ModelSelector({ onEdit, onAddNew, className }: ModelSelectorProp
 											value={`user-${config.id}`}
 											onSelect={() => handleSelectConfig(config)}
 											className={cn(
-												"mx-2 rounded-lg mb-1 cursor-pointer",
-												!isSelected && "data-[selected=true]:bg-transparent hover:bg-transparent",
-												isSelected && "bg-accent/80 data-[selected=true]:!bg-accent/80 hover:!bg-accent/80"
+												"mx-2 rounded-lg mb-1 cursor-pointer transition-all",
+												"hover:bg-accent/50",
+												isSelected && "bg-accent/80"
 											)}
 										>
 											<div className="flex items-center justify-between w-full gap-2">
diff --git a/surfsense_web/components/ui/select.tsx b/surfsense_web/components/ui/select.tsx
index 45e7ce218..c214f1c59 100644
--- a/surfsense_web/components/ui/select.tsx
+++ b/surfsense_web/components/ui/select.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as SelectPrimitive from "@radix-ui/react-select";
-import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";
+import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
 import type * as React from "react";
 
 import { cn } from "@/lib/utils";
@@ -94,16 +94,11 @@ function SelectItem({
 		<SelectPrimitive.Item
 			data-slot="select-item"
 			className={cn(
-				"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+				"focus:bg-accent/50 focus:text-accent-foreground hover:bg-accent/50 [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 px-2 text-sm outline-hidden select-none transition-all data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2 data-[highlighted]:bg-accent/50",
 				className
 			)}
 			{...props}
 		>
-			<span className="absolute right-2 flex size-3.5 items-center justify-center">
-				<SelectPrimitive.ItemIndicator>
-					<CheckIcon className="size-4" />
-				</SelectPrimitive.ItemIndicator>
-			</span>
 			<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
 		</SelectPrimitive.Item>
 	);