diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json
index 22defce50..80c4669a0 100644
--- a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json
+++ b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "add-caption-32@1x.png",
+      "filename" : "caption-24@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "add-caption-32@2x.png",
+      "filename" : "caption-24@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "add-caption-32@3x.png",
+      "filename" : "caption-24@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png
deleted file mode 100644
index 2d1325e01..000000000
Binary files a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png
deleted file mode 100644
index ba403c8b3..000000000
Binary files a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@3x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@3x.png
deleted file mode 100644
index 4cc8d3839..000000000
Binary files a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png
new file mode 100644
index 000000000..5d6512367
Binary files /dev/null and b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png differ
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png
new file mode 100644
index 000000000..c444e83a9
Binary files /dev/null and b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png differ
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png
new file mode 100644
index 000000000..740abdfff
Binary files /dev/null and b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png differ
diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
index 784828584..40e681eda 100644
--- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
@@ -1460,7 +1460,7 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate {
 
         // Add shadow in case overlayed on white content
         lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor
-        lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
+        lengthLimitLabel.layer.shadowOffset = .zero
         lengthLimitLabel.layer.shadowOpacity = 0.8
         lengthLimitLabel.isHidden = true
 
@@ -1694,6 +1694,7 @@ public class ApprovalRailCellView: GalleryRailCellView {
         imageView.layer.shadowColor = UIColor.black.cgColor
         imageView.layer.shadowRadius = 2
         imageView.layer.shadowOpacity = 0.66
+        imageView.layer.shadowOffset = .zero
         return imageView
     }()
 
@@ -1725,8 +1726,8 @@ public class ApprovalRailCellView: GalleryRailCellView {
         if hasCaption {
             addSubview(captionIndicator)
 
-            captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 0)
-            captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 4)
+            captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 2)
+            captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 6)
         } else {
             captionIndicator.removeFromSuperview()
         }
diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift
index 7b57106b6..e33fe9363 100644
--- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift
@@ -177,7 +177,7 @@ class AttachmentCaptionViewController: OWSViewController {
 
         // Add shadow in case overlayed on white content
         lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor
-        lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
+        lengthLimitLabel.layer.shadowOffset = .zero
         lengthLimitLabel.layer.shadowOpacity = 0.8
         lengthLimitLabel.isHidden = true
 
diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift
index 0ba7170a6..e1c78ff24 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift
@@ -103,8 +103,9 @@ public class ImageEditorPaletteView: UIView {
         imageView.layer.borderColor = UIColor.white.cgColor
         imageView.layer.borderWidth = CGHairlineWidth()
         imageView.layer.shadowColor = UIColor.black.cgColor
-        imageView.layer.shadowOpacity = 2.0
+        imageView.layer.shadowRadius = 2.0
         imageView.layer.shadowOpacity = 0.33
+        imageView.layer.shadowOffset = .zero
         selectionWrapper.layoutCallback = { [weak self] (view) in
             guard let strongSelf = self else {
                 return