diff --git a/src/components/form/base.tsx b/src/components/form/base.tsx
index e6cb31c4..97cf0f49 100644
--- a/src/components/form/base.tsx
+++ b/src/components/form/base.tsx
@@ -1,4 +1,5 @@
 import EmojiPicker from '@components/form/emojiPicker';
+import ImagePicker from '@components/form/imagePicker';
 import { RelayContext } from '@components/relaysProvider';
 
 import { activeAccountAtom } from '@stores/account';
@@ -7,7 +8,7 @@ import { relaysAtom } from '@stores/relays';
 
 import { dateToUnix } from '@utils/getDate';
 
-import { ImageIcon, ResetIcon } from '@radix-ui/react-icons';
+import { PersonIcon } from '@radix-ui/react-icons';
 import { useAtom, useAtomValue } from 'jotai';
 import { useResetAtom } from 'jotai/utils';
 import { getEventHash, signEvent } from 'nostr-tools';
@@ -58,17 +59,9 @@ export default function FormBase() {
         <div className="absolute bottom-2 w-full px-2">
           <div className="flex w-full items-center justify-between bg-zinc-800">
             <div className="flex items-center gap-2 divide-x divide-zinc-700">
-              <button
-                onClick={resetValue}
-                className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700"
-              >
-                <ResetIcon className="h-4 w-4 text-zinc-400" />
-              </button>
+              <ImagePicker />
               <div className="flex items-center gap-2 pl-2">
                 <EmojiPicker />
-                <span className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
-                  <ImageIcon className="h-4 w-4 text-zinc-400" />
-                </span>
               </div>
             </div>
             <div className="flex items-center gap-2">
diff --git a/src/components/form/comment.tsx b/src/components/form/comment.tsx
index 9c78400e..eb48566c 100644
--- a/src/components/form/comment.tsx
+++ b/src/components/form/comment.tsx
@@ -38,7 +38,7 @@ export default function FormComment({ eventID }: { eventID: any }) {
   };
 
   return (
-    <div className="px-5 py-3">
+    <div className="p-3">
       <div className="flex gap-1">
         <div>
           <div className="relative h-11 w-11 shrink-0 overflow-hidden rounded-md border border-white/10">
diff --git a/src/components/form/emojiPicker.tsx b/src/components/form/emojiPicker.tsx
index ff327b27..7b57fa67 100644
--- a/src/components/form/emojiPicker.tsx
+++ b/src/components/form/emojiPicker.tsx
@@ -14,7 +14,7 @@ export default function EmojiPicker() {
     <Popover.Root>
       <Popover.Trigger asChild>
         <button className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
-          <EmojiIcon className="h-[16.5px] w-[16.5px] text-zinc-400" />
+          <EmojiIcon className="h-4 w-4 text-zinc-400" />
         </button>
       </Popover.Trigger>
       <Popover.Portal>
diff --git a/src/components/form/imagePicker.tsx b/src/components/form/imagePicker.tsx
new file mode 100644
index 00000000..c40ffb65
--- /dev/null
+++ b/src/components/form/imagePicker.tsx
@@ -0,0 +1,51 @@
+import { noteContentAtom } from '@stores/note';
+
+import { PlusIcon } from '@radix-ui/react-icons';
+import * as Popover from '@radix-ui/react-popover';
+import { useAtom } from 'jotai';
+import { useState } from 'react';
+
+export default function ImagePicker() {
+  const [value, setValue] = useAtom(noteContentAtom);
+  const [url, setURL] = useState('');
+
+  const handleEnter = (e) => {
+    if (e.key === 'Enter') {
+      setValue(value + ' ' + url);
+    }
+  };
+
+  return (
+    <Popover.Root>
+      <Popover.Trigger asChild>
+        <button className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
+          <PlusIcon className="h-4 w-4 text-zinc-400" />
+        </button>
+      </Popover.Trigger>
+      <Popover.Portal>
+        <Popover.Content
+          className="w-80 rounded-md bg-zinc-900/80 p-3 shadow-input shadow-black/50 ring-1 ring-zinc-800 backdrop-blur-xl will-change-[transform,opacity] data-[state=open]:data-[side=top]:animate-slideDownAndFade data-[state=open]:data-[side=right]:animate-slideLeftAndFade data-[state=open]:data-[side=bottom]:animate-slideUpAndFade data-[state=open]:data-[side=left]:animate-slideRightAndFade"
+          sideOffset={3}
+        >
+          <div>
+            <div className="flex flex-col gap-1">
+              <label className="text-sm font-semibold text-zinc-200">Image URL</label>
+              <div className="relative mb-1 shrink-0 before:pointer-events-none before:absolute before:-inset-px before:rounded-[11px] before:border before:border-blue-500 before:opacity-0 before:ring-1 before:ring-blue-500/20 before:transition after:pointer-events-none after:absolute after:inset-px after:rounded-[7px] after:shadow-highlight after:shadow-white/5 after:transition focus-within:before:opacity-100 focus-within:after:shadow-blue-500/100 dark:focus-within:after:shadow-blue-500/20">
+                <input
+                  placeholder="https://..."
+                  onKeyDown={handleEnter}
+                  onChange={(e) => setURL(e.target.value)}
+                  className="relative w-full rounded-lg border border-black/5 px-3 py-2 shadow-input shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-200 dark:shadow-black/10 dark:placeholder:text-zinc-600"
+                />
+              </div>
+              <p className="text-sm leading-none text-zinc-500">
+                Press <span className="rounded bg-zinc-800 px-1 py-0.5">Enter</span> to insert image
+              </p>
+            </div>
+            <div></div>
+          </div>
+        </Popover.Content>
+      </Popover.Portal>
+    </Popover.Root>
+  );
+}
diff --git a/src/components/note/meta/comment.tsx b/src/components/note/meta/comment.tsx
index 047ee950..5476b45d 100644
--- a/src/components/note/meta/comment.tsx
+++ b/src/components/note/meta/comment.tsx
@@ -119,40 +119,7 @@ export const NoteComment = memo(function NoteComment({
                         >
                           <SizeIcon className="h-4 w-4 text-zinc-400" />
                         </button>
-                        <div className="flex items-center gap-2 pl-2">
-                          <span className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
-                            <svg
-                              xmlns="http://www.w3.org/2000/svg"
-                              fill="none"
-                              viewBox="0 0 24 24"
-                              strokeWidth={1.5}
-                              stroke="currentColor"
-                              className="h-4 w-4 text-zinc-400"
-                            >
-                              <path
-                                strokeLinecap="round"
-                                strokeLinejoin="round"
-                                d="M15.182 15.182a4.5 4.5 0 01-6.364 0M21 12a9 9 0 11-18 0 9 9 0 0118 0zM9.75 9.75c0 .414-.168.75-.375.75S9 10.164 9 9.75 9.168 9 9.375 9s.375.336.375.75zm-.375 0h.008v.015h-.008V9.75zm5.625 0c0 .414-.168.75-.375.75s-.375-.336-.375-.75.168-.75.375-.75.375.336.375.75zm-.375 0h.008v.015h-.008V9.75z"
-                              />
-                            </svg>
-                          </span>
-                          <span className="inline-flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-zinc-700">
-                            <svg
-                              xmlns="http://www.w3.org/2000/svg"
-                              fill="none"
-                              viewBox="0 0 24 24"
-                              strokeWidth={1.5}
-                              stroke="currentColor"
-                              className="h-4 w-4 text-zinc-400"
-                            >
-                              <path
-                                strokeLinecap="round"
-                                strokeLinejoin="round"
-                                d="M2.25 15.75l5.159-5.159a2.25 2.25 0 013.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 013.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 001.5-1.5V6a1.5 1.5 0 00-1.5-1.5H3.75A1.5 1.5 0 002.25 6v12a1.5 1.5 0 001.5 1.5zm10.5-11.25h.008v.008h-.008V8.25zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
-                              />
-                            </svg>
-                          </span>
-                        </div>
+                        <div className="flex items-center gap-2 pl-2"></div>
                       </div>
                       <div className="flex items-center gap-2">
                         <button
diff --git a/src/components/note/preview/image.tsx b/src/components/note/preview/image.tsx
index 3761c296..2bc87f40 100644
--- a/src/components/note/preview/image.tsx
+++ b/src/components/note/preview/image.tsx
@@ -3,7 +3,7 @@ import { memo } from 'react';
 
 export const ImagePreview = memo(function ImagePreview({ url }: { url: string }) {
   return (
-    <div className="relative mt-3 h-full w-full rounded-lg xl:w-2/3">
+    <div className="relative mt-3 mb-2 h-full w-full rounded-lg xl:w-2/3">
       <Image
         src={url}
         alt={url}