diff --git a/Signal/Images.xcassets/image_editor_add_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_add_caption.imageset/Contents.json
new file mode 100644
index 0000000000..15de683ae7
--- /dev/null
+++ b/Signal/Images.xcassets/image_editor_add_caption.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "add-caption-28@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "add-caption-28@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "add-caption-28@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@1x.png b/Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@1x.png
similarity index 100%
rename from Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@1x.png
rename to Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@1x.png
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@2x.png b/Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@2x.png
similarity index 100%
rename from Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@2x.png
rename to Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@2x.png
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@3x.png b/Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@3x.png
similarity index 100%
rename from Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@3x.png
rename to Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@3x.png
diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json
index 15de683ae7..80c4669a0b 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-28@1x.png",
+      "filename" : "caption-24@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "add-caption-28@2x.png",
+      "filename" : "caption-24@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "add-caption-28@3x.png",
+      "filename" : "caption-24@3x.png",
       "scale" : "3x"
     }
   ],
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 0000000000..5d65123676
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 0000000000..c444e83a99
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 0000000000..740abdfffb
Binary files /dev/null and b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png differ
diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift
index ac511390fd..07babf5ef9 100644
--- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift
@@ -278,9 +278,9 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
                 shouldShowCaptionUI = true
             }
             if shouldShowCaptionUI {
-                let captionButton = navigationBarButton(imageName: "image_editor_caption",
-                                                        selector: #selector(didTapCaption(sender:)))
-                navigationBarItems.append(captionButton)
+                let addCaptionButton = navigationBarButton(imageName: "image_editor_add_caption",
+                                                           selector: #selector(didTapCaption(sender:)))
+                navigationBarItems.append(addCaptionButton)
             }
         }