diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
index 980f99f83..d0d1d6abc 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
+++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift
@@ -20,7 +20,8 @@ public class ConversationMediaView: UIView {
 
         super.init(frame: .zero)
 
-        self.backgroundColor = .white
+        backgroundColor = Theme.offBackgroundColor
+        clipsToBounds = true
 
         createContents()
     }
@@ -63,7 +64,7 @@ public class ConversationMediaView: UIView {
         // some performance cost.
         animatedImageView.layer.minificationFilter = kCAFilterTrilinear
         animatedImageView.layer.magnificationFilter = kCAFilterTrilinear
-        animatedImageView.backgroundColor = .white
+        animatedImageView.backgroundColor = Theme.offBackgroundColor
         addSubview(animatedImageView)
         animatedImageView.autoPinEdgesToSuperviewEdges()
         //            [self addAttachmentUploadViewIfNecessary];
@@ -107,7 +108,7 @@ public class ConversationMediaView: UIView {
         // some performance cost.
         stillImageView.layer.minificationFilter = kCAFilterTrilinear
         stillImageView.layer.magnificationFilter = kCAFilterTrilinear
-        stillImageView.backgroundColor = .white
+        stillImageView.backgroundColor = Theme.offBackgroundColor
         addSubview(stillImageView)
         stillImageView.autoPinEdgesToSuperviewEdges()
         //            [self addAttachmentUploadViewIfNecessary];
@@ -150,7 +151,7 @@ public class ConversationMediaView: UIView {
         // some performance cost.
         stillImageView.layer.minificationFilter = kCAFilterTrilinear
         stillImageView.layer.magnificationFilter = kCAFilterTrilinear
-        stillImageView.backgroundColor = .white
+        stillImageView.backgroundColor = Theme.offBackgroundColor
         addSubview(stillImageView)
         stillImageView.autoPinEdgesToSuperviewEdges()
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaGalleryCellView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaGalleryCellView.swift
index 21b56ccbc..73894cc78 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/MediaGalleryCellView.swift
+++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaGalleryCellView.swift
@@ -24,7 +24,7 @@ public class MediaGalleryCellView: UIStackView {
 
         super.init(frame: .zero)
 
-        self.backgroundColor = .white
+        backgroundColor = Theme.offBackgroundColor
 
         createContents(maxMessageWidth: maxMessageWidth)
     }