diff --git a/frontend/src/app/settings/page.tsx b/frontend/src/app/settings/page.tsx
index fd155c31..c2c4fce2 100644
--- a/frontend/src/app/settings/page.tsx
+++ b/frontend/src/app/settings/page.tsx
@@ -17,7 +17,6 @@ import {
 import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
 import { useAuth } from "@/contexts/auth-context";
 import { useTask } from "@/contexts/task-context";
 
@@ -90,10 +89,6 @@ function KnowledgeSourcesPage() {
   const [langflowEditUrl, setLangflowEditUrl] = useState<string>("");
   const [publicLangflowUrl, setPublicLangflowUrl] = useState<string>("");
 
-  // Knowledge Ingest settings
-  const [ocrEnabled, setOcrEnabled] = useState<boolean>(false);
-  const [pictureDescriptionsEnabled, setPictureDescriptionsEnabled] =
-    useState<boolean>(false);
 
   // Fetch settings from backend
   const fetchSettings = useCallback(async () => {
@@ -388,7 +383,7 @@ function KnowledgeSourcesPage() {
     }
   }, [tasks, prevTasks]);
 
-  const handleEditInLangflow = () => {
+  const handleEditInLangflow = (targetFlowId: string, closeDialog: () => void) => {
     const derivedFromWindow =
       typeof window !== "undefined"
         ? `${window.location.protocol}//${window.location.hostname}:7860`
@@ -398,21 +393,39 @@ function KnowledgeSourcesPage() {
       derivedFromWindow ||
       "http://localhost:7860"
     ).replace(/\/$/, "");
-    const computed = flowId ? `${base}/flow/${flowId}` : base;
+    const computed = targetFlowId ? `${base}/flow/${targetFlowId}` : base;
     const url = langflowEditUrl || computed;
     window.open(url, "_blank");
+    closeDialog(); // Close immediately after opening Langflow
   };
 
-  const handleRestoreFlow = () => {
+  const handleRestoreFlow = (closeDialog: () => void) => {
     fetch(`/api/reset-flow/retrieval`, {
       method: "POST",
     })
       .then((response) => response.json())
       .then((data) => {
         console.log(data);
+        closeDialog(); // Close after successful completion
       })
       .catch((error) => {
         console.error("Error restoring flow:", error);
+        closeDialog(); // Close even on error (could show error toast instead)
+      });
+  };
+
+  const handleRestoreAgentFlow = (closeDialog: () => void) => {
+    fetch(`/api/reset-flow/agent`, {
+      method: "POST",
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log(data);
+        closeDialog(); // Close after successful completion
+      })
+      .catch((error) => {
+        console.error("Error restoring agent flow:", error);
+        closeDialog(); // Close even on error (could show error toast instead)
       });
   };
 
@@ -466,12 +479,13 @@ function KnowledgeSourcesPage() {
                 title="Edit Ingest flow in Langflow"
                 description="You're entering Langflow. You can edit the Ingest flow and other underlying flows. Manual changes to components, wiring, or I/O can break this experience."
                 confirmText="Proceed"
-                onConfirm={handleEditInLangflow}
+                onConfirm={(closeDialog) => handleEditInLangflow(flowId, closeDialog)}
               />
             </div>
           </div>
         </CardHeader>
-        <CardContent>
+        {/* Hidden for now */}
+        {/* <CardContent>
           <div className="space-y-8">
             <div className="flex items-center justify-between">
               <div className="space-y-0.5">
@@ -510,7 +524,7 @@ function KnowledgeSourcesPage() {
               />
             </div>
           </div>
-        </CardContent>
+        </CardContent> */}
       </Card>
 
       {/* Agent Behavior Section */}
@@ -523,44 +537,47 @@ function KnowledgeSourcesPage() {
                 Adjust your retrieval agent flow
               </CardDescription>
             </div>
-            <Button
-              onClick={() => {
-                const derivedFromWindow =
-                  typeof window !== "undefined"
-                    ? `${window.location.protocol}//${window.location.hostname}:7860`
-                    : "";
-                const base = (
-                  publicLangflowUrl ||
-                  derivedFromWindow ||
-                  "http://localhost:7860"
-                ).replace(/\/$/, "");
-                const computed = flowId ? `${base}/flow/${flowId}` : base;
-                const url = langflowEditUrl || computed;
-                window.open(url, "_blank");
-              }}
-            >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                width="24"
-                height="22"
-                viewBox="0 0 24 22"
-                className="h-4 w-4 mr-2"
-              >
-                <path
-                  fill="currentColor"
-                  d="M13.0486 0.462158H9.75399C9.44371 0.462158 9.14614 0.586082 8.92674 0.806667L4.03751 5.72232C3.81811 5.9429 3.52054 6.06682 3.21026 6.06682H1.16992C0.511975 6.06682 -0.0165756 6.61212 0.000397655 7.2734L0.0515933 9.26798C0.0679586 9.90556 0.586745 10.4139 1.22111 10.4139H3.59097C3.90124 10.4139 4.19881 10.2899 4.41821 10.0694L9.34823 5.11269C9.56763 4.89211 9.8652 4.76818 10.1755 4.76818H13.0486C13.6947 4.76818 14.2185 4.24157 14.2185 3.59195V1.63839C14.2185 0.988773 13.6947 0.462158 13.0486 0.462158Z"
-                ></path>
-                <path
-                  fill="currentColor"
-                  d="M19.5355 11.5862H22.8301C23.4762 11.5862 24 12.1128 24 12.7624V14.716C24 15.3656 23.4762 15.8922 22.8301 15.8922H19.957C19.6467 15.8922 19.3491 16.0161 19.1297 16.2367L14.1997 21.1934C13.9803 21.414 13.6827 21.5379 13.3725 21.5379H11.0026C10.3682 21.5379 9.84945 21.0296 9.83309 20.392L9.78189 18.3974C9.76492 17.7361 10.2935 17.1908 10.9514 17.1908H12.9918C13.302 17.1908 13.5996 17.0669 13.819 16.8463L18.7082 11.9307C18.9276 11.7101 19.2252 11.5862 19.5355 11.5862Z"
-                ></path>
-                <path
-                  fill="currentColor"
-                  d="M19.5355 2.9796L22.8301 2.9796C23.4762 2.9796 24 3.50622 24 4.15583V6.1094C24 6.75901 23.4762 7.28563 22.8301 7.28563H19.957C19.6467 7.28563 19.3491 7.40955 19.1297 7.63014L14.1997 12.5868C13.9803 12.8074 13.6827 12.9313 13.3725 12.9313H10.493C10.1913 12.9313 9.90126 13.0485 9.68346 13.2583L4.14867 18.5917C3.93087 18.8016 3.64085 18.9187 3.33917 18.9187H1.32174C0.675616 18.9187 0.151832 18.3921 0.151832 17.7425V15.7343C0.151832 15.0846 0.675616 14.558 1.32174 14.558H3.32468C3.63496 14.558 3.93253 14.4341 4.15193 14.2135L9.40827 8.92878C9.62767 8.70819 9.92524 8.58427 10.2355 8.58427H12.9918C13.302 8.58427 13.5996 8.46034 13.819 8.23976L18.7082 3.32411C18.9276 3.10353 19.2252 2.9796 19.5355 2.9796Z"
-                ></path>
-              </svg>
-              Edit in Langflow
-            </Button>
+            <div className="flex gap-2">
+              <ConfirmationDialog
+                trigger={<Button variant="secondary">Restore flow</Button>}
+                title="Restore default Agent flow"
+                description="This restores defaults and discards all custom settings and overrides. This can't be undone."
+                confirmText="Restore"
+                variant="destructive"
+                onConfirm={handleRestoreAgentFlow}
+              />
+              <ConfirmationDialog
+                trigger={
+                  <Button>
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="24"
+                      height="22"
+                      viewBox="0 0 24 22"
+                      className="h-4 w-4 mr-2"
+                    >
+                      <path
+                        fill="currentColor"
+                        d="M13.0486 0.462158H9.75399C9.44371 0.462158 9.14614 0.586082 8.92674 0.806667L4.03751 5.72232C3.81811 5.9429 3.52054 6.06682 3.21026 6.06682H1.16992C0.511975 6.06682 -0.0165756 6.61212 0.000397655 7.2734L0.0515933 9.26798C0.0679586 9.90556 0.586745 10.4139 1.22111 10.4139H3.59097C3.90124 10.4139 4.19881 10.2899 4.41821 10.0694L9.34823 5.11269C9.56763 4.89211 9.8652 4.76818 10.1755 4.76818H13.0486C13.6947 4.76818 14.2185 4.24157 14.2185 3.59195V1.63839C14.2185 0.988773 13.6947 0.462158 13.0486 0.462158Z"
+                      ></path>
+                      <path
+                        fill="currentColor"
+                        d="M19.5355 11.5862H22.8301C23.4762 11.5862 24 12.1128 24 12.7624V14.716C24 15.3656 23.4762 15.8922 22.8301 15.8922H19.957C19.6467 15.8922 19.3491 16.0161 19.1297 16.2367L14.1997 21.1934C13.9803 21.414 13.6827 21.5379 13.3725 21.5379H11.0026C10.3682 21.5379 9.84945 21.0296 9.83309 20.392L9.78189 18.3974C9.76492 17.7361 10.2935 17.1908 10.9514 17.1908H12.9918C13.302 17.1908 13.5996 17.0669 13.819 16.8463L18.7082 11.9307C18.9276 11.7101 19.2252 11.5862 19.5355 11.5862Z"
+                      ></path>
+                      <path
+                        fill="currentColor"
+                        d="M19.5355 2.9796L22.8301 2.9796C23.4762 2.9796 24 3.50622 24 4.15583V6.1094C24 6.75901 23.4762 7.28563 22.8301 7.28563H19.957C19.6467 7.28563 19.3491 7.40955 19.1297 7.63014L14.1997 12.5868C13.9803 12.8074 13.6827 12.9313 13.3725 12.9313H10.493C10.1913 12.9313 9.90126 13.0485 9.68346 13.2583L4.14867 18.5917C3.93087 18.8016 3.64085 18.9187 3.33917 18.9187H1.32174C0.675616 18.9187 0.151832 18.3921 0.151832 17.7425V15.7343C0.151832 15.0846 0.675616 14.558 1.32174 14.558H3.32468C3.63496 14.558 3.93253 14.4341 4.15193 14.2135L9.40827 8.92878C9.62767 8.70819 9.92524 8.58427 10.2355 8.58427H12.9918C13.302 8.58427 13.5996 8.46034 13.819 8.23976L18.7082 3.32411C18.9276 3.10353 19.2252 2.9796 19.5355 2.9796Z"
+                      ></path>
+                    </svg>
+                    Edit in Langflow
+                  </Button>
+                }
+                title="Edit Agent flow in Langflow"
+                description="You're entering Langflow. You can edit the Agent flow and other underlying flows. Manual changes to components, wiring, or I/O can break this experience."
+                confirmText="Proceed"
+                onConfirm={(closeDialog) => handleEditInLangflow(flowId, closeDialog)}
+              />
+            </div>
           </div>
         </CardHeader>
       </Card>
diff --git a/frontend/src/components/confirmation-dialog.tsx b/frontend/src/components/confirmation-dialog.tsx
index ae6801e9..c424e437 100644
--- a/frontend/src/components/confirmation-dialog.tsx
+++ b/frontend/src/components/confirmation-dialog.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { ReactNode } from "react"
+import { ReactNode, useState } from "react"
 import {
   Dialog,
   DialogContent,
@@ -18,7 +18,7 @@ interface ConfirmationDialogProps {
   description: string
   confirmText?: string
   cancelText?: string
-  onConfirm: () => void
+  onConfirm: (closeDialog: () => void) => void
   onCancel?: () => void
   variant?: "default" | "destructive"
 }
@@ -33,8 +33,20 @@ export function ConfirmationDialog({
   onCancel,
   variant = "default"
 }: ConfirmationDialogProps) {
+  const [open, setOpen] = useState(false)
+
+  const handleConfirm = () => {
+    const closeDialog = () => setOpen(false)
+    onConfirm(closeDialog)
+  }
+
+  const handleCancel = () => {
+    onCancel?.()
+    setOpen(false)
+  }
+
   return (
-    <Dialog>
+    <Dialog open={open} onOpenChange={setOpen}>
       <DialogTrigger asChild>
         {trigger}
       </DialogTrigger>
@@ -48,13 +60,13 @@ export function ConfirmationDialog({
         <DialogFooter>
           <Button
             variant="outline"
-            onClick={onCancel}
+            onClick={handleCancel}
           >
             {cancelText}
           </Button>
           <Button
             variant={variant}
-            onClick={onConfirm}
+            onClick={handleConfirm}
           >
             {confirmText}
           </Button>