8 files changed, 0 insertions, 54 deletions
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 63ccb6504..000000000
--- a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index a4a5ba2fb..000000000
--- a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index a74ea93d7..000000000
--- a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 3245c133d..000000000
--- a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 0c464d4a9..000000000
--- a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 1fb3f1391..d67bf5253 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -77,9 +77,4 @@
         android:orderInCategory="100"
         app:showAsAction="never"
         android:title="@string/create_issue" />
-    <item
-        android:id="@+id/action_search_history"
-        android:icon="?attr/icon_search"
-        app:showAsAction="ifRoom"
-        android:title="@string/search" />
 </menu>
 \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 85ecacdf8..e8edc5d50 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -781,7 +781,6 @@
     <string name="create_shortcut">Create Shortcut</string>
     <string name="not_encrypted_for_this_device">Message was not encrypted for this device.</string>
     <string name="no_microphone_permission">Conversations needs access to the microphone</string>
-    <string name="title_activity_search">Search</string>
     <string name="search_messages">Search messages</string>
     <string name="gif">GIF</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 69603f4c6..aef7c7daa 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -248,54 +248,6 @@
         <item name="ic_settings_about" type="reference">@drawable/ic_help_circle_white_24dp</item>
     </style>
 
-    <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowActionBar">false</item>
-
-        <item name="TextSizeCaption">12sp</item>
-        <item name="TextSizeBody1">14sp</item>
-        <item name="TextSizeBody2">14sp</item>
-        <item name="TextSizeDisplay2">45sp</item>
-        <item name="TextSizeSubhead">16sp</item>
-        <item name="TextSizeTitle">20sp</item>
-        <item name="TextSizeInput">16sp</item>
-        <item name="TextSeparation">5sp</item>
-        <item name="IconSize">18sp</item>
-        <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeBody">14sp</item>
-        <item name="TextSizeHeadline">18sp</item>
-
-        <item name="colorAccent">@color/accent</item>
-        <item name="color_background_primary">@color/grey50</item>
-        <item name="color_background_secondary">@color/grey200</item>
-
-        <item name="android:background">@color/grey50</item>
-    </style>
-
-    <style name="ConversationsDialog.Dark" parent="Theme.AppCompat.Dialog">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowActionBar">false</item>
-
-        <item name="TextSizeCaption">12sp</item>
-        <item name="TextSizeBody1">14sp</item>
-        <item name="TextSizeBody2">14sp</item>
-        <item name="TextSizeDisplay2">45sp</item>
-        <item name="TextSizeSubhead">16sp</item>
-        <item name="TextSizeTitle">20sp</item>
-        <item name="TextSizeInput">16sp</item>
-        <item name="TextSeparation">5sp</item>
-        <item name="IconSize">18sp</item>
-        <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeBody">14sp</item>
-        <item name="TextSizeHeadline">18sp</item>
-
-        <item name="colorAccent">@color/accent</item>
-        <item name="color_background_primary">@color/grey900</item>
-        <item name="color_background_secondary">@color/realblack</item>
-
-        <item name="android:background">@color/grey900</item>
-    </style>
-
 
     <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="colorPrimary">@color/primary</item>