diff --git a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts
index 01a911d70..dedb35465 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts
+++ b/surfsense_web/components/assistant-ui/connector-popup/constants/connector-constants.ts
@@ -1,5 +1,4 @@
 import { EnumConnectorName } from "@/contracts/enums/connector";
-import type { SearchSourceConnector } from "@/contracts/types/connector.types";
 
 /**
  * Connectors that operate in real time (no background indexing).
@@ -230,6 +229,20 @@ export const COMPOSIO_CONNECTORS = [
 	},
 ] as const;
 
+export const CONNECTOR_DISPLAY_DEFINITIONS = [
+	...OAUTH_CONNECTORS,
+	...CRAWLERS,
+	...OTHER_CONNECTORS,
+	...COMPOSIO_CONNECTORS,
+] as const;
+
+export function getConnectorTitle(connectorType: string): string {
+	return (
+		CONNECTOR_DISPLAY_DEFINITIONS.find((connector) => connector.connectorType === connectorType)
+			?.title ?? connectorType
+	);
+}
+
 // Composio Toolkits (available integrations via Composio)
 export const COMPOSIO_TOOLKITS = [
 	{
diff --git a/surfsense_web/components/new-chat/composer-suggestion-popup.tsx b/surfsense_web/components/new-chat/composer-suggestion-popup.tsx
index fd46d8ee7..d72cf1366 100644
--- a/surfsense_web/components/new-chat/composer-suggestion-popup.tsx
+++ b/surfsense_web/components/new-chat/composer-suggestion-popup.tsx
@@ -31,7 +31,7 @@ function ComposerSuggestionPopoverContent({
 				onCloseAutoFocus?.(event);
 			}}
 			className={cn(
-				"w-[280px] overflow-hidden rounded-md border border-popover-border bg-popover p-0 text-popover-foreground shadow-md sm:w-[320px]",
+				"w-[256px] overflow-hidden rounded-md border border-popover-border bg-popover p-0 text-popover-foreground shadow-md sm:w-[288px]",
 				"data-[state=open]:!animate-none data-[state=closed]:!animate-none data-[state=open]:!duration-0 data-[state=closed]:!duration-0",
 				className
 			)}
@@ -47,14 +47,14 @@ const ComposerSuggestionList = React.forwardRef<
 >(({ className, ...props }, ref) => (
 	<div
 		ref={ref}
-		className={cn("max-h-[180px] overflow-y-auto sm:max-h-[280px]", className)}
+		className={cn("max-h-[160px] overflow-y-auto sm:max-h-[232px]", className)}
 		{...props}
 	/>
 ));
 ComposerSuggestionList.displayName = "ComposerSuggestionList";
 
 function ComposerSuggestionGroup({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
-	return <div className={cn("px-2 py-1", className)} {...props} />;
+	return <div className={cn("px-1.5 py-2", className)} {...props} />;
 }
 
 function ComposerSuggestionGroupHeading({
@@ -63,12 +63,32 @@ function ComposerSuggestionGroupHeading({
 }: React.HTMLAttributes<HTMLDivElement>) {
 	return (
 		<div
-			className={cn("px-3 py-2 text-xs font-bold text-muted-foreground/55", className)}
+			className={cn("px-2.5 py-1.5 text-xs font-bold text-muted-foreground/55", className)}
 			{...props}
 		/>
 	);
 }
 
+function ComposerSuggestionHeader({
+	className,
+	icon,
+	children,
+	...props
+}: React.HTMLAttributes<HTMLDivElement> & { icon?: React.ReactNode }) {
+	return (
+		<div
+			className={cn(
+				"flex items-center gap-2 px-2 py-1.5 text-sm font-semibold text-muted-foreground",
+				className
+			)}
+			{...props}
+		>
+			{icon ? <span className="shrink-0 text-muted-foreground">{icon}</span> : null}
+			{children}
+		</div>
+	);
+}
+
 const ComposerSuggestionItem = React.forwardRef<
 	HTMLButtonElement,
 	Omit<React.ComponentProps<typeof Button>, "variant"> & {
@@ -83,7 +103,7 @@ const ComposerSuggestionItem = React.forwardRef<
 		variant="ghost"
 		disabled={disabled}
 		className={cn(
-			"h-auto w-full justify-start gap-2 rounded-md px-3 py-2 text-left text-sm font-normal transition-colors",
+			"h-auto w-full justify-start gap-2 rounded-md px-2.5 py-1.5 text-left text-sm font-normal transition-colors",
 			disabled ? "cursor-not-allowed opacity-50" : "cursor-pointer",
 			muted && !selected && "text-muted-foreground hover:bg-accent hover:text-accent-foreground",
 			selected && "bg-accent text-accent-foreground",
@@ -99,7 +119,7 @@ ComposerSuggestionItem.displayName = "ComposerSuggestionItem";
 
 function ComposerSuggestionSeparator({ className, ...props }: React.ComponentProps<typeof Separator>) {
 	return (
-		<div className={cn("my-1 px-4", className)}>
+		<div className={cn("my-1 px-3", className)}>
 			<Separator className="bg-popover-border" {...props} />
 		</div>
 	);
@@ -111,10 +131,10 @@ function ComposerSuggestionMessage({
 	variant = "muted",
 }: React.HTMLAttributes<HTMLParagraphElement> & { variant?: "muted" | "destructive" }) {
 	return (
-		<div className="px-2 py-1">
+		<div className="px-1.5 py-1">
 			<p
 				className={cn(
-					"px-3 py-2 text-xs",
+					"px-2.5 py-1.5 text-xs",
 					variant === "destructive" ? "text-destructive" : "text-muted-foreground",
 					className
 				)}
@@ -127,15 +147,15 @@ function ComposerSuggestionMessage({
 
 function ComposerSuggestionSkeleton() {
 	return (
-		<div className="px-2 py-1">
-			<div className="px-3 py-2">
+		<div className="px-1.5 py-1">
+			<div className="px-2.5 py-1.5">
 				<Skeleton className="h-[16px] w-24" />
 			</div>
 			{["a", "b", "c", "d", "e"].map((id, index) => (
 				<div
 					key={id}
 					className={cn(
-						"flex w-full items-center gap-2 rounded-md px-3 py-2 text-left",
+						"flex w-full items-center gap-2 rounded-md px-2.5 py-1.5 text-left",
 						index >= 3 && "hidden sm:flex"
 					)}
 				>
@@ -156,6 +176,7 @@ export {
 	ComposerSuggestionList,
 	ComposerSuggestionGroup,
 	ComposerSuggestionGroupHeading,
+	ComposerSuggestionHeader,
 	ComposerSuggestionItem,
 	ComposerSuggestionSeparator,
 	ComposerSuggestionMessage,
diff --git a/surfsense_web/components/new-chat/document-mention-picker.tsx b/surfsense_web/components/new-chat/document-mention-picker.tsx
index c424ae6c3..c6829507f 100644
--- a/surfsense_web/components/new-chat/document-mention-picker.tsx
+++ b/surfsense_web/components/new-chat/document-mention-picker.tsx
@@ -8,7 +8,7 @@ import {
 	ChevronRight,
 	Files,
 	Folder as FolderIcon,
-	Plug,
+	Unplug,
 } from "lucide-react";
 import {
 	forwardRef,
@@ -23,14 +23,12 @@ import type * as React from "react";
 import type { MentionedDocumentInfo } from "@/atoms/chat/mentioned-documents.atom";
 import { useAtomValue } from "jotai";
 import { connectorsAtom } from "@/atoms/connectors/connector-query.atoms";
-import {
-	COMPOSIO_CONNECTORS,
-	OAUTH_CONNECTORS,
-} from "@/components/assistant-ui/connector-popup/constants/connector-constants";
+import { getConnectorTitle } from "@/components/assistant-ui/connector-popup/constants/connector-constants";
 import { getConnectorDisplayName } from "@/components/assistant-ui/connector-popup/tabs/all-connectors-tab";
 import {
 	ComposerSuggestionGroup,
 	ComposerSuggestionGroupHeading,
+	ComposerSuggestionHeader,
 	ComposerSuggestionItem,
 	ComposerSuggestionList,
 	ComposerSuggestionMessage,
@@ -94,19 +92,6 @@ function useDebounced<T>(value: T, delay = DEBOUNCE_MS) {
 	return debounced;
 }
 
-function titleForConnectorType(connectorType: string) {
-	const configured =
-		OAUTH_CONNECTORS.find((c) => c.connectorType === connectorType) ||
-		COMPOSIO_CONNECTORS.find((c) => c.connectorType === connectorType);
-	return (
-		configured?.title ||
-		connectorType
-			.replace(/_/g, " ")
-			.replace(/connector/gi, "")
-			.trim()
-	);
-}
-
 function makeDocMention(doc: Pick<Document, "id" | "title" | "document_type">): MentionedDocumentInfo {
 	return {
 		id: doc.id,
@@ -130,7 +115,7 @@ function makeConnectorMention(
 	connector: SearchSourceConnector
 ): Extract<MentionedDocumentInfo, { kind: "connector" }> {
 	const accountName = getConnectorDisplayName(connector.name);
-	const connectorTitle = titleForConnectorType(connector.connector_type);
+	const connectorTitle = getConnectorTitle(connector.connector_type);
 	return {
 		id: connector.id,
 		title: `${connectorTitle}: ${accountName}`,
@@ -319,6 +304,7 @@ export const DocumentMentionPicker = forwardRef<
 		() => new Set(initialSelectedDocuments.map((d) => getMentionDocKey(d))),
 		[initialSelectedDocuments]
 	);
+	const showSurfsenseDocsRootRef = useRef((surfsenseDocs?.items?.length ?? 0) > 0);
 
 	const selectMention = useCallback(
 		(mention: MentionedDocumentInfo) => {
@@ -329,35 +315,41 @@ export const DocumentMentionPicker = forwardRef<
 	);
 
 	const rootNodes = useMemo<ComposerSuggestionNode<ResourceNodeValue>[]>(
-		() => [
-			{
-				id: "surfsense-docs",
-				label: "SurfSense Docs",
-				subtitle: "Browse product documentation",
-				icon: <BookOpen className="size-4" />,
-				type: "branch",
-				value: { kind: "view", view: { kind: "surfsense-docs" } },
-			},
-			{
-				id: "files-folders",
-				label: "Files & Folders",
-				subtitle: "Browse your knowledge base",
-				icon: <Files className="size-4" />,
-				type: "branch",
-				value: { kind: "view", view: { kind: "files-folders" } },
-			},
-			{
-				id: "connectors",
-				label: "Connectors",
-				subtitle: activeConnectors.length
-					? "Choose the exact account for tool use"
-					: "No connected accounts yet",
-				icon: <Plug className="size-4" />,
-				type: "branch",
-				disabled: activeConnectors.length === 0,
-				value: { kind: "view", view: { kind: "connectors" } },
-			},
-		],
+		() => {
+			const nodes: ComposerSuggestionNode<ResourceNodeValue>[] = [];
+			if (showSurfsenseDocsRootRef.current) {
+				nodes.push({
+					id: "surfsense-docs",
+					label: "SurfSense Docs",
+					subtitle: "Browse product documentation",
+					icon: <BookOpen className="size-4" />,
+					type: "branch",
+					value: { kind: "view", view: { kind: "surfsense-docs" } },
+				});
+			}
+			nodes.push(
+				{
+					id: "files-folders",
+					label: "Files & Folders",
+					subtitle: "Browse your knowledge base",
+					icon: <Files className="size-4" />,
+					type: "branch",
+					value: { kind: "view", view: { kind: "files-folders" } },
+				},
+				{
+					id: "connectors",
+					label: "Connectors",
+					subtitle: activeConnectors.length
+						? "Choose the exact account for tool use"
+						: "No connected accounts yet",
+				icon: <Unplug className="size-4" />,
+					type: "branch",
+					disabled: activeConnectors.length === 0,
+					value: { kind: "view", view: { kind: "connectors" } },
+				}
+			);
+			return nodes;
+		},
 		[activeConnectors.length]
 	);
 
@@ -389,7 +381,7 @@ export const DocumentMentionPicker = forwardRef<
 				id: getMentionDocKey(mention),
 				label: mention.title,
 				subtitle: "Connector account",
-				icon: getConnectorIcon(mention.connector_type, "size-4") ?? <Plug className="size-4" />,
+				icon: getConnectorIcon(mention.connector_type, "size-4") ?? <Unplug className="size-4" />,
 				type: "item" as const,
 				disabled: selectedKeys.has(getMentionDocKey(mention)),
 				value: { kind: "mention" as const, mention },
@@ -414,7 +406,7 @@ export const DocumentMentionPicker = forwardRef<
 			byType.set(connector.connector_type, list);
 		}
 		return Array.from(byType.entries()).sort(([a], [b]) =>
-			titleForConnectorType(a).localeCompare(titleForConnectorType(b))
+			getConnectorTitle(a).localeCompare(getConnectorTitle(b))
 		);
 	}, [activeConnectors]);
 
@@ -459,16 +451,16 @@ export const DocumentMentionPicker = forwardRef<
 		if (view.kind === "connectors") {
 			return connectorTypeEntries.map(([connectorType, typeConnectors]) => ({
 				id: `connector-type:${connectorType}`,
-				label: titleForConnectorType(connectorType),
+				label: getConnectorTitle(connectorType),
 				subtitle: `${typeConnectors.length} ${typeConnectors.length === 1 ? "account" : "accounts"}`,
-				icon: getConnectorIcon(connectorType, "size-4") ?? <Plug className="size-4" />,
+				icon: getConnectorIcon(connectorType, "size-4") ?? <Unplug className="size-4" />,
 				type: "branch" as const,
 				value: {
 					kind: "view" as const,
 					view: {
 						kind: "connector-type" as const,
 						connectorType,
-						title: titleForConnectorType(connectorType),
+						title: getConnectorTitle(connectorType),
 					},
 				},
 			}));
@@ -481,7 +473,7 @@ export const DocumentMentionPicker = forwardRef<
 					id: getMentionDocKey(mention),
 					label: getConnectorDisplayName(connector.name),
 					subtitle: `${view.title} account`,
-					icon: getConnectorIcon(connector.connector_type, "size-4") ?? <Plug className="size-4" />,
+					icon: getConnectorIcon(connector.connector_type, "size-4") ?? <Unplug className="size-4" />,
 					type: "item" as const,
 					disabled: selectedKeys.has(getMentionDocKey(mention)),
 					value: { kind: "mention" as const, mention },
@@ -571,13 +563,20 @@ export const DocumentMentionPicker = forwardRef<
 				<ComposerSuggestionGroup>
 					{title ? (
 						<>
-							<ComposerSuggestionItem
-								icon={<ChevronLeft className="size-4" />}
-								muted
-								onClick={handleBack}
+							<ComposerSuggestionHeader
+								icon={
+									<button
+										type="button"
+										onClick={handleBack}
+										aria-label="Back"
+										className="-ml-0.5 flex size-5 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground focus-visible:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+									>
+										<ChevronLeft className="size-4" />
+									</button>
+								}
 							>
-								<span className="flex-1 truncate text-sm">{title}</span>
-							</ComposerSuggestionItem>
+								<span className="flex-1 truncate">{title}</span>
+							</ComposerSuggestionHeader>
 							<ComposerSuggestionSeparator />
 						</>
 					) : null}