diff --git a/src/components/ChatInputControls.tsx b/src/components/ChatInputControls.tsx
new file mode 100644
index 0000000..ce5ba28
--- /dev/null
+++ b/src/components/ChatInputControls.tsx
@@ -0,0 +1,11 @@
+import { ModelPicker } from "./ModelPicker";
+import { ProModeSelector } from "./ProModeSelector";
+
+export function ChatInputControls() {
+  return (
+    <div className="pb-2 flex gap-2">
+      <ModelPicker />
+      <ProModeSelector />
+    </div>
+  );
+}
diff --git a/src/components/ProModeSelector.tsx b/src/components/ProModeSelector.tsx
new file mode 100644
index 0000000..c8dca95
--- /dev/null
+++ b/src/components/ProModeSelector.tsx
@@ -0,0 +1,82 @@
+import { Button } from "@/components/ui/button";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Switch } from "@/components/ui/switch";
+import { Label } from "@/components/ui/label";
+import { Sparkles, Info } from "lucide-react";
+import { useSettings } from "@/hooks/useSettings";
+
+export function ProModeSelector() {
+  const { settings, updateSettings } = useSettings();
+
+  const toggleSaverMode = () => {
+    updateSettings({ enableProSaverMode: !settings?.enableProSaverMode });
+  };
+  if (!settings?.enableDyadPro) {
+    return null;
+  }
+
+  return (
+    <Popover>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <PopoverTrigger asChild>
+            <Button
+              variant="outline"
+              size="sm"
+              className="flex items-center gap-2 h-8 border-primary/50 bg-primary/10 hover:bg-primary/20 font-medium shadow-sm shadow-primary/10 transition-all hover:shadow-md hover:shadow-primary/15"
+            >
+              <Sparkles className="h-4 w-4 text-primary" />
+              <span className="text-primary font-medium">Pro</span>
+            </Button>
+          </PopoverTrigger>
+        </TooltipTrigger>
+        <TooltipContent>Configure Dyad Pro settings</TooltipContent>
+      </Tooltip>
+      <PopoverContent className="w-80 border-primary/20">
+        <div className="space-y-4">
+          <div className="space-y-1">
+            <h4 className="font-medium flex items-center gap-1.5">
+              <Sparkles className="h-4 w-4 text-primary" />
+              <span className="text-primary font-medium">Dyad Pro</span>
+            </h4>
+            <div className="h-px bg-gradient-to-r from-primary/50 via-primary/20 to-transparent" />
+          </div>
+          <div className="flex items-center justify-between">
+            <div className="space-y-2">
+              <Label htmlFor="saver-mode">Saver Mode</Label>
+              <div className="flex items-center gap-1">
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <Info className="h-4 w-4 text-muted-foreground cursor-help" />
+                  </TooltipTrigger>
+                  <TooltipContent side="right" className="max-w-72">
+                    Note: using the free Gemini API lets Google use your data to
+                    improve their models.
+                  </TooltipContent>
+                </Tooltip>
+                <p className="text-xs text-muted-foreground max-w-55">
+                  Uses your free Gemini API quota before consuming Dyad Pro AI
+                  credits
+                </p>
+              </div>
+            </div>
+            <Switch
+              id="saver-mode"
+              checked={Boolean(settings?.enableProSaverMode)}
+              onCheckedChange={toggleSaverMode}
+            />
+          </div>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/src/components/chat/ChatInput.tsx b/src/components/chat/ChatInput.tsx
index efe8c78..7ba6809 100644
--- a/src/components/chat/ChatInput.tsx
+++ b/src/components/chat/ChatInput.tsx
@@ -20,7 +20,7 @@ import {
 } from "lucide-react";
 import type React from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { ModelPicker } from "@/components/ModelPicker";
+
 import { useSettings } from "@/hooks/useSettings";
 import { IpcClient } from "@/ipc/ipc_client";
 import {
@@ -59,6 +59,7 @@ import { useAttachments } from "@/hooks/useAttachments";
 import { AttachmentsList } from "./AttachmentsList";
 import { DragDropOverlay } from "./DragDropOverlay";
 import { showError, showUncommittedFilesWarning } from "@/lib/toast";
+import { ChatInputControls } from "../ChatInputControls";
 const showTokenBarAtom = atom(false);
 
 export function ChatInput({ chatId }: { chatId?: number }) {
@@ -340,9 +341,7 @@ export function ChatInput({ chatId }: { chatId?: number }) {
             )}
           </div>
           <div className="pl-2 pr-1 flex items-center justify-between">
-            <div className="pb-2">
-              <ModelPicker />
-            </div>
+            <ChatInputControls />
             <button
               onClick={() => setShowTokenBar(!showTokenBar)}
               className="flex items-center px-2 py-1 text-xs text-muted-foreground hover:bg-muted rounded"
diff --git a/src/components/chat/HomeChatInput.tsx b/src/components/chat/HomeChatInput.tsx
index 1b2732a..eca8c14 100644
--- a/src/components/chat/HomeChatInput.tsx
+++ b/src/components/chat/HomeChatInput.tsx
@@ -1,7 +1,7 @@
 import { SendIcon, StopCircleIcon, Paperclip } from "lucide-react";
 import type React from "react";
 import { useEffect, useRef } from "react";
-import { ModelPicker } from "@/components/ModelPicker";
+
 import { useSettings } from "@/hooks/useSettings";
 import { homeChatInputValueAtom } from "@/atoms/chatAtoms"; // Use a different atom for home input
 import { useAtom } from "jotai";
@@ -11,7 +11,7 @@ import { AttachmentsList } from "./AttachmentsList";
 import { DragDropOverlay } from "./DragDropOverlay";
 import { usePostHog } from "posthog-js/react";
 import { HomeSubmitOptions } from "@/pages/home";
-
+import { ChatInputControls } from "../ChatInputControls";
 export function HomeChatInput({
   onSubmit,
 }: {
@@ -145,8 +145,8 @@ export function HomeChatInput({
               </button>
             )}
           </div>
-          <div className="px-2 pb-2">
-            <ModelPicker />
+          <div className="px-2">
+            <ChatInputControls />
           </div>
         </div>
       </div>
diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts
index 22c20c3..85ecc99 100644
--- a/src/lib/schemas.ts
+++ b/src/lib/schemas.ts
@@ -118,6 +118,7 @@ export const UserSettingsSchema = z.object({
   experiments: ExperimentsSchema.optional(),
   lastShownReleaseNotesVersion: z.string().optional(),
   maxChatTurnsInContext: z.number().optional(),
+  enableProSaverMode: z.boolean().optional(),
   // DEPRECATED.
   runtimeMode: RuntimeModeSchema.optional(),
 });