diff --git a/web/styles/dark_theme.css b/web/styles/dark_theme.css
index 3cd874f9f7..f3036c25f8 100644
--- a/web/styles/dark_theme.css
+++ b/web/styles/dark_theme.css
@@ -346,14 +346,6 @@
         }
     }
 
-    .message_embed .data-container::after {
-        background: linear-gradient(
-            0deg,
-            hsl(212deg 28% 18%),
-            transparent 100%
-        );
-    }
-
     .stream_name_search_section,
     .group_name_search_section {
         border-color: hsl(0deg 0% 0% / 20%);
diff --git a/web/styles/message_row.css b/web/styles/message_row.css
index d5492a1b19..fcdd019df8 100644
--- a/web/styles/message_row.css
+++ b/web/styles/message_row.css
@@ -32,10 +32,26 @@ $time_column_min_width: 42px; /* + padding */
 
     &.direct_mention {
         background-color: var(--color-background-direct-mention);
+
+        .message_embed .data-container::after {
+            background: linear-gradient(
+                0deg,
+                var(--color-background-direct-mention),
+                transparent 100%
+            );
+        }
     }
 
     &.group_mention {
         background-color: var(--color-background-group-mention);
+
+        .message_embed .data-container::after {
+            background: linear-gradient(
+                0deg,
+                var(--color-background-group-mention),
+                transparent 100%
+            );
+        }
     }
 
     .date_row {
diff --git a/web/styles/rendered_markdown.css b/web/styles/rendered_markdown.css
index 49ea54dc3b..b3d72bdd92 100644
--- a/web/styles/rendered_markdown.css
+++ b/web/styles/rendered_markdown.css
@@ -629,7 +629,7 @@
 
             background: linear-gradient(
                 0deg,
-                hsl(0deg 0% 100%),
+                var(--color-background-stream-message-content),
                 transparent 100%
             );
         }
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index b0d8c9375c..b523b1a249 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -1367,6 +1367,14 @@ td.pointer {
     .date_row {
         background-color: var(--color-background-private-message-content);
     }
+
+    .data-container::after {
+        background: linear-gradient(
+            0deg,
+            var(--color-background-private-message-content),
+            transparent 100%
+        );
+    }
 }
 
 .selected_message {