diff --git a/app/src/main/res/layouts/mastodon/layout/layout_media.xml b/app/src/main/res/layouts/mastodon/layout/layout_media.xml
index f340763ac251aaed92130ee3f0d9d99f1bdfd671..0ba67e768756540f026875e7b1ec482324a48dab 100644
--- a/app/src/main/res/layouts/mastodon/layout/layout_media.xml
+++ b/app/src/main/res/layouts/mastodon/layout/layout_media.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/media"
         android:adjustViewBounds="true"
         android:layout_height="match_parent"
@@ -16,6 +16,9 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Fedilab.DrawerMedia"
+        app:strokeColor="?colorOutline"
+        app:strokeWidth="1dp"
         tools:ignore="ContentDescription" />
 
     <androidx.media3.ui.PlayerView
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e69af45c371f7332ec9e06e29ad0a172669c63cb..889e6d3ef8dd1aedbf28b224c22e47cac8d370ab 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -273,5 +273,8 @@
         <item name="android:insetBottom">0dp</item>
     </style>
 
+    <style name="ShapeAppearanceOverlay.Fedilab.DrawerMedia" parent="">
+        <item name="cornerSize">6dp</item>
+    </style>
 
 </resources>