diff --git a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss
index 490427a..ab450b1 100644
--- a/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss
+++ b/mastodon/app/javascript/styles/tangerineui-cherry/tangerineui-cherry.scss
@@ -1934,8 +1934,35 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 }
 .app-body .media-gallery__preview,
 .app-body .video-player {
-    background-color: var(--color-content-bg);
+    background-color: var(--color-content-secondary-bg);
 } 
+.app-body .media-gallery__preview {
+    outline: 1px solid rgba(0, 0, 0, 0.05);
+    outline-offset: -1px;
+    height: calc(100% - 1px);
+    border-radius: 8px;
+    transition: all .2s;
+}
+.app-body .spoiler-button:hover + .media-gallery__item > .media-gallery__preview {
+    outline: 1px solid rgba(0, 0, 0, 0.15);
+}
+.app-body .spoiler-button__overlay__label,
+.app-body .spoiler-button__overlay__label:is(:focus, :hover),
+.app-body .spoiler-button__overlay:is(:focus, :hover) .spoiler-button__overlay__label {
+    backdrop-filter: none;
+    -webkit-backdrop-filter: none;
+    background-color: transparent;
+    color: var(--color-content-fg);
+}
+.app-body .spoiler-button__overlay__label > span:first-child {
+    font-weight: bold;
+}
+
+.app-body .media-gallery__gifv__label {
+    background-color: rgba(0, 0, 0, .1);
+    border-radius: 6px;
+} 
+
 
 /* 📊 Polls */
 .app-body .poll__chart,
@@ -4072,7 +4099,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 
 /* 🖱️ Interaction modals
    --------------------- */
-.app-body .modal-root__modal {
+.app-body .modal-root__modal:not(.media-modal) {
     border: 1px solid var(--color-lines);
 }
 .app-body .interaction-modal {
diff --git a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss
index 9c2c4c3..67af3f6 100644
--- a/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss
+++ b/mastodon/app/javascript/styles/tangerineui-purple/tangerineui-purple.scss
@@ -1933,8 +1933,35 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 }
 .app-body .media-gallery__preview,
 .app-body .video-player {
-    background-color: var(--color-content-bg);
+    background-color: var(--color-content-secondary-bg);
 } 
+.app-body .media-gallery__preview {
+    outline: 1px solid rgba(0, 0, 0, 0.05);
+    outline-offset: -1px;
+    height: calc(100% - 1px);
+    border-radius: 8px;
+    transition: all .2s;
+}
+.app-body .spoiler-button:hover + .media-gallery__item > .media-gallery__preview {
+    outline: 1px solid rgba(0, 0, 0, 0.15);
+}
+.app-body .spoiler-button__overlay__label,
+.app-body .spoiler-button__overlay__label:is(:focus, :hover),
+.app-body .spoiler-button__overlay:is(:focus, :hover) .spoiler-button__overlay__label {
+    backdrop-filter: none;
+    -webkit-backdrop-filter: none;
+    background-color: transparent;
+    color: var(--color-content-fg);
+}
+.app-body .spoiler-button__overlay__label > span:first-child {
+    font-weight: bold;
+}
+
+.app-body .media-gallery__gifv__label {
+    background-color: rgba(0, 0, 0, .1);
+    border-radius: 6px;
+} 
+
 
 /* 📊 Polls */
 .app-body .poll__chart,
@@ -4071,7 +4098,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 
 /* 🖱️ Interaction modals
    --------------------- */
-.app-body .modal-root__modal {
+.app-body .modal-root__modal:not(.media-modal) {
     border: 1px solid var(--color-lines);
 }
 .app-body .interaction-modal {
diff --git a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss
index 718d836..67326f1 100644
--- a/mastodon/app/javascript/styles/tangerineui/tangerineui.scss
+++ b/mastodon/app/javascript/styles/tangerineui/tangerineui.scss
@@ -1933,8 +1933,35 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 }
 .app-body .media-gallery__preview,
 .app-body .video-player {
-    background-color: var(--color-content-bg);
+    background-color: var(--color-content-secondary-bg);
 } 
+.app-body .media-gallery__preview {
+    outline: 1px solid rgba(0, 0, 0, 0.05);
+    outline-offset: -1px;
+    height: calc(100% - 1px);
+    border-radius: 8px;
+    transition: all .2s;
+}
+.app-body .spoiler-button:hover + .media-gallery__item > .media-gallery__preview {
+    outline: 1px solid rgba(0, 0, 0, 0.15);
+}
+.app-body .spoiler-button__overlay__label,
+.app-body .spoiler-button__overlay__label:is(:focus, :hover),
+.app-body .spoiler-button__overlay:is(:focus, :hover) .spoiler-button__overlay__label {
+    backdrop-filter: none;
+    -webkit-backdrop-filter: none;
+    background-color: transparent;
+    color: var(--color-content-fg);
+}
+.app-body .spoiler-button__overlay__label > span:first-child {
+    font-weight: bold;
+}
+
+.app-body .media-gallery__gifv__label {
+    background-color: rgba(0, 0, 0, .1);
+    border-radius: 6px;
+} 
+
 
 /* 📊 Polls */
 .app-body .poll__chart,
@@ -4071,7 +4098,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 
 /* 🖱️ Interaction modals
    --------------------- */
-.app-body .modal-root__modal {
+.app-body .modal-root__modal:not(.media-modal) {
     border: 1px solid var(--color-lines);
 }
 .app-body .interaction-modal {