diff --git a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
index d807d5898..1686f3a46 100644
--- a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
+++ b/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
@@ -190,9 +190,7 @@ export function SearchSpaceAvatar({
 							{avatarButton}
 						</div>
 					</DropdownMenuTrigger>
-					<DropdownMenuContent className="w-48">
-						{menuItems}
-					</DropdownMenuContent>
+					<DropdownMenuContent className="w-48">{menuItems}</DropdownMenuContent>
 				</DropdownMenu>
 			);
 		}
diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index 84784d71b..b6caed330 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -594,15 +594,15 @@ export function InboxSidebar({
 						{/* Mobile: Button that opens bottom drawer */}
 						{isMobile ? (
 							<>
-							<Button
-								variant="ghost"
-								size="icon"
-								className="h-8 w-8 rounded-full"
-								onClick={() => setFilterDrawerOpen(true)}
-							>
-								<ListFilter className="h-4 w-4 text-muted-foreground" />
-								<span className="sr-only">{t("filter") || "Filter"}</span>
-							</Button>
+								<Button
+									variant="ghost"
+									size="icon"
+									className="h-8 w-8 rounded-full"
+									onClick={() => setFilterDrawerOpen(true)}
+								>
+									<ListFilter className="h-4 w-4 text-muted-foreground" />
+									<span className="sr-only">{t("filter") || "Filter"}</span>
+								</Button>
 								<Drawer
 									open={filterDrawerOpen}
 									onOpenChange={setFilterDrawerOpen}
@@ -806,36 +806,36 @@ export function InboxSidebar({
 								</DropdownMenuContent>
 							</DropdownMenu>
 						)}
-					{isMobile ? (
-						<Button
-							variant="ghost"
-							size="icon"
-							className="h-8 w-8 rounded-full"
-							onClick={handleMarkAllAsRead}
-							disabled={totalUnreadCount === 0}
-						>
-							<CheckCheck className="h-4 w-4 text-muted-foreground" />
-							<span className="sr-only">{t("mark_all_read") || "Mark all as read"}</span>
-						</Button>
-					) : (
-						<Tooltip>
-							<TooltipTrigger asChild>
-								<Button
-									variant="ghost"
-									size="icon"
-									className="h-8 w-8 rounded-full"
-									onClick={handleMarkAllAsRead}
-									disabled={totalUnreadCount === 0}
-								>
-									<CheckCheck className="h-4 w-4 text-muted-foreground" />
-									<span className="sr-only">{t("mark_all_read") || "Mark all as read"}</span>
-								</Button>
-							</TooltipTrigger>
-							<TooltipContent className="z-80">
-								{t("mark_all_read") || "Mark all as read"}
-							</TooltipContent>
-						</Tooltip>
-					)}
+						{isMobile ? (
+							<Button
+								variant="ghost"
+								size="icon"
+								className="h-8 w-8 rounded-full"
+								onClick={handleMarkAllAsRead}
+								disabled={totalUnreadCount === 0}
+							>
+								<CheckCheck className="h-4 w-4 text-muted-foreground" />
+								<span className="sr-only">{t("mark_all_read") || "Mark all as read"}</span>
+							</Button>
+						) : (
+							<Tooltip>
+								<TooltipTrigger asChild>
+									<Button
+										variant="ghost"
+										size="icon"
+										className="h-8 w-8 rounded-full"
+										onClick={handleMarkAllAsRead}
+										disabled={totalUnreadCount === 0}
+									>
+										<CheckCheck className="h-4 w-4 text-muted-foreground" />
+										<span className="sr-only">{t("mark_all_read") || "Mark all as read"}</span>
+									</Button>
+								</TooltipTrigger>
+								<TooltipContent className="z-80">
+									{t("mark_all_read") || "Mark all as read"}
+								</TooltipContent>
+							</Tooltip>
+						)}
 						{/* Dock/Undock button - desktop only */}
 						{!isMobile && onDockedChange && (
 							<Tooltip>
@@ -984,61 +984,61 @@ export function InboxSidebar({
 										isMarkingAsRead && "opacity-50 pointer-events-none"
 									)}
 								>
-								{isMobile ? (
-									<button
-										type="button"
-										onClick={() => handleItemClick(item)}
-										disabled={isMarkingAsRead}
-										className="flex items-center gap-3 flex-1 min-w-0 text-left overflow-hidden"
-									>
-										<div className="shrink-0">{getStatusIcon(item)}</div>
-										<div className="flex-1 min-w-0 overflow-hidden">
-											<p
-												className={cn(
-													"text-xs font-medium line-clamp-2",
-													!item.read && "font-semibold"
-												)}
-											>
-												{item.title}
-											</p>
-											<p className="text-[11px] text-muted-foreground line-clamp-2 mt-0.5">
-												{convertRenderedToDisplay(item.message)}
-											</p>
-										</div>
-									</button>
-								) : (
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<button
-												type="button"
-												onClick={() => handleItemClick(item)}
-												disabled={isMarkingAsRead}
-												className="flex items-center gap-3 flex-1 min-w-0 text-left overflow-hidden"
-											>
-												<div className="shrink-0">{getStatusIcon(item)}</div>
-												<div className="flex-1 min-w-0 overflow-hidden">
-													<p
-														className={cn(
-															"text-xs font-medium line-clamp-2",
-															!item.read && "font-semibold"
-														)}
-													>
-														{item.title}
-													</p>
-													<p className="text-[11px] text-muted-foreground line-clamp-2 mt-0.5">
-														{convertRenderedToDisplay(item.message)}
-													</p>
-												</div>
-											</button>
-										</TooltipTrigger>
-										<TooltipContent side="bottom" align="start" className="max-w-[250px]">
-											<p className="font-medium">{item.title}</p>
-											<p className="text-muted-foreground mt-1">
-												{convertRenderedToDisplay(item.message)}
-											</p>
-										</TooltipContent>
-									</Tooltip>
-								)}
+									{isMobile ? (
+										<button
+											type="button"
+											onClick={() => handleItemClick(item)}
+											disabled={isMarkingAsRead}
+											className="flex items-center gap-3 flex-1 min-w-0 text-left overflow-hidden"
+										>
+											<div className="shrink-0">{getStatusIcon(item)}</div>
+											<div className="flex-1 min-w-0 overflow-hidden">
+												<p
+													className={cn(
+														"text-xs font-medium line-clamp-2",
+														!item.read && "font-semibold"
+													)}
+												>
+													{item.title}
+												</p>
+												<p className="text-[11px] text-muted-foreground line-clamp-2 mt-0.5">
+													{convertRenderedToDisplay(item.message)}
+												</p>
+											</div>
+										</button>
+									) : (
+										<Tooltip>
+											<TooltipTrigger asChild>
+												<button
+													type="button"
+													onClick={() => handleItemClick(item)}
+													disabled={isMarkingAsRead}
+													className="flex items-center gap-3 flex-1 min-w-0 text-left overflow-hidden"
+												>
+													<div className="shrink-0">{getStatusIcon(item)}</div>
+													<div className="flex-1 min-w-0 overflow-hidden">
+														<p
+															className={cn(
+																"text-xs font-medium line-clamp-2",
+																!item.read && "font-semibold"
+															)}
+														>
+															{item.title}
+														</p>
+														<p className="text-[11px] text-muted-foreground line-clamp-2 mt-0.5">
+															{convertRenderedToDisplay(item.message)}
+														</p>
+													</div>
+												</button>
+											</TooltipTrigger>
+											<TooltipContent side="bottom" align="start" className="max-w-[250px]">
+												<p className="font-medium">{item.title}</p>
+												<p className="text-muted-foreground mt-1">
+													{convertRenderedToDisplay(item.message)}
+												</p>
+											</TooltipContent>
+										</Tooltip>
+									)}
 
 									{/* Time and unread dot - fixed width to prevent content shift */}
 									<div className="flex items-center justify-end gap-1.5 shrink-0 w-10">
diff --git a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
index 49f5a1de6..883fa5890 100644
--- a/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/Sidebar.tsx
@@ -101,21 +101,21 @@ export function Sidebar({
 					/>
 				</div>
 			) : (
-			<div className="flex h-14 shrink-0 items-center gap-0 px-1 border-b">
-				<SidebarHeader
-					searchSpace={searchSpace}
-					isCollapsed={isCollapsed}
-					onSettings={onSettings}
-					onManageMembers={onManageMembers}
-				/>
-				<div className="shrink-0">
-					<SidebarCollapseButton
+				<div className="flex h-14 shrink-0 items-center gap-0 px-1 border-b">
+					<SidebarHeader
+						searchSpace={searchSpace}
 						isCollapsed={isCollapsed}
-						onToggle={onToggleCollapse ?? (() => {})}
-						disableTooltip={disableTooltips}
+						onSettings={onSettings}
+						onManageMembers={onManageMembers}
 					/>
+					<div className="shrink-0">
+						<SidebarCollapseButton
+							isCollapsed={isCollapsed}
+							onToggle={onToggleCollapse ?? (() => {})}
+							disableTooltip={disableTooltips}
+						/>
+					</div>
 				</div>
-			</div>
 			)}
 
 			{/* New chat button */}
@@ -149,38 +149,38 @@ export function Sidebar({
 						defaultOpen={true}
 						fillHeight={false}
 						className="shrink-0 max-h-[50%] flex flex-col"
-					action={
-						onViewAllSharedChats ? (
-							disableTooltips ? (
-								<Button
-									variant="ghost"
-									size="icon"
-									className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
-									onClick={onViewAllSharedChats}
-								>
-									<FolderOpen className="h-4 w-4" />
-								</Button>
-							) : (
-								<Tooltip>
-									<TooltipTrigger asChild>
-										<Button
-											variant="ghost"
-											size="icon"
-											className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
-											onClick={onViewAllSharedChats}
-										>
-											<FolderOpen className="h-4 w-4" />
-										</Button>
-									</TooltipTrigger>
-									<TooltipContent side="top">
-										{t("view_all_shared_chats") || "View all shared chats"}
-									</TooltipContent>
-								</Tooltip>
-							)
-						) : undefined
-					}
-				>
-					{isLoadingChats ? (
+						action={
+							onViewAllSharedChats ? (
+								disableTooltips ? (
+									<Button
+										variant="ghost"
+										size="icon"
+										className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
+										onClick={onViewAllSharedChats}
+									>
+										<FolderOpen className="h-4 w-4" />
+									</Button>
+								) : (
+									<Tooltip>
+										<TooltipTrigger asChild>
+											<Button
+												variant="ghost"
+												size="icon"
+												className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
+												onClick={onViewAllSharedChats}
+											>
+												<FolderOpen className="h-4 w-4" />
+											</Button>
+										</TooltipTrigger>
+										<TooltipContent side="top">
+											{t("view_all_shared_chats") || "View all shared chats"}
+										</TooltipContent>
+									</Tooltip>
+								)
+							) : undefined
+						}
+					>
+						{isLoadingChats ? (
 							<div className="flex flex-col gap-0.5">
 								<ChatListItemSkeleton />
 								<ChatListItemSkeleton />
@@ -221,36 +221,36 @@ export function Sidebar({
 						title={t("chats")}
 						defaultOpen={true}
 						fillHeight={true}
-					action={
-						onViewAllPrivateChats ? (
-							disableTooltips ? (
-								<Button
-									variant="ghost"
-									size="icon"
-									className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
-									onClick={onViewAllPrivateChats}
-								>
-									<FolderOpen className="h-4 w-4" />
-								</Button>
-							) : (
-								<Tooltip>
-									<TooltipTrigger asChild>
-										<Button
-											variant="ghost"
-											size="icon"
-											className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
-											onClick={onViewAllPrivateChats}
-										>
-											<FolderOpen className="h-4 w-4" />
-										</Button>
-									</TooltipTrigger>
-									<TooltipContent side="top">
-										{t("view_all_private_chats") || "View all private chats"}
-									</TooltipContent>
-								</Tooltip>
-							)
-						) : undefined
-					}
+						action={
+							onViewAllPrivateChats ? (
+								disableTooltips ? (
+									<Button
+										variant="ghost"
+										size="icon"
+										className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
+										onClick={onViewAllPrivateChats}
+									>
+										<FolderOpen className="h-4 w-4" />
+									</Button>
+								) : (
+									<Tooltip>
+										<TooltipTrigger asChild>
+											<Button
+												variant="ghost"
+												size="icon"
+												className="h-8 w-8 shrink-0 hover:bg-transparent hover:text-current focus-visible:ring-0"
+												onClick={onViewAllPrivateChats}
+											>
+												<FolderOpen className="h-4 w-4" />
+											</Button>
+										</TooltipTrigger>
+										<TooltipContent side="top">
+											{t("view_all_private_chats") || "View all private chats"}
+										</TooltipContent>
+									</Tooltip>
+								)
+							) : undefined
+						}
 					>
 						{isLoadingChats ? (
 							<div className="flex flex-col gap-0.5">
diff --git a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
index 5a02bc09c..44f05249c 100644
--- a/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/SidebarCollapseButton.tsx
@@ -11,15 +11,17 @@ interface SidebarCollapseButtonProps {
 	disableTooltip?: boolean;
 }
 
-export function SidebarCollapseButton({ isCollapsed, onToggle, disableTooltip = false }: SidebarCollapseButtonProps) {
+export function SidebarCollapseButton({
+	isCollapsed,
+	onToggle,
+	disableTooltip = false,
+}: SidebarCollapseButtonProps) {
 	const t = useTranslations("sidebar");
 
 	const button = (
 		<Button variant="ghost" size="icon" onClick={onToggle} className="h-8 w-8 shrink-0">
 			{isCollapsed ? <PanelLeft className="h-4 w-4" /> : <PanelLeftClose className="h-4 w-4" />}
-			<span className="sr-only">
-				{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}
-			</span>
+			<span className="sr-only">{isCollapsed ? t("expand_sidebar") : t("collapse_sidebar")}</span>
 		</Button>
 	);
 
@@ -29,9 +31,7 @@ export function SidebarCollapseButton({ isCollapsed, onToggle, disableTooltip =
 
 	return (
 		<Tooltip>
-			<TooltipTrigger asChild>
-				{button}
-			</TooltipTrigger>
+			<TooltipTrigger asChild>{button}</TooltipTrigger>
 			<TooltipContent side={isCollapsed ? "right" : "bottom"}>
 				{isCollapsed ? `${t("expand_sidebar")} (⌘B)` : `${t("collapse_sidebar")} (⌘B)`}
 			</TooltipContent>