Merge branch 'mkirk/tweak-icons'

Signal/Images.xcassets/ic_circled_plus.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "btnAttachments--blue.png",
+      "filename" : "UIRemoveControlPlus_22x22_@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "btnAttachments--blue@2x.png",
+      "filename" : "UIRemoveControlPlus_22x22_@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "btnAttachments--blue@3x.png",
+      "filename" : "UIRemoveControlPlus_22x22_@3x.png",
       "scale" : "3x"
     }
   ],

Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m

@@ -119,7 +119,7 @@ const CGFloat kMaxTextViewHeight = 98;
     [self.attachmentButton addTarget:self
                               action:@selector(attachmentButtonPressed)
                     forControlEvents:UIControlEventTouchUpInside];
-    UIImage *attachmentImage = [UIImage imageNamed:@"btnAttachments--blue"];
+    UIImage *attachmentImage = [UIImage imageNamed:@"ic_circled_plus"];
     [self.attachmentButton setImage:[attachmentImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]
                            forState:UIControlStateNormal];
     self.attachmentButton.tintColor = UIColor.ows_navbarIconColor;