diff --git a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
index 117f8acef..0d1dd281e 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllPrivateChatsSidebar.tsx
@@ -34,7 +34,6 @@ import {
 	deleteThread,
 	fetchThreads,
 	searchThreads,
-	type ThreadListItem,
 	updateThread,
 } from "@/lib/chat/thread-persistence";
 import { cn } from "@/lib/utils";
@@ -410,7 +409,7 @@ export function AllPrivateChatsSidebar({
 								</div>
 							) : isSearchMode ? (
 								<div className="text-center py-8">
-									<Search className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
+									<Search className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
 									<p className="text-sm text-muted-foreground">
 										{t("no_chats_found") || "No chats found"}
 									</p>
@@ -420,7 +419,7 @@ export function AllPrivateChatsSidebar({
 								</div>
 							) : (
 								<div className="text-center py-8">
-									<Lock className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
+									<Lock className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
 									<p className="text-sm text-muted-foreground">
 										{showArchived
 											? t("no_archived_chats") || "No archived chats"
diff --git a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
index d2e7bf1d1..f50cb028a 100644
--- a/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/AllSharedChatsSidebar.tsx
@@ -34,7 +34,6 @@ import {
 	deleteThread,
 	fetchThreads,
 	searchThreads,
-	type ThreadListItem,
 	updateThread,
 } from "@/lib/chat/thread-persistence";
 import { cn } from "@/lib/utils";
@@ -410,7 +409,7 @@ export function AllSharedChatsSidebar({
 								</div>
 							) : isSearchMode ? (
 								<div className="text-center py-8">
-									<Search className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
+									<Search className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
 									<p className="text-sm text-muted-foreground">
 										{t("no_chats_found") || "No chats found"}
 									</p>
@@ -420,7 +419,7 @@ export function AllSharedChatsSidebar({
 								</div>
 							) : (
 								<div className="text-center py-8">
-									<Users className="h-12 w-12 mx-auto text-muted-foreground/50 mb-3" />
+									<Users className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
 									<p className="text-sm text-muted-foreground">
 										{showArchived
 											? t("no_archived_chats") || "No archived chats"
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index a23bec11a..9a632506c 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -156,10 +156,10 @@ export function Sidebar({
 											<Button
 												variant="ghost"
 												size="icon"
-												className="h-5 w-5"
+												className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
 												onClick={onViewAllSharedChats}
 											>
-												<FolderOpen className="h-3.5 w-3.5" />
+												<FolderOpen className="h-4 w-4" />
 											</Button>
 										</TooltipTrigger>
 										<TooltipContent side="top">
@@ -197,10 +197,10 @@ export function Sidebar({
 											<Button
 												variant="ghost"
 												size="icon"
-												className="h-5 w-5"
+												className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
 												onClick={onViewAllPrivateChats}
 											>
-												<FolderOpen className="h-3.5 w-3.5" />
+												<FolderOpen className="h-4 w-4" />
 											</Button>
 										</TooltipTrigger>
 										<TooltipContent side="top">
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
index 4d161e3fa..52d681199 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarSection.tsx
@@ -37,14 +37,14 @@ export function SidebarSection({
 
 				{/* Action button - visible on hover (always visible on mobile) */}
 				{action && (
-					<div className="shrink-0 opacity-0 group-hover/section:opacity-100 transition-opacity pr-1 flex items-center gap-0.5">
+					<div className="shrink-0 opacity-0 group-hover/section:opacity-100 transition-opacity pr-1 flex items-center">
 						{action}
 					</div>
 				)}
 
 				{/* Persistent action - always visible */}
 				{persistentAction && (
-					<div className="shrink-0 pr-1 flex items-center gap-0.5">{persistentAction}</div>
+					<div className="shrink-0 pr-1 flex items-center">{persistentAction}</div>
 				)}
 			</div>
 
diff --git a/surfsense_web/lib/electric/client.ts b/surfsense_web/lib/electric/client.ts
index 473e06461..0a881c235 100644
--- a/surfsense_web/lib/electric/client.ts
+++ b/surfsense_web/lib/electric/client.ts
@@ -49,8 +49,8 @@ let initPromise: Promise<ElectricClient> | null = null;
 const activeSyncHandles = new Map<string, SyncHandle>();
 
 // Version for sync state - increment this to force fresh sync when Electric config changes
-// Incremented to v5 for user-specific database architecture
-const SYNC_VERSION = 5;
+// Set to v2 for user-specific database architecture
+const SYNC_VERSION = 2;
 
 // Database name prefix for identifying SurfSense databases
 const DB_PREFIX = "surfsense-";
diff --git a/surfsense_web/messages/en.json b/surfsense_web/messages/en.json
index a066aee4a..0c6fe63a8 100644
--- a/surfsense_web/messages/en.json
+++ b/surfsense_web/messages/en.json
@@ -658,7 +658,7 @@
 	"sidebar": {
 		"chats": "Private Chats",
 		"shared_chats": "Shared Chats",
-		"search_chats": "Search chats...",
+		"search_chats": "Search chats",
 		"no_chats_found": "No chats found",
 		"no_shared_chats": "No shared chats",
 		"view_all_shared_chats": "View all shared chats",