diff --git a/surfsense_web/app/dashboard/[search_space_id]/connectors/[connector_id]/edit/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/connectors/[connector_id]/edit/page.tsx
index 5afea12c9..644dbc981 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/connectors/[connector_id]/edit/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/connectors/[connector_id]/edit/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useEffect } from 'react';
+import React, { useEffect } from "react";
 import { useRouter, useParams } from "next/navigation";
 import { motion } from "framer-motion";
 import { toast } from "sonner";
@@ -8,180 +8,208 @@ import { ArrowLeft, Check, Loader2, Github } from "lucide-react";
 
 import { Form } from "@/components/ui/form";
 import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardFooter,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
 
 // Import Utils, Types, Hook, and Components
-import { getConnectorTypeDisplay } from '@/lib/connectors/utils';
-import { useConnectorEditPage } from '@/hooks/useConnectorEditPage';
+import { getConnectorTypeDisplay } from "@/lib/connectors/utils";
+import { useConnectorEditPage } from "@/hooks/useConnectorEditPage";
 import { EditConnectorLoadingSkeleton } from "@/components/editConnector/EditConnectorLoadingSkeleton";
 import { EditConnectorNameForm } from "@/components/editConnector/EditConnectorNameForm";
 import { EditGitHubConnectorConfig } from "@/components/editConnector/EditGitHubConnectorConfig";
 import { EditSimpleTokenForm } from "@/components/editConnector/EditSimpleTokenForm";
+import { getConnectorIcon } from "@/components/chat";
 
 export default function EditConnectorPage() {
-    const router = useRouter();
-    const params = useParams();
-    const searchSpaceId = params.search_space_id as string;
-    // Ensure connectorId is parsed safely
-    const connectorIdParam = params.connector_id as string;
-    const connectorId = connectorIdParam ? parseInt(connectorIdParam, 10) : NaN;
+	const router = useRouter();
+	const params = useParams();
+	const searchSpaceId = params.search_space_id as string;
+	// Ensure connectorId is parsed safely
+	const connectorIdParam = params.connector_id as string;
+	const connectorId = connectorIdParam ? parseInt(connectorIdParam, 10) : NaN;
 
-    // Use the custom hook to manage state and logic
-    const {
-        connectorsLoading,
-        connector,
-        isSaving,
-        editForm,
-        patForm, // Needed for GitHub child component
-        handleSaveChanges,
-        // GitHub specific props for the child component
-        editMode,
-        setEditMode, // Pass down if needed by GitHub component
-        originalPat,
-        currentSelectedRepos,
-        fetchedRepos,
-        setFetchedRepos,
-        newSelectedRepos,
-        setNewSelectedRepos,
-        isFetchingRepos,
-        handleFetchRepositories,
-        handleRepoSelectionChange,
-    } = useConnectorEditPage(connectorId, searchSpaceId);
+	// Use the custom hook to manage state and logic
+	const {
+		connectorsLoading,
+		connector,
+		isSaving,
+		editForm,
+		patForm, // Needed for GitHub child component
+		handleSaveChanges,
+		// GitHub specific props for the child component
+		editMode,
+		setEditMode, // Pass down if needed by GitHub component
+		originalPat,
+		currentSelectedRepos,
+		fetchedRepos,
+		setFetchedRepos,
+		newSelectedRepos,
+		setNewSelectedRepos,
+		isFetchingRepos,
+		handleFetchRepositories,
+		handleRepoSelectionChange,
+	} = useConnectorEditPage(connectorId, searchSpaceId);
 
-    // Redirect if connectorId is not a valid number after parsing
-    useEffect(() => {
-        if (isNaN(connectorId)) {
-            toast.error("Invalid Connector ID.");
-            router.push(`/dashboard/${searchSpaceId}/connectors`);
-        }
-    }, [connectorId, router, searchSpaceId]);
+	// Redirect if connectorId is not a valid number after parsing
+	useEffect(() => {
+		if (isNaN(connectorId)) {
+			toast.error("Invalid Connector ID.");
+			router.push(`/dashboard/${searchSpaceId}/connectors`);
+		}
+	}, [connectorId, router, searchSpaceId]);
 
-    // Loading State
-    if (connectorsLoading || !connector) {
-        // Handle NaN case before showing skeleton
-        if (isNaN(connectorId)) return null; 
-        return <EditConnectorLoadingSkeleton />;
-    }
+	// Loading State
+	if (connectorsLoading || !connector) {
+		// Handle NaN case before showing skeleton
+		if (isNaN(connectorId)) return null;
+		return <EditConnectorLoadingSkeleton />;
+	}
 
-    // Main Render using data/handlers from the hook
-    return (
-        <div className="container mx-auto py-8 max-w-3xl">
-            <Button variant="ghost" className="mb-6" onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors`)}>
-                <ArrowLeft className="mr-2 h-4 w-4" /> Back to Connectors
-            </Button>
+	// Main Render using data/handlers from the hook
+	return (
+		<div className="container mx-auto py-8 max-w-3xl">
+			<Button
+				variant="ghost"
+				className="mb-6"
+				onClick={() => router.push(`/dashboard/${searchSpaceId}/connectors`)}
+			>
+				<ArrowLeft className="mr-2 h-4 w-4" /> Back to Connectors
+			</Button>
 
-            <motion.div initial={{ opacity: 0, y: 20 }} animate={{ opacity: 1, y: 0 }} transition={{ duration: 0.5 }}>
-                <Card className="border-2 border-border">
-                    <CardHeader>
-                        <CardTitle className="text-2xl font-bold flex items-center gap-2">
-                            <Github className="h-6 w-6" /> {/* TODO: Dynamic icon */}
-                            Edit {getConnectorTypeDisplay(connector.connector_type)} Connector
-                        </CardTitle>
-                        <CardDescription>Modify connector name and configuration.</CardDescription>
-                    </CardHeader>
+			<motion.div
+				initial={{ opacity: 0, y: 20 }}
+				animate={{ opacity: 1, y: 0 }}
+				transition={{ duration: 0.5 }}
+			>
+				<Card className="border-2 border-border">
+					<CardHeader>
+						<CardTitle className="text-2xl font-bold flex items-center gap-2">
+							{getConnectorIcon(connector.connector_type)}
+							Edit {getConnectorTypeDisplay(connector.connector_type)} Connector
+						</CardTitle>
+						<CardDescription>
+							Modify connector name and configuration.
+						</CardDescription>
+					</CardHeader>
 
-                    <Form {...editForm}> 
-                        {/* Pass hook's handleSaveChanges */}
-                        <form onSubmit={editForm.handleSubmit(handleSaveChanges)} className="space-y-6">
-                            <CardContent className="space-y-6">
-                                {/* Pass form control from hook */}
-                                <EditConnectorNameForm control={editForm.control} />
+					<Form {...editForm}>
+						{/* Pass hook's handleSaveChanges */}
+						<form
+							onSubmit={editForm.handleSubmit(handleSaveChanges)}
+							className="space-y-6"
+						>
+							<CardContent className="space-y-6">
+								{/* Pass form control from hook */}
+								<EditConnectorNameForm control={editForm.control} />
 
-                                <hr />
+								<hr />
 
-                                <h3 className="text-lg font-semibold">Configuration</h3>
+								<h3 className="text-lg font-semibold">Configuration</h3>
 
-                                {/* == GitHub == */}
-                                {connector.connector_type === 'GITHUB_CONNECTOR' && (
-                                    <EditGitHubConnectorConfig
-                                        // Pass relevant state and handlers from hook
-                                        editMode={editMode}
-                                        setEditMode={setEditMode} // Pass setter if child manages mode
-                                        originalPat={originalPat}
-                                        currentSelectedRepos={currentSelectedRepos}
-                                        fetchedRepos={fetchedRepos}
-                                        newSelectedRepos={newSelectedRepos}
-                                        isFetchingRepos={isFetchingRepos}
-                                        patForm={patForm}
-                                        handleFetchRepositories={handleFetchRepositories}
-                                        handleRepoSelectionChange={handleRepoSelectionChange}
-                                        setNewSelectedRepos={setNewSelectedRepos}
-                                        setFetchedRepos={setFetchedRepos}
-                                    />
-                                )}
+								{/* == GitHub == */}
+								{connector.connector_type === "GITHUB_CONNECTOR" && (
+									<EditGitHubConnectorConfig
+										// Pass relevant state and handlers from hook
+										editMode={editMode}
+										setEditMode={setEditMode} // Pass setter if child manages mode
+										originalPat={originalPat}
+										currentSelectedRepos={currentSelectedRepos}
+										fetchedRepos={fetchedRepos}
+										newSelectedRepos={newSelectedRepos}
+										isFetchingRepos={isFetchingRepos}
+										patForm={patForm}
+										handleFetchRepositories={handleFetchRepositories}
+										handleRepoSelectionChange={handleRepoSelectionChange}
+										setNewSelectedRepos={setNewSelectedRepos}
+										setFetchedRepos={setFetchedRepos}
+									/>
+								)}
 
-                                {/* == Slack == */}
-                                {connector.connector_type === 'SLACK_CONNECTOR' && (
-                                    <EditSimpleTokenForm
-                                        control={editForm.control}
-                                        fieldName="SLACK_BOT_TOKEN"
-                                        fieldLabel="Slack Bot Token"
-                                        fieldDescription="Update the Slack Bot Token if needed."
-                                        placeholder="Begins with xoxb-..."
-                                    />
-                                )}
-                                {/* == Notion == */}
-                                {connector.connector_type === 'NOTION_CONNECTOR' && (
-                                    <EditSimpleTokenForm
-                                        control={editForm.control}
-                                        fieldName="NOTION_INTEGRATION_TOKEN"
-                                        fieldLabel="Notion Integration Token"
-                                        fieldDescription="Update the Notion Integration Token if needed."
-                                        placeholder="Begins with secret_..."
-                                    />
-                                )}
-                                {/* == Serper == */}
-                                {connector.connector_type === 'SERPER_API' && (
-                                    <EditSimpleTokenForm
-                                        control={editForm.control}
-                                        fieldName="SERPER_API_KEY"
-                                        fieldLabel="Serper API Key"
-                                        fieldDescription="Update the Serper API Key if needed."
-                                    />
-                                )}
-                                {/* == Tavily == */}
-                                {connector.connector_type === 'TAVILY_API' && (
-                                    <EditSimpleTokenForm
-                                        control={editForm.control}
-                                        fieldName="TAVILY_API_KEY"
-                                        fieldLabel="Tavily API Key"
-                                        fieldDescription="Update the Tavily API Key if needed."
-                                    />
-                                )}
+								{/* == Slack == */}
+								{connector.connector_type === "SLACK_CONNECTOR" && (
+									<EditSimpleTokenForm
+										control={editForm.control}
+										fieldName="SLACK_BOT_TOKEN"
+										fieldLabel="Slack Bot Token"
+										fieldDescription="Update the Slack Bot Token if needed."
+										placeholder="Begins with xoxb-..."
+									/>
+								)}
+								{/* == Notion == */}
+								{connector.connector_type === "NOTION_CONNECTOR" && (
+									<EditSimpleTokenForm
+										control={editForm.control}
+										fieldName="NOTION_INTEGRATION_TOKEN"
+										fieldLabel="Notion Integration Token"
+										fieldDescription="Update the Notion Integration Token if needed."
+										placeholder="Begins with secret_..."
+									/>
+								)}
+								{/* == Serper == */}
+								{connector.connector_type === "SERPER_API" && (
+									<EditSimpleTokenForm
+										control={editForm.control}
+										fieldName="SERPER_API_KEY"
+										fieldLabel="Serper API Key"
+										fieldDescription="Update the Serper API Key if needed."
+									/>
+								)}
+								{/* == Tavily == */}
+								{connector.connector_type === "TAVILY_API" && (
+									<EditSimpleTokenForm
+										control={editForm.control}
+										fieldName="TAVILY_API_KEY"
+										fieldLabel="Tavily API Key"
+										fieldDescription="Update the Tavily API Key if needed."
+									/>
+								)}
 
-                                {/* == Linear == */}
-                                {connector.connector_type === 'LINEAR_CONNECTOR' && (
-                                    <EditSimpleTokenForm
-                                        control={editForm.control}
-                                        fieldName="LINEAR_API_KEY"
-                                        fieldLabel="Linear API Key"
-                                        fieldDescription="Update your Linear API Key if needed."
-                                        placeholder="Begins with lin_api_..."
-                                    />
-                                )}
+								{/* == Linear == */}
+								{connector.connector_type === "LINEAR_CONNECTOR" && (
+									<EditSimpleTokenForm
+										control={editForm.control}
+										fieldName="LINEAR_API_KEY"
+										fieldLabel="Linear API Key"
+										fieldDescription="Update your Linear API Key if needed."
+										placeholder="Begins with lin_api_..."
+									/>
+								)}
 
-                                {/* == Linkup == */}
-                                {connector.connector_type === 'LINKUP_API' && (
-                                    <EditSimpleTokenForm
-                                        control={editForm.control}
-                                        fieldName="LINKUP_API_KEY"
-                                        fieldLabel="Linkup API Key"
-                                        fieldDescription="Update your Linkup API Key if needed."
-                                        placeholder="Begins with linkup_..."
-                                    />
-                                )}
-
-                            </CardContent>
-                            <CardFooter className="border-t pt-6">
-                                <Button type="submit" disabled={isSaving} className="w-full sm:w-auto">
-                                    {isSaving ? <Loader2 className="mr-2 h-4 w-4 animate-spin" /> : <Check className="mr-2 h-4 w-4" />}
-                                    Save Changes
-                                </Button>
-                            </CardFooter>
-                        </form>
-                    </Form>
-                </Card>
-            </motion.div>
-        </div>
-    );
-} 
+								{/* == Linkup == */}
+								{connector.connector_type === "LINKUP_API" && (
+									<EditSimpleTokenForm
+										control={editForm.control}
+										fieldName="LINKUP_API_KEY"
+										fieldLabel="Linkup API Key"
+										fieldDescription="Update your Linkup API Key if needed."
+										placeholder="Begins with linkup_..."
+									/>
+								)}
+							</CardContent>
+							<CardFooter className="border-t pt-6">
+								<Button
+									type="submit"
+									disabled={isSaving}
+									className="w-full sm:w-auto"
+								>
+									{isSaving ? (
+										<Loader2 className="mr-2 h-4 w-4 animate-spin" />
+									) : (
+										<Check className="mr-2 h-4 w-4" />
+									)}
+									Save Changes
+								</Button>
+							</CardFooter>
+						</form>
+					</Form>
+				</Card>
+			</motion.div>
+		</div>
+	);
+}