diff --git a/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue.png b/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue.png deleted file mode 100644 index c429e6738..000000000 Binary files a/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue.png and /dev/null differ diff --git a/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue@2x.png b/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue@2x.png deleted file mode 100644 index 432d61848..000000000 Binary files a/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue@2x.png and /dev/null differ diff --git a/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue@3x.png b/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue@3x.png deleted file mode 100644 index 0475defa9..000000000 Binary files a/Signal/Images.xcassets/btnAttachments--blue.imageset/btnAttachments--blue@3x.png and /dev/null differ diff --git a/Signal/Images.xcassets/btnAttachments--blue.imageset/Contents.json b/Signal/Images.xcassets/ic_circled_plus.imageset/Contents.json similarity index 61% rename from Signal/Images.xcassets/btnAttachments--blue.imageset/Contents.json rename to Signal/Images.xcassets/ic_circled_plus.imageset/Contents.json index 5689ed1b6..126b9bb42 100644 --- a/Signal/Images.xcassets/btnAttachments--blue.imageset/Contents.json +++ b/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" } ], diff --git a/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@1x.png b/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@1x.png new file mode 100644 index 000000000..c3c91d0a1 Binary files /dev/null and b/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@1x.png differ diff --git a/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@2x.png b/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@2x.png new file mode 100644 index 000000000..01c4afc58 Binary files /dev/null and b/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@2x.png differ diff --git a/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@3x.png b/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@3x.png new file mode 100644 index 000000000..0e2f159ba Binary files /dev/null and b/Signal/Images.xcassets/ic_circled_plus.imageset/UIRemoveControlPlus_22x22_@3x.png differ diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index fbead8242..d7f9c5e38 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/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;