diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json b/Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json
new file mode 100644
index 000000000..56e31a38a
--- /dev/null
+++ b/Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "search-24@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "search-24@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "search-24@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@1x.png b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@1x.png
new file mode 100644
index 000000000..f5692befb
Binary files /dev/null and b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@1x.png differ
diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@2x.png b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@2x.png
new file mode 100644
index 000000000..5520b610f
Binary files /dev/null and b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@2x.png differ
diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@3x.png b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@3x.png
new file mode 100644
index 000000000..ddcb373ba
Binary files /dev/null and b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@3x.png differ
diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
index f6d48ea0b..aa3984d4c 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@@ -363,7 +363,7 @@ const CGFloat kIconViewLength = 24;
                                      @"Table cell label in conversation settings which returns the user to the "
                                      @"conversation with 'search mode' activated");
                                  return
-                                     [weakSelf disclosureCellWithName:title iconName:@"actionsheet_camera_roll_black"];
+                                     [weakSelf disclosureCellWithName:title iconName:@"conversation_settings_search"];
                              }
                              actionBlock:^{
                                  [weakSelf tappedConversationSearch];
diff --git a/SignalMessaging/Views/OWSNavigationBar.swift b/SignalMessaging/Views/OWSNavigationBar.swift
index 1d0997460..6255ee82f 100644
--- a/SignalMessaging/Views/OWSNavigationBar.swift
+++ b/SignalMessaging/Views/OWSNavigationBar.swift
@@ -62,7 +62,6 @@ public class OWSNavigationBar: UINavigationBar {
 
     override public var next: UIResponder? {
         if let stubbedNextResponder = self.stubbedNextResponder {
-            Logger.debug("returning stubbed responder")
             return stubbedNextResponder
         }