diff --git a/res/drawable-hdpi/action_search_folder_dark.png b/res/drawable-hdpi/action_search_folder_dark.png
new file mode 100644
index 000000000..34d2d7912
Binary files /dev/null and b/res/drawable-hdpi/action_search_folder_dark.png differ
diff --git a/res/drawable-hdpi/action_search_folder_light.png b/res/drawable-hdpi/action_search_folder_light.png
new file mode 100644
index 000000000..b3b208ae9
Binary files /dev/null and b/res/drawable-hdpi/action_search_folder_light.png differ
diff --git a/res/drawable-ldpi/action_search_folder_dark.png b/res/drawable-ldpi/action_search_folder_dark.png
new file mode 100644
index 000000000..82e060596
Binary files /dev/null and b/res/drawable-ldpi/action_search_folder_dark.png differ
diff --git a/res/drawable-ldpi/action_search_folder_light.png b/res/drawable-ldpi/action_search_folder_light.png
new file mode 100644
index 000000000..bbedbe147
Binary files /dev/null and b/res/drawable-ldpi/action_search_folder_light.png differ
diff --git a/res/drawable-mdpi/action_search_folder_dark.png b/res/drawable-mdpi/action_search_folder_dark.png
new file mode 100644
index 000000000..b192e496c
Binary files /dev/null and b/res/drawable-mdpi/action_search_folder_dark.png differ
diff --git a/res/drawable-mdpi/action_search_folder_light.png b/res/drawable-mdpi/action_search_folder_light.png
new file mode 100644
index 000000000..2c1add08c
Binary files /dev/null and b/res/drawable-mdpi/action_search_folder_light.png differ
diff --git a/res/drawable-xhdpi/action_search_folder_dark.png b/res/drawable-xhdpi/action_search_folder_dark.png
new file mode 100644
index 000000000..e7cc38ed6
Binary files /dev/null and b/res/drawable-xhdpi/action_search_folder_dark.png differ
diff --git a/res/drawable-xhdpi/action_search_folder_light.png b/res/drawable-xhdpi/action_search_folder_light.png
new file mode 100644
index 000000000..de254cc83
Binary files /dev/null and b/res/drawable-xhdpi/action_search_folder_light.png differ
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index f5d63b8d7..f850a99c6 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
         android:id="@+id/filter_folders"
-        android:icon="?attr/iconActionSearch"
+        android:icon="?attr/iconActionSearchFolder"
         android:showAsAction="always"
         android:title="@string/filter_folders_action"/>
     <item
diff --git a/res/menu/folder_select_option.xml b/res/menu/folder_select_option.xml
index 0275629c5..d3723fde3 100644
--- a/res/menu/folder_select_option.xml
+++ b/res/menu/folder_select_option.xml
@@ -8,7 +8,7 @@
         <menu>-->
            <item
             android:id="@+id/filter_folders"
-            android:icon="?attr/iconActionSearch"
+            android:icon="?attr/iconActionSearchFolder"
             android:showAsAction="always"
             android:title="@string/filter_folders_action"
            />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 745643fdd..7fa1032e9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -16,6 +16,7 @@
         <attr name="iconActionPreviousMessage" format="reference" />
         <attr name="iconActionRefresh" format="reference" />
         <attr name="iconActionSearch" format="reference" />
+        <attr name="iconActionSearchFolder" format="reference" />
         <attr name="iconActionSend" format="reference" />
         <attr name="iconActionSettings" format="reference" />
         <attr name="iconActionSingleMessageOptions" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f92c80518..7e10e1f56 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,6 +16,7 @@
         <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_light</item>
         <item name="iconActionRefresh">@drawable/ic_action_refresh_light</item>
         <item name="iconActionSearch">@drawable/ic_action_search_light</item>
+        <item name="iconActionSearchFolder">@drawable/action_search_folder_light</item>
         <item name="iconActionSend">@drawable/ic_action_send_light</item>
         <item name="iconActionSettings">@drawable/ic_action_settings_light</item>
         <item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_light</item>
@@ -64,6 +65,7 @@
         <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_dark</item>
         <item name="iconActionRefresh">@drawable/ic_action_refresh_dark</item>
         <item name="iconActionSearch">@drawable/ic_action_search_dark</item>
+        <item name="iconActionSearchFolder">@drawable/action_search_folder_dark</item>
         <item name="iconActionSend">@drawable/ic_action_send_dark</item>
         <item name="iconActionSettings">@drawable/ic_action_settings_dark</item>
         <item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_dark</item>