diff --git a/src/addImage.tsx b/src/addImage.tsx
index 14f6e99..e69de29 100644
--- a/src/addImage.tsx
+++ b/src/addImage.tsx
@@ -1,369 +0,0 @@
-import { useContext, useState } from "react";
-import { ChatStore } from "@/types/chatstore";
-import { MessageDetail } from "@/chatgpt";
-import { Tr } from "@/translate";
-
-import {
-  Drawer,
-  DrawerClose,
-  DrawerContent,
-  DrawerDescription,
-  DrawerFooter,
-  DrawerHeader,
-  DrawerTitle,
-  DrawerTrigger,
-} from "@/components/ui/drawer";
-
-import { Button } from "./components/ui/button";
-import { PenIcon, XIcon } from "lucide-react";
-import { Checkbox } from "./components/ui/checkbox";
-import { Label } from "./components/ui/label";
-import { Textarea } from "./components/ui/textarea";
-import { Separator } from "./components/ui/separator";
-import { AppContext } from "./pages/App";
-
-interface Props {
-  images: MessageDetail[];
-  showAddImage: boolean;
-  setShowAddImage: (se: boolean) => void;
-  setImages: (images: MessageDetail[]) => void;
-}
-interface ImageResponse {
-  url?: string;
-  b64_json?: string;
-  revised_prompt: string;
-}
-export function AddImage({
-  showAddImage,
-  setShowAddImage,
-  setImages,
-  images,
-}: Props) {
-  const ctx = useContext(AppContext);
-  if (ctx === null) return <></>;
-
-  const [enableHighResolution, setEnableHighResolution] = useState(true);
-  const [imageGenPrompt, setImageGenPrompt] = useState("");
-  const [imageGenModel, setImageGenModel] = useState("dall-e-3");
-  const [imageGenN, setImageGenN] = useState(1);
-  const [imageGenQuality, setImageGEnQuality] = useState("standard");
-  const [imageGenResponseFormat, setImageGenResponseFormat] =
-    useState("b64_json");
-  const [imageGenSize, setImageGenSize] = useState("1024x1024");
-  const [imageGenStyle, setImageGenStyle] = useState("vivid");
-  const [imageGenGenerating, setImageGenGenerating] = useState(false);
-  useState("b64_json");
-  return (
-    <Drawer open={showAddImage} onOpenChange={setShowAddImage}>
-      <DrawerContent>
-        <div className="mx-auto w-full max-w-lg">
-          <DrawerHeader>
-            <DrawerTitle>Add Images</DrawerTitle>
-          </DrawerHeader>
-          <div className="flex gap-2 items-center">
-            <Button
-              variant="secondary"
-              size="sm"
-              disabled={false}
-              onClick={() => {
-                const image_url = prompt("Image URL");
-                if (!image_url) {
-                  return;
-                }
-                setImages([
-                  ...images,
-                  {
-                    type: "image_url",
-                    image_url: {
-                      url: image_url,
-                      detail: enableHighResolution ? "high" : "low",
-                    },
-                  },
-                ]);
-              }}
-            >
-              Add from URL
-            </Button>
-            <Button
-              variant="default"
-              size="sm"
-              disabled={false}
-              onClick={() => {
-                const input = document.createElement("input");
-                input.type = "file";
-                input.accept = "image/*";
-                input.onchange = (event) => {
-                  const file = (event.target as HTMLInputElement).files?.[0];
-                  if (!file) {
-                    return;
-                  }
-                  const reader = new FileReader();
-                  reader.readAsDataURL(file);
-                  reader.onloadend = () => {
-                    const base64data = reader.result;
-                    setImages([
-                      ...images,
-                      {
-                        type: "image_url",
-                        image_url: {
-                          url: String(base64data),
-                          detail: enableHighResolution ? "high" : "low",
-                        },
-                      },
-                    ]);
-                  };
-                };
-                input.click();
-              }}
-            >
-              Add from local file
-            </Button>
-            <div className="flex items-center space-x-2">
-              <Checkbox
-                checked={enableHighResolution}
-                onCheckedChange={(checked) =>
-                  setEnableHighResolution(checked === true)
-                }
-              />
-              <label
-                htmlFor="terms"
-                className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-              >
-                High resolution
-              </label>
-            </div>
-          </div>
-          <Separator className="my-2" />
-          {ctx.chatStore.image_gen_api && ctx.chatStore.image_gen_key && (
-            <div className="flex flex-col">
-              <h3>Generate Image</h3>
-              <span className="flex flex-col justify-between m-1 p-1">
-                <Label>Prompt: </Label>
-                <Textarea
-                  className="textarea textarea-sm textarea-bordered"
-                  value={imageGenPrompt}
-                  onChange={(e: any) => {
-                    setImageGenPrompt(e.target.value);
-                  }}
-                />
-              </span>
-              <span className="flex flex-row justify-between items-center m-1 p-1">
-                <label>Model: </label>
-                <select
-                  className="select select-sm select-bordered"
-                  value={imageGenModel}
-                  onChange={(e: any) => {
-                    setImageGenModel(e.target.value);
-                  }}
-                >
-                  <option value="dall-e-3">DALL-E 3</option>
-                  <option value="dall-e-2">DALL-E 2</option>
-                </select>
-              </span>
-              <span className="flex flex-row justify-between items-center m-1 p-1">
-                <label>n: </label>
-                <input
-                  className="input input-sm input-bordered"
-                  value={imageGenN}
-                  type="number"
-                  min={1}
-                  max={10}
-                  onChange={(e: any) => setImageGenN(parseInt(e.target.value))}
-                />
-              </span>
-              <span className="flex flex-row justify-between items-center m-1 p-1">
-                <label>Quality: </label>
-                <select
-                  className="select select-sm select-bordered"
-                  value={imageGenQuality}
-                  onChange={(e: any) => setImageGEnQuality(e.target.value)}
-                >
-                  <option value="hd">HD</option>
-                  <option value="standard">Standard</option>
-                </select>
-              </span>
-              <span className="flex flex-row justify-between items-center m-1 p-1">
-                <label>Response Format: </label>
-                <select
-                  className="select select-sm select-bordered"
-                  value={imageGenResponseFormat}
-                  onChange={(e: any) =>
-                    setImageGenResponseFormat(e.target.value)
-                  }
-                >
-                  <option value="b64_json">b64_json</option>
-                  <option value="url">url</option>
-                </select>
-              </span>
-              <span className="flex flex-row justify-between items-center m-1 p-1">
-                <label>Size: </label>
-                <select
-                  className="select select-sm select-bordered"
-                  value={imageGenSize}
-                  onChange={(e: any) => setImageGenSize(e.target.value)}
-                >
-                  <option value="256x256">256x256 (dall-e-2)</option>
-                  <option value="512x512">512x512 (dall-e-2)</option>
-                  <option value="1024x1024">1024x1024 (dall-e-2/3)</option>
-                  <option value="1792x1024">1792x1024 (dall-e-3)</option>
-                  <option value="1024x1792">1024x1792 (dall-e-3)</option>
-                </select>
-              </span>
-              <span className="flex flex-row justify-between items-center m-1 p-1">
-                <label>Style (only dall-e-3): </label>
-                <select
-                  className="select select-sm select-bordered"
-                  value={imageGenStyle}
-                  onChange={(e: any) => setImageGenStyle(e.target.value)}
-                >
-                  <option value="vivid">vivid</option>
-                  <option value="natural">natural</option>
-                </select>
-              </span>
-              <span className="flex flex-row justify-between items-center m-1 p-1">
-                <Button
-                  variant="default"
-                  size="sm"
-                  disabled={imageGenGenerating}
-                  onClick={async () => {
-                    try {
-                      setImageGenGenerating(true);
-                      const body: any = {
-                        prompt: imageGenPrompt,
-                        model: imageGenModel,
-                        n: imageGenN,
-                        quality: imageGenQuality,
-                        response_format: imageGenResponseFormat,
-                        size: imageGenSize,
-                      };
-                      if (imageGenModel === "dall-e-3") {
-                        body.style = imageGenStyle;
-                      }
-                      const resp: ImageResponse[] = (
-                        await fetch(ctx.chatStore.image_gen_api, {
-                          method: "POST",
-                          headers: {
-                            "Content-Type": "application/json",
-                            Authorization: `Bearer ${ctx.chatStore.image_gen_key}`,
-                          },
-                          body: JSON.stringify(body),
-                        }).then((resp) => resp.json())
-                      ).data;
-                      console.log("image gen resp", resp);
-
-                      for (const image of resp) {
-                        let url = "";
-                        if (image.url) url = image.url;
-                        if (image.b64_json)
-                          url = "data:image/png;base64," + image.b64_json;
-                        if (!url) continue;
-
-                        ctx.chatStore.history.push({
-                          role: "assistant",
-                          content: [
-                            {
-                              type: "image_url",
-                              image_url: {
-                                url,
-                                detail: "low",
-                              },
-                            },
-                            {
-                              type: "text",
-                              text: image.revised_prompt,
-                            },
-                          ],
-                          hide: false,
-                          token: 65,
-                          example: false,
-                          audio: null,
-                          logprobs: null,
-                          response_model_name: imageGenModel,
-                        });
-
-                        ctx.setChatStore({ ...ctx.chatStore });
-                      }
-                    } catch (e) {
-                      console.error(e);
-                      alert("Failed to generate image: " + e);
-                    } finally {
-                      setImageGenGenerating(false);
-                    }
-                  }}
-                >
-                  {Tr("Generate")}
-                </Button>
-              </span>
-            </div>
-          )}
-          <div className="flex flex-wrap">
-            {images.map((image, index) => (
-              <div className="flex flex-col">
-                {image.type === "image_url" && (
-                  <img
-                    className="rounded m-1 p-1 border-2 border-gray-400 w-32"
-                    src={image.image_url?.url}
-                  />
-                )}
-                <span className="flex justify-between">
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={() => {
-                      const image_url = prompt("Image URL");
-                      if (!image_url) {
-                        return;
-                      }
-                      images[index].image_url = {
-                        url: image_url,
-                        detail: enableHighResolution ? "high" : "low",
-                      };
-                      setImages([...images]);
-                    }}
-                  >
-                    <PenIcon />
-                  </Button>
-                  <div className="flex items-center space-x-2">
-                    <Checkbox
-                      id={`hires-${index}`}
-                      checked={image.image_url?.detail === "high"}
-                      onCheckedChange={() => {
-                        if (image.image_url === undefined) return;
-                        image.image_url.detail =
-                          image.image_url?.detail === "low" ? "high" : "low";
-                        setImages([...images]);
-                      }}
-                    />
-                    <label
-                      htmlFor={`hires-${index}`}
-                      className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                    >
-                      HiRes
-                    </label>
-                  </div>
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={() => {
-                      if (!confirm("Are you sure to delete this image?")) {
-                        return;
-                      }
-                      images.splice(index, 1);
-                      setImages([...images]);
-                    }}
-                  >
-                    <XIcon />
-                  </Button>
-                </span>
-              </div>
-            ))}
-          </div>
-
-          <DrawerFooter>
-            <Button onClick={() => setShowAddImage(false)}>Done</Button>
-          </DrawerFooter>
-        </div>
-      </DrawerContent>
-    </Drawer>
-  );
-}
diff --git a/src/components/ImageGenDrawer.tsx b/src/components/ImageGenDrawer.tsx
new file mode 100644
index 0000000..c138c0b
--- /dev/null
+++ b/src/components/ImageGenDrawer.tsx
@@ -0,0 +1,213 @@
+import { useContext, useState } from "react";
+import { MessageDetail } from "@/chatgpt";
+import { Tr } from "@/translate";
+
+import {
+  Drawer,
+  DrawerContent,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+} from "@/components/ui/drawer";
+
+import { Button } from "@/components/ui/button";
+import { Label } from "@/components/ui/label";
+import { Textarea } from "@/components/ui/textarea";
+import { AppContext } from "@/pages/App";
+
+interface Props {
+  showGenImage: boolean;
+  setShowGenImage: (se: boolean) => void;
+}
+interface ImageResponse {
+  url?: string;
+  b64_json?: string;
+  revised_prompt: string;
+}
+export function ImageGenDrawer({ showGenImage, setShowGenImage }: Props) {
+  const ctx = useContext(AppContext);
+  if (ctx === null) return <></>;
+
+  const [imageGenPrompt, setImageGenPrompt] = useState("");
+  const [imageGenModel, setImageGenModel] = useState("dall-e-3");
+  const [imageGenN, setImageGenN] = useState(1);
+  const [imageGenQuality, setImageGEnQuality] = useState("standard");
+  const [imageGenResponseFormat, setImageGenResponseFormat] =
+    useState("b64_json");
+  const [imageGenSize, setImageGenSize] = useState("1024x1024");
+  const [imageGenStyle, setImageGenStyle] = useState("vivid");
+  const [imageGenGenerating, setImageGenGenerating] = useState(false);
+  useState("b64_json");
+  return (
+    <Drawer open={showGenImage} onOpenChange={setShowGenImage}>
+      <DrawerContent>
+        <div className="mx-auto w-full max-w-lg">
+          <DrawerHeader>
+            <DrawerTitle>Generate Image</DrawerTitle>
+          </DrawerHeader>
+          <div className="flex flex-col">
+            <span className="flex flex-col justify-between m-1 p-1">
+              <Label>Prompt: </Label>
+              <Textarea
+                className="textarea textarea-sm textarea-bordered"
+                value={imageGenPrompt}
+                onChange={(e: any) => {
+                  setImageGenPrompt(e.target.value);
+                }}
+              />
+            </span>
+            <span className="flex flex-row justify-between items-center m-1 p-1">
+              <label>Model: </label>
+              <select
+                className="select select-sm select-bordered"
+                value={imageGenModel}
+                onChange={(e: any) => {
+                  setImageGenModel(e.target.value);
+                }}
+              >
+                <option value="dall-e-3">DALL-E 3</option>
+                <option value="dall-e-2">DALL-E 2</option>
+              </select>
+            </span>
+            <span className="flex flex-row justify-between items-center m-1 p-1">
+              <label>n: </label>
+              <input
+                className="input input-sm input-bordered"
+                value={imageGenN}
+                type="number"
+                min={1}
+                max={10}
+                onChange={(e: any) => setImageGenN(parseInt(e.target.value))}
+              />
+            </span>
+            <span className="flex flex-row justify-between items-center m-1 p-1">
+              <label>Quality: </label>
+              <select
+                className="select select-sm select-bordered"
+                value={imageGenQuality}
+                onChange={(e: any) => setImageGEnQuality(e.target.value)}
+              >
+                <option value="hd">HD</option>
+                <option value="standard">Standard</option>
+              </select>
+            </span>
+            <span className="flex flex-row justify-between items-center m-1 p-1">
+              <label>Response Format: </label>
+              <select
+                className="select select-sm select-bordered"
+                value={imageGenResponseFormat}
+                onChange={(e: any) => setImageGenResponseFormat(e.target.value)}
+              >
+                <option value="b64_json">b64_json</option>
+                <option value="url">url</option>
+              </select>
+            </span>
+            <span className="flex flex-row justify-between items-center m-1 p-1">
+              <label>Size: </label>
+              <select
+                className="select select-sm select-bordered"
+                value={imageGenSize}
+                onChange={(e: any) => setImageGenSize(e.target.value)}
+              >
+                <option value="256x256">256x256 (dall-e-2)</option>
+                <option value="512x512">512x512 (dall-e-2)</option>
+                <option value="1024x1024">1024x1024 (dall-e-2/3)</option>
+                <option value="1792x1024">1792x1024 (dall-e-3)</option>
+                <option value="1024x1792">1024x1792 (dall-e-3)</option>
+              </select>
+            </span>
+            <span className="flex flex-row justify-between items-center m-1 p-1">
+              <label>Style (only dall-e-3): </label>
+              <select
+                className="select select-sm select-bordered"
+                value={imageGenStyle}
+                onChange={(e: any) => setImageGenStyle(e.target.value)}
+              >
+                <option value="vivid">vivid</option>
+                <option value="natural">natural</option>
+              </select>
+            </span>
+            <span className="flex flex-row justify-between items-center m-1 p-1">
+              <Button
+                variant="default"
+                size="sm"
+                disabled={imageGenGenerating}
+                onClick={async () => {
+                  try {
+                    setImageGenGenerating(true);
+                    const body: any = {
+                      prompt: imageGenPrompt,
+                      model: imageGenModel,
+                      n: imageGenN,
+                      quality: imageGenQuality,
+                      response_format: imageGenResponseFormat,
+                      size: imageGenSize,
+                    };
+                    if (imageGenModel === "dall-e-3") {
+                      body.style = imageGenStyle;
+                    }
+                    const resp: ImageResponse[] = (
+                      await fetch(ctx.chatStore.image_gen_api, {
+                        method: "POST",
+                        headers: {
+                          "Content-Type": "application/json",
+                          Authorization: `Bearer ${ctx.chatStore.image_gen_key}`,
+                        },
+                        body: JSON.stringify(body),
+                      }).then((resp) => resp.json())
+                    ).data;
+                    console.log("image gen resp", resp);
+
+                    for (const image of resp) {
+                      let url = "";
+                      if (image.url) url = image.url;
+                      if (image.b64_json)
+                        url = "data:image/png;base64," + image.b64_json;
+                      if (!url) continue;
+
+                      ctx.chatStore.history.push({
+                        role: "assistant",
+                        content: [
+                          {
+                            type: "image_url",
+                            image_url: {
+                              url,
+                              detail: "low",
+                            },
+                          },
+                          {
+                            type: "text",
+                            text: image.revised_prompt,
+                          },
+                        ],
+                        hide: false,
+                        token: 65,
+                        example: false,
+                        audio: null,
+                        logprobs: null,
+                        response_model_name: imageGenModel,
+                      });
+
+                      ctx.setChatStore({ ...ctx.chatStore });
+                    }
+                  } catch (e) {
+                    console.error(e);
+                    alert("Failed to generate image: " + e);
+                  } finally {
+                    setImageGenGenerating(false);
+                  }
+                }}
+              >
+                {Tr("Generate")}
+              </Button>
+            </span>
+          </div>
+
+          <DrawerFooter>
+            <Button onClick={() => setShowGenImage(false)}>Done</Button>
+          </DrawerFooter>
+        </div>
+      </DrawerContent>
+    </Drawer>
+  );
+}
diff --git a/src/components/ImageUploadDrawer.tsx b/src/components/ImageUploadDrawer.tsx
new file mode 100644
index 0000000..4c2c529
--- /dev/null
+++ b/src/components/ImageUploadDrawer.tsx
@@ -0,0 +1,187 @@
+import { useContext, useState } from "react";
+import { MessageDetail } from "@/chatgpt";
+import { Tr } from "@/translate";
+
+import {
+  Drawer,
+  DrawerContent,
+  DrawerFooter,
+  DrawerHeader,
+  DrawerTitle,
+} from "@/components/ui/drawer";
+
+import { Button } from "@/components/ui/button";
+import { PenIcon, XIcon } from "lucide-react";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Separator } from "@/components/ui/separator";
+import { AppContext } from "@/pages/App";
+
+interface Props {
+  images: MessageDetail[];
+  showAddImage: boolean;
+  setShowAddImage: (se: boolean) => void;
+  setImages: (images: MessageDetail[]) => void;
+}
+export function ImageUploadDrawer({
+  showAddImage,
+  setShowAddImage,
+  setImages,
+  images,
+}: Props) {
+  const ctx = useContext(AppContext);
+  if (ctx === null) return <></>;
+
+  const [enableHighResolution, setEnableHighResolution] = useState(true);
+  useState("b64_json");
+  return (
+    <Drawer open={showAddImage} onOpenChange={setShowAddImage}>
+      <DrawerContent>
+        <div className="mx-auto w-full max-w-lg">
+          <DrawerHeader>
+            <DrawerTitle>Add Images</DrawerTitle>
+          </DrawerHeader>
+          <div className="flex gap-2 items-center">
+            <Button
+              variant="secondary"
+              size="sm"
+              disabled={false}
+              onClick={() => {
+                const image_url = prompt("Image URL");
+                if (!image_url) {
+                  return;
+                }
+                setImages([
+                  ...images,
+                  {
+                    type: "image_url",
+                    image_url: {
+                      url: image_url,
+                      detail: enableHighResolution ? "high" : "low",
+                    },
+                  },
+                ]);
+              }}
+            >
+              Add from URL
+            </Button>
+            <Button
+              variant="default"
+              size="sm"
+              disabled={false}
+              onClick={() => {
+                const input = document.createElement("input");
+                input.type = "file";
+                input.accept = "image/*";
+                input.onchange = (event) => {
+                  const file = (event.target as HTMLInputElement).files?.[0];
+                  if (!file) {
+                    return;
+                  }
+                  const reader = new FileReader();
+                  reader.readAsDataURL(file);
+                  reader.onloadend = () => {
+                    const base64data = reader.result;
+                    setImages([
+                      ...images,
+                      {
+                        type: "image_url",
+                        image_url: {
+                          url: String(base64data),
+                          detail: enableHighResolution ? "high" : "low",
+                        },
+                      },
+                    ]);
+                  };
+                };
+                input.click();
+              }}
+            >
+              Add from local file
+            </Button>
+            <div className="flex items-center space-x-2">
+              <Checkbox
+                checked={enableHighResolution}
+                onCheckedChange={(checked) =>
+                  setEnableHighResolution(checked === true)
+                }
+              />
+              <label
+                htmlFor="terms"
+                className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+              >
+                High resolution
+              </label>
+            </div>
+          </div>
+
+          <div className="flex flex-wrap">
+            {images.map((image, index) => (
+              <div className="flex flex-col">
+                {image.type === "image_url" && (
+                  <img
+                    className="rounded m-1 p-1 border-2 border-gray-400 w-32"
+                    src={image.image_url?.url}
+                  />
+                )}
+                <span className="flex justify-between">
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => {
+                      const image_url = prompt("Image URL");
+                      if (!image_url) {
+                        return;
+                      }
+                      images[index].image_url = {
+                        url: image_url,
+                        detail: enableHighResolution ? "high" : "low",
+                      };
+                      setImages([...images]);
+                    }}
+                  >
+                    <PenIcon />
+                  </Button>
+                  <div className="flex items-center space-x-2">
+                    <Checkbox
+                      id={`hires-${index}`}
+                      checked={image.image_url?.detail === "high"}
+                      onCheckedChange={() => {
+                        if (image.image_url === undefined) return;
+                        image.image_url.detail =
+                          image.image_url?.detail === "low" ? "high" : "low";
+                        setImages([...images]);
+                      }}
+                    />
+                    <label
+                      htmlFor={`hires-${index}`}
+                      className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                    >
+                      HiRes
+                    </label>
+                  </div>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => {
+                      if (!confirm("Are you sure to delete this image?")) {
+                        return;
+                      }
+                      images.splice(index, 1);
+                      setImages([...images]);
+                    }}
+                  >
+                    <XIcon />
+                  </Button>
+                </span>
+              </div>
+            ))}
+          </div>
+
+          <DrawerFooter>
+            <Button onClick={() => setShowAddImage(false)}>Done</Button>
+          </DrawerFooter>
+        </div>
+      </DrawerContent>
+    </Drawer>
+  );
+}
diff --git a/src/pages/Chatbox.tsx b/src/pages/Chatbox.tsx
index f76928b..36e831d 100644
--- a/src/pages/Chatbox.tsx
+++ b/src/pages/Chatbox.tsx
@@ -14,7 +14,7 @@ import ChatGPT, {
 import { ChatStoreMessage } from "../types/chatstore";
 import Message from "@/components/MessageBubble";
 import { models } from "@/types/models";
-import { AddImage } from "@/addImage";
+import { ImageUploadDrawer } from "@/components/ImageUploadDrawer";
 import { autoHeight } from "@/utils/textAreaHelp";
 import VersionHint from "@/components/VersionHint";
 import WhisperButton from "@/components/WhisperButton";
@@ -35,6 +35,7 @@ import {
   CornerRightUpIcon,
   ImageIcon,
   InfoIcon,
+  PaintBucketIcon,
   ScissorsIcon,
 } from "lucide-react";
 import { Switch } from "@/components/ui/switch";
@@ -42,6 +43,7 @@ import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 
 import { AppContext } from "./App";
 import APIListMenu from "@/components/ListAPI";
+import { ImageGenDrawer } from "@/components/ImageGenDrawer";
 
 export default function ChatBOX() {
   const ctx = useContext(AppContext);
@@ -58,6 +60,7 @@ export default function ChatBOX() {
   const [inputMsg, setInputMsg] = useState("");
   const [images, setImages] = useState<MessageDetail[]>([]);
   const [showAddImage, setShowAddImage] = useState(false);
+  const [showGenImage, setShowGenImage] = useState(false);
   const [showGenerating, setShowGenerating] = useState(false);
   const [generatingMessage, setGeneratingMessage] = useState("");
   const [showRetry, setShowRetry] = useState(false);
@@ -591,6 +594,16 @@ export default function ChatBOX() {
               <ImageIcon className="size-4" />
               <span className="sr-only">Add Image</span>
             </Button>
+            <Button
+              variant="ghost"
+              size="icon"
+              type="button"
+              onClick={() => setShowGenImage(true)}
+              disabled={showGenerating}
+            >
+              <PaintBucketIcon className="size-4" />
+              <span className="sr-only">Generate Image</span>
+            </Button>
 
             {chatStore.whisper_api && chatStore.whisper_key && (
               <>
@@ -616,12 +629,16 @@ export default function ChatBOX() {
           </div>
         </form>
 
-        <AddImage
+        <ImageUploadDrawer
           setShowAddImage={setShowAddImage}
           images={images}
           showAddImage={showAddImage}
           setImages={setImages}
         />
+        <ImageGenDrawer
+          showGenImage={showGenImage}
+          setShowGenImage={setShowGenImage}
+        />
       </div>
     </>
   );