diff --git a/components/errors/AuthRequired.vue b/components/errors/AuthRequired.vue
index ba1266c..b3b2ec4 100644
--- a/components/errors/AuthRequired.vue
+++ b/components/errors/AuthRequired.vue
@@ -1,5 +1,5 @@
 <template>
-    <Alert layout="button" class="grid">
+    <Alert layout="button">
         <LogIn />
         <AlertTitle>{{ m.sunny_quick_lionfish_flip() }}</AlertTitle>
         <AlertDescription>
diff --git a/components/notes/attachment.vue b/components/notes/attachment.vue
index 132d23c..d5fdefc 100644
--- a/components/notes/attachment.vue
+++ b/components/notes/attachment.vue
@@ -1,85 +1,16 @@
 <template>
-    <Dialog>
-        <Card class="w-full h-full overflow-hidden relative p-0">
-            <DialogTrigger v-if="attachment.type === 'image'" :as-child="true">
-                <img :src="attachment.url" :alt="attachment.description ?? undefined"
-                    class="w-full h-full object-contain bg-muted/20" />
-            </DialogTrigger>
-            <video v-else-if="attachment.type === 'video' || attachment.type === 'gifv'" :src="attachment.url"
-                :alt="attachment.description ?? undefined" class="w-full h-full object-cover bg-muted/20" controls />
-            <audio v-else-if="attachment.type === 'audio'" :src="attachment.url"
-                :alt="attachment.description ?? undefined" class="w-full h-full object-cover bg-muted/20" controls />
-            <DialogTrigger v-else :as-child="true">
-                <div class="w-full h-full flex flex-col items-center justify-center bg-muted/20 min-h-48">
-                    <File class="size-12" />
-                    <span class="text-sm"></span>
-                </div>
-            </DialogTrigger>
-            <!-- Alt text viewer -->
-            <Popover v-if="attachment.description">
-                <div class="absolute top-0 right-0 p-2">
-                    <PopoverTrigger :as-child="true">
-                        <Button variant="outline" size="icon" class="[&_svg]:size-6" title="View alt text">
-                            <Captions />
-                        </Button>
-                    </PopoverTrigger>
-                </div>
-                <PopoverContent>
-                    <p class="text-sm">{{ attachment.description }}</p>
-                </PopoverContent>
-            </Popover>
-        </Card>
-        <DialogContent :hide-close="true"
-            class="p-6 duration-200 bg-transparent border-none overflow-hidden !animate-none gap-6 w-screen h-screen !max-w-none">
-            <div class="grid grid-rows-[auto_1fr_auto]">
-                <div class="flex flex-row gap-2 w-full">
-                    <DialogTitle class="sr-only">{{ attachment.type }}</DialogTitle>
-                    <Button as="a" :href="attachment?.url" target="_blank" :download="true" variant="ghost" size="icon"
-                        class="[&_svg]:size-6  ml-auto">
-                        <Download />
-                    </Button>
-                    <DialogClose :as-child="true">
-                        <Button variant="ghost" size="icon" class="[&_svg]:size-6">
-                            <X />
-                        </Button>
-                    </DialogClose>
-                </div>
-                <div class="flex items-center justify-center overflow-hidden *:max-h-[80vh] *:max-w-[80vw]">
-                    <img v-if="attachment.type === 'image'" :src="attachment.url" :alt="attachment.description ?? ''"
-                        class="object-contain" />
-                    <video v-else-if="attachment.type === 'video' || attachment.type === 'gifv'" :src="attachment.url"
-                        :alt="attachment.description ?? ''" class="object-cover" controls />
-                    <audio v-else-if="attachment.type === 'audio'" :src="attachment.url"
-                        :alt="attachment.description ?? ''" class="object-cover" controls />
-                    <div v-else class="flex flex-col items-center justify-center">
-                        <File class="size-12" />
-                        <span class="text-sm"></span>
-                    </div>
-                </div>
-                <DialogDescription class="flex items-center justify-center">
-                    <Card v-if="attachment.description" class="p-4 max-w-md max-h-48 overflow-auto">
-                        <p class="text-sm">{{ attachment.description }}</p>
-                    </Card>
-                </DialogDescription>
-            </div>
-        </DialogContent>
-    </Dialog>
+    <ImageAttachment v-if="attachment.type === 'image'" :attachment="attachment" />
+    <VideoAttachment v-else-if="attachment.type === 'video' || attachment.type === 'gifv'" :attachment="attachment" />
+    <AudioAttachment v-else-if="attachment.type === 'audio'" :attachment="attachment" />
+    <FileAttachment v-else :attachment="attachment" />
 </template>
 
 <script lang="ts" setup>
 import type { Attachment } from "@versia/client/types";
-import { Captions, Download, File, X } from "lucide-vue-next";
-import { Card } from "~/components/ui/card";
-import { Button } from "../ui/button";
-import {
-    Dialog,
-    DialogClose,
-    DialogContent,
-    DialogDescription,
-    DialogTitle,
-    DialogTrigger,
-} from "../ui/dialog";
-import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
+import AudioAttachment from "./attachments/audio.vue";
+import FileAttachment from "./attachments/file.vue";
+import ImageAttachment from "./attachments/image.vue";
+import VideoAttachment from "./attachments/video.vue";
 
 defineProps<{
     attachment: Attachment;
diff --git a/components/notes/attachments/audio.vue b/components/notes/attachments/audio.vue
new file mode 100644
index 0000000..fae6236
--- /dev/null
+++ b/components/notes/attachments/audio.vue
@@ -0,0 +1,14 @@
+<template>
+    <Base :attachment="attachment">
+        <audio :src="attachment.url" :alt="attachment.description ?? undefined" controls />
+    </Base>
+</template>
+
+<script lang="ts" setup>
+import type { Attachment } from "@versia/client/types";
+import Base from "./base.vue";
+
+const { attachment } = defineProps<{
+    attachment: Attachment;
+}>();
+</script>
diff --git a/components/notes/attachments/base.vue b/components/notes/attachments/base.vue
new file mode 100644
index 0000000..4655e07
--- /dev/null
+++ b/components/notes/attachments/base.vue
@@ -0,0 +1,73 @@
+<template>
+    <Dialog>
+        <Card class="w-full h-full overflow-hidden relative p-0 *:first:w-full *:first:h-full *:first:object-contain *:first:bg-muted/20">
+            <DialogTrigger v-if="lightbox" :as-child="true">
+                <slot />
+            </DialogTrigger>
+            <slot v-else />
+            <!-- Alt text viewer -->
+            <Popover v-if="attachment.description">
+                <div class="absolute top-0 right-0 p-2">
+                    <PopoverTrigger :as-child="true">
+                        <Button variant="outline" size="icon" title="View alt text">
+                            <Captions />
+                        </Button>
+                    </PopoverTrigger>
+                </div>
+                <PopoverContent>
+                    <p class="text-sm">{{ attachment.description }}</p>
+                </PopoverContent>
+            </Popover>
+        </Card>
+        <DialogContent :hide-close="true"
+            class="duration-200 bg-transparent border-none overflow-hidden !animate-none gap-6 w-screen h-screen !max-w-none">
+            <div class="grid grid-rows-[auto_1fr_auto]">
+                <div class="flex flex-row gap-2 w-full">
+                    <DialogTitle class="sr-only">{{ attachment.type }}</DialogTitle>
+                    <Button as="a" :href="attachment?.url" target="_blank" :download="true" variant="outline" size="icon"
+                        class="ml-auto">
+                        <Download />
+                    </Button>
+                    <DialogClose :as-child="true">
+                        <Button variant="outline" size="icon">
+                            <X />
+                        </Button>
+                    </DialogClose>
+                </div>
+                <div class="flex items-center justify-center overflow-hidden *:max-h-[80vh] *:max-w-[80vw] *:w-full *:h-full *:object-contain">
+                   <slot />
+                </div>
+                <DialogDescription class="flex items-center justify-center">
+                    <Card v-if="attachment.description" class="max-w-md max-h-48 overflow-auto text-sm">
+                        <p>{{ attachment.description }}</p>
+                    </Card>
+                </DialogDescription>
+            </div>
+        </DialogContent>
+    </Dialog>
+</template>
+
+<script lang="ts" setup>
+import type { Attachment } from "@versia/client/types";
+import { Captions, Download, File, X } from "lucide-vue-next";
+import { Button } from "~/components/ui/button";
+import { Card } from "~/components/ui/card";
+import {
+    Dialog,
+    DialogClose,
+    DialogContent,
+    DialogDescription,
+    DialogTitle,
+    DialogTrigger,
+} from "~/components/ui/dialog";
+import {
+    Popover,
+    PopoverContent,
+    PopoverTrigger,
+} from "~/components/ui/popover";
+
+const { attachment, lightbox = false } = defineProps<{
+    attachment: Attachment;
+    lightbox?: boolean;
+}>();
+</script>
diff --git a/components/notes/attachments/file.vue b/components/notes/attachments/file.vue
new file mode 100644
index 0000000..744d21e
--- /dev/null
+++ b/components/notes/attachments/file.vue
@@ -0,0 +1,18 @@
+<template>
+    <Base :attachment="attachment" lightbox>
+        <div class="flex flex-col items-center justify-center min-h-48 text-sm gap-2">
+            <File class="size-12" />
+            <span>File attachment</span>
+        </div>
+    </Base>
+</template>
+
+<script lang="ts" setup>
+import type { Attachment } from "@versia/client/types";
+import { File } from "lucide-vue-next";
+import Base from "./base.vue";
+
+const { attachment } = defineProps<{
+    attachment: Attachment;
+}>();
+</script>
diff --git a/components/notes/attachments/image.vue b/components/notes/attachments/image.vue
new file mode 100644
index 0000000..1f5a395
--- /dev/null
+++ b/components/notes/attachments/image.vue
@@ -0,0 +1,14 @@
+<template>
+    <Base :attachment="attachment" lightbox>
+        <img :src="attachment.url" :alt="attachment.description ?? undefined" />
+    </Base>
+</template>
+
+<script lang="ts" setup>
+import type { Attachment } from "@versia/client/types";
+import Base from "./base.vue";
+
+const { attachment } = defineProps<{
+    attachment: Attachment;
+}>();
+</script>
diff --git a/components/notes/attachments/video.vue b/components/notes/attachments/video.vue
new file mode 100644
index 0000000..b10aa09
--- /dev/null
+++ b/components/notes/attachments/video.vue
@@ -0,0 +1,14 @@
+<template>
+    <Base :attachment="attachment">
+        <video :src="attachment.url" :alt="attachment.description ?? undefined" controls />
+    </Base>
+</template>
+
+<script lang="ts" setup>
+import type { Attachment } from "@versia/client/types";
+import Base from "./base.vue";
+
+const { attachment } = defineProps<{
+    attachment: Attachment;
+}>();
+</script>
diff --git a/components/notes/content-warning.vue b/components/notes/content-warning.vue
index b0b348f..93ac448 100644
--- a/components/notes/content-warning.vue
+++ b/components/notes/content-warning.vue
@@ -1,10 +1,7 @@
 <template>
     <Alert layout="button">
         <TriangleAlert />
-        <AlertTitle class="sr-only">{{ m.livid_tangy_lionfish_clasp() }}</AlertTitle>
-        <AlertDescription>
-            {{ contentWarning || m.sour_seemly_bird_hike() }}
-        </AlertDescription>
+        <AlertTitle>{{ contentWarning || m.sour_seemly_bird_hike() }}</AlertTitle>
         <Button @click="blurred = !blurred" variant="outline" size="sm">{{ blurred ? m.bald_direct_turtle_win() :
             m.known_flaky_cockroach_dash() }}</Button>
     </Alert>
diff --git a/components/notes/content.vue b/components/notes/content.vue
index 503d9b9..c827948 100644
--- a/components/notes/content.vue
+++ b/components/notes/content.vue
@@ -1,7 +1,7 @@
 <template>
     <ContentWarning v-if="(sensitive || contentWarning) && preferences.show_content_warning" :content-warning="contentWarning" v-model="blurred" />
 
-    <OverflowGuard :character-count="characterCount" :class="(blurred && preferences.show_content_warning) && 'blur-md'">
+    <OverflowGuard v-if="content" :character-count="characterCount" :class="(blurred && preferences.show_content_warning) && 'blur-md'">
         <Prose v-html="content" v-render-emojis="emojis"></Prose>
     </OverflowGuard>