diff --git a/src/lib/app/i18n/en.json b/src/lib/app/i18n/en.json
index f862ce22..5e206001 100644
--- a/src/lib/app/i18n/en.json
+++ b/src/lib/app/i18n/en.json
@@ -152,7 +152,8 @@
                 "poll": "Poll",
                 "event": "Event"
             },
-            "autosubmit": "Submit automatically"
+            "autosubmit": "Submit automatically",
+            "customThumbnail": "Set thumbnail"
         },
         "profile": {
             "displayName": "Display name",
diff --git a/src/lib/feature/post/form/PostForm.svelte b/src/lib/feature/post/form/PostForm.svelte
index f275e994..0d5c492e 100644
--- a/src/lib/feature/post/form/PostForm.svelte
+++ b/src/lib/feature/post/form/PostForm.svelte
@@ -9,6 +9,7 @@
   import { placeholders } from '$lib/app/util.svelte'
   import Duration from '$lib/ui/form/Duration.svelte'
   import FreeTextInput from '$lib/ui/form/FreeTextInput.svelte'
+  import ImageInputModal from '$lib/ui/form/ImageInputModal.svelte'
   import ObjectAutocomplete from '$lib/ui/form/ObjectAutocomplete.svelte'
   import MultiSelect from '$lib/ui/form/Switch.svelte'
   import Avatar from '$lib/ui/generic/Avatar.svelte'
@@ -39,6 +40,7 @@
     Language,
     Photo,
     Plus,
+    QrCode,
     Sparkles,
     Tag,
     Trash,
@@ -70,6 +72,7 @@
 
   let loading = $state<boolean>(false)
   let uploadImage = $state(false)
+  let customThumbnail = $state(false)
 
   async function autofill(
     data: URL | { title?: string; body?: string },
@@ -117,12 +120,17 @@
 {/if}
 
 {#if uploadImage}
-  {#await import('$lib/ui/form/ImageInputModal.svelte') then { default: UploadModal }}
-    <UploadModal
-      bind:open={uploadImage}
-      bind:imageUrl={() => '', (v) => (form.url = v)}
-    />
-  {/await}
+  <ImageInputModal
+    bind:open={uploadImage}
+    bind:imageUrl={() => '', (v) => (form.url = v)}
+  />
+{/if}
+
+{#if customThumbnail}
+  <ImageInputModal
+    bind:open={customThumbnail}
+    bind:imageUrl={() => form.thumbnail, (v) => (form.thumbnail = v)}
+  />
 {/if}
 
 {#snippet altText()}
@@ -387,10 +395,16 @@
     {/if}
   {/if}
 
-  <div class="flex flex-row flex-wrap gap-2">
+  <div class="flex flex-row overflow-auto gap-2 -mx-3 px-3 relative">
+    <div
+      class="bg-gradient-to-r from-slate-25 to-slate-25/0 dark:from-zinc-925 dark:to-zinc-925/0 absolute left-0 w-3 h-full z-10"
+    ></div>
+    <div
+      class="bg-gradient-to-l from-slate-25 to-slate-25/0 dark:from-zinc-925 dark:to-zinc-925/0 absolute right-0 w-3 h-full z-10"
+    ></div>
     <ButtonGroup
       orientation="horizontal"
-      class="flex flex-row flex-wrap w-full"
+      class="flex flex-row *:flex-shrink-0 w-full"
     >
       {#if form.type == 'normal'}
         <Button
@@ -412,6 +426,18 @@
             {$t('form.post.altText')}
           </Button>
         {/if}
+        {#if form.url}
+          <Button
+            class="animate-pop-in"
+            onclick={() => {
+              customThumbnail = !customThumbnail
+            }}
+            color={form.thumbnail ? 'primary' : 'secondary'}
+            icon={QrCode}
+          >
+            {$t('form.post.customThumbnail')}
+          </Button>
+        {/if}
       {/if}
       {#if form.language === undefined}
         <Button onclick={() => (form.language = '')} icon={Language}>
diff --git a/src/lib/feature/post/form/postform.svelte.ts b/src/lib/feature/post/form/postform.svelte.ts
index 843bfb7e..8190c7df 100644
--- a/src/lib/feature/post/form/postform.svelte.ts
+++ b/src/lib/feature/post/form/postform.svelte.ts
@@ -47,6 +47,7 @@ export class PostFormState {
     this.nsfw = $state(post?.nsfw ?? false)
     this.altText = $state(post?.alt_text)
     this.language = $state(post?.language_id?.toString())
+    this.thumbnail = $state()
     this.poll = $state(
       post?.poll ?? {
         mode: 'single',
diff --git a/src/lib/ui/shared/button/ButtonGroup.svelte b/src/lib/ui/shared/button/ButtonGroup.svelte
index 6ff46d45..426c993d 100644
--- a/src/lib/ui/shared/button/ButtonGroup.svelte
+++ b/src/lib/ui/shared/button/ButtonGroup.svelte
@@ -37,16 +37,19 @@
     flex-direction: row;
   }
 
-  .btn-group.btn-group-horizontal :global(> *) {
-    position: relative;
-    border-radius: 8px !important;
-
-    &:first-child {
-      border-radius: 24px 12px 12px 24px !important;
-    }
-
-    &:last-child {
-      border-radius: 12px 24px 24px 12px !important;
+  .btn-group.btn-group-horizontal :global {
+    & > button,
+    & > a {
+      position: relative;
+      border-radius: 8px !important;
+
+      &:first-child {
+        border-radius: 24px 12px 12px 24px !important;
+      }
+
+      &:last-child {
+        border-radius: 12px 24px 24px 12px !important;
+      }
     }
   }
 </style>