diff --git a/components/social-elements/notes/attachment.vue b/components/social-elements/notes/attachment.vue
index 3bc3dbf..1a25494 100644
--- a/components/social-elements/notes/attachment.vue
+++ b/components/social-elements/notes/attachment.vue
@@ -1,19 +1,34 @@
 <template>
     <div tabindex="0" aria-label="Open attachment in lightbox"
-        class="aspect-video w-full rounded ring-white/5 shadow overflow-hidden ring-1 hover:ring-2 duration-100">
+        class="aspect-video w-full rounded ring-white/5 shadow overflow-hidden ring-1 hover:ring-2 duration-100 relative">
         <img v-if="attachment.type === 'image'" tabindex="-1"
             class="object-cover w-full h-full rounded duration-150 hover:scale-[102%] ease-in-out" :src="attachment.url"
-            :alt="attachment.description ?? ''" :title="attachment.description ?? ''" @click="openLightbox"
-            @keydown="openLightbox" />
-        <video v-else-if="attachment.type === 'video'" class="object-cover w-full h-full rounded" controls
-            :alt="attachment.description ?? ''" :title="attachment.description ?? ''">
-            <source :src="attachment.url" type="video/mp4" />
+            :alt="attachment.description ?? undefined" @click="openLightbox" @keydown="openLightbox" />
+        <video v-else-if="attachment.type === 'video'" class="object-contain w-full h-full rounded aspect-video"
+            controls :alt="attachment.description ?? undefined" :src="attachment.url">
             Your browser does not support the video tag.
         </video>
+        <!-- Alt text viewer -->
+        <Popover.Root :positioning="{
+            strategy: 'fixed',
+        }" v-if="attachment.description">
+            <Popover.Trigger
+                class="absolute top-2 right-2 p-1 bg-dark-800 ring-1 ring-white/5 text-white text-xs rounded size-8">
+                <iconify-icon icon="tabler:alt" width="none" class="size-6" />
+            </Popover.Trigger>
+            <Popover.Positioner>
+                <Popover.Content class="p-4 bg-dark-400 rounded text-sm ring-1 ring-white/10 shadow-lg text-gray-300">
+                    <Popover.Title class="font-semibold mb-2">
+                        Description</Popover.Title>
+                    <Popover.Description>{{ attachment.description }}</Popover.Description>
+                </Popover.Content>
+            </Popover.Positioner>
+        </Popover.Root>
     </div>
 </template>
 
 <script lang="ts" setup>
+import { Popover } from "@ark-ui/vue";
 import type { Attachment } from "~/types/mastodon/attachment";
 
 const props = defineProps<{
diff --git a/components/social-elements/notes/note-content.vue b/components/social-elements/notes/note-content.vue
index 27d84fb..6c4336c 100644
--- a/components/social-elements/notes/note-content.vue
+++ b/components/social-elements/notes/note-content.vue
@@ -7,7 +7,8 @@
                 v-html="content">
             </div>
         </Skeleton>
-        <div v-if="note && note.media_attachments.length > 0" class="[&:not(:first-child)]:mt-6">
+        <div v-if="note && note.media_attachments.length > 0"
+            class="[&:not(:first-child)]:mt-6 grid grid-cols-2 gap-4 [&>*]:aspect-square [&:has(>:last-child:nth-child(1))>*]:aspect-video [&:has(>:last-child:nth-child(1))]:block">
             <SocialElementsNotesAttachment v-for="attachment of note.media_attachments" :key="attachment.id"
                 :attachment="attachment" />
         </div>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 05bdaf3..d4c4f5f 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -42,6 +42,9 @@ export default defineNuxtConfig({
             },
             crossOriginResourcePolicy: "cross-origin",
             xFrameOptions: "DENY",
+            permissionsPolicy: {
+                fullscreen: ["'self'", "blob:"],
+            },
         },
         rateLimiter: {
             headers: true,