diff --git a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java
index a522c1ecf..9683fb897 100644
--- a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java
@@ -175,14 +175,6 @@ public class ThemeService {
             return R.drawable.ic_action_cancel_light;
         case R.drawable.ic_action_new_attachment:
             return R.drawable.ic_action_new_attachment_light;
-        case R.drawable.ic_action_gear:
-            return R.drawable.ic_action_gear_light;
-        case R.drawable.icn_menu_refresh:
-            return R.drawable.icn_menu_refresh_dark;
-        case R.drawable.icn_menu_filters:
-            return R.drawable.icn_menu_filters_dark;
-        case R.drawable.icn_menu_sort_by_size:
-            return R.drawable.icn_menu_sort_by_size_dark;
         case R.drawable.filter_calendar:
             return R.drawable.filter_calendar_dark;
         case R.drawable.filter_inbox:
diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java
index 9330cc084..e4722a6a1 100644
--- a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java
+++ b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java
@@ -15,9 +15,7 @@ import android.speech.SpeechRecognizer;
 import android.support.v4.app.Fragment;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.Toast;
 
-import com.todoroo.aacenc.ContextManager;
 import com.todoroo.aacenc.RecognizerApi;
 import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener;
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -26,7 +24,6 @@ import com.todoroo.astrid.utility.Constants;
 
 import org.tasks.R;
 
-import java.io.IOException;
 import java.util.List;
 
 @TargetApi(8)
@@ -115,15 +112,4 @@ public class VoiceRecognizer {
             instance.recognizerApi.cancel();
         }
     }
-
-    public void convert(String filePath) {
-        if (instance != null && instance.recognizerApi != null) {
-            try {
-                instance.recognizerApi.convert(filePath);
-            } catch (IOException e) {
-                Toast.makeText(ContextManager.getContext(), R.string.audio_err_encoding,
-                        Toast.LENGTH_LONG).show();
-            }
-        }
-    }
 }
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_gear.png b/astrid/src/main/res/drawable-hdpi/ic_action_gear.png
deleted file mode 100644
index 23471f478..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_gear.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_gear_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_gear_light.png
deleted file mode 100644
index 64eb6cbb2..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_gear_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/icn_menu_filters.png b/astrid/src/main/res/drawable-hdpi/icn_menu_filters.png
deleted file mode 100644
index 6accc51aa..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/icn_menu_filters.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/icn_menu_filters_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_filters_dark.png
deleted file mode 100644
index 7be576f62..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/icn_menu_filters_dark.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size.png b/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size.png
deleted file mode 100644
index e9403c60e..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size_dark.png b/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size_dark.png
deleted file mode 100644
index 3d700cee4..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/icn_menu_sort_by_size_dark.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_gear.png b/astrid/src/main/res/drawable-xhdpi/ic_action_gear.png
deleted file mode 100644
index 3be1a7821..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_gear.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_gear_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_gear_light.png
deleted file mode 100644
index cf3196465..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_gear_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png
deleted file mode 100644
index e00cd92c1..000000000
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_gear_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_gear_light.png
deleted file mode 100644
index 27ad973e5..000000000
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_gear_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/ic_action_gear.png b/astrid/src/main/res/drawable/ic_action_gear.png
deleted file mode 100644
index 46cad2641..000000000
Binary files a/astrid/src/main/res/drawable/ic_action_gear.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/ic_action_gear_light.png b/astrid/src/main/res/drawable/ic_action_gear_light.png
deleted file mode 100644
index b3c11924d..000000000
Binary files a/astrid/src/main/res/drawable/ic_action_gear_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_menu_filters.png b/astrid/src/main/res/drawable/icn_menu_filters.png
deleted file mode 100644
index c2dea8afd..000000000
Binary files a/astrid/src/main/res/drawable/icn_menu_filters.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_menu_filters_dark.png b/astrid/src/main/res/drawable/icn_menu_filters_dark.png
deleted file mode 100644
index f3dd28c4a..000000000
Binary files a/astrid/src/main/res/drawable/icn_menu_filters_dark.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_menu_sort_by_size.png b/astrid/src/main/res/drawable/icn_menu_sort_by_size.png
deleted file mode 100644
index 4148f1eae..000000000
Binary files a/astrid/src/main/res/drawable/icn_menu_sort_by_size.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_menu_sort_by_size_dark.png b/astrid/src/main/res/drawable/icn_menu_sort_by_size_dark.png
deleted file mode 100644
index a2b5776b7..000000000
Binary files a/astrid/src/main/res/drawable/icn_menu_sort_by_size_dark.png and /dev/null differ
diff --git a/astrid/src/main/res/menu/task_list_activity.xml b/astrid/src/main/res/menu/task_list_activity.xml
index 95d1a123c..4578ca028 100644
--- a/astrid/src/main/res/menu/task_list_activity.xml
+++ b/astrid/src/main/res/menu/task_list_activity.xml
@@ -1,52 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tasks="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_search"
-        android:showAsAction="ifRoom"
         android:title="@string/TLA_menu_search"
-        android:icon="?attr/ic_action_search"/>
+        android:icon="?attr/ic_action_search"
+        tasks:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_delete_list"
-        android:showAsAction="never"
         android:title="@string/tag_cm_delete"
-        android:icon="?attr/ic_action_discard"
-        android:visible="false"/>
+        android:visible="false"
+        tasks:showAsAction="never" />
     <item
         android:id="@+id/menu_rename_list"
-        android:showAsAction="never"
         android:title="@string/tag_cm_rename"
         android:icon="@drawable/filter_pencil"
-        android:visible="false"/>
+        android:visible="false"
+        tasks:showAsAction="never" />
     <item
         android:id="@+id/menu_sort"
-        android:showAsAction="never"
         android:title="@string/TLA_menu_sort"
-        android:icon="@drawable/icn_menu_sort_by_size"/>
+        tasks:showAsAction="never" />
     <item
         android:id="@+id/menu_sync"
-        android:showAsAction="never"
         android:title="@string/TLA_menu_sync"
-        android:icon="@drawable/icn_menu_refresh"/>
+        tasks:showAsAction="never" />
     <item
         android:id="@+id/menu_clear_completed"
-        android:showAsAction="never"
         android:title="@string/gtasks_GTA_clear_completed"
-        android:icon="@android:drawable/ic_input_delete"
-        android:visible="false"/>
+        android:visible="false"
+        tasks:showAsAction="never" />
     <item
         android:id="@+id/menu_new_list"
-        android:showAsAction="never"
         android:title="@string/FLA_new_list"
-        android:icon="?attr/ic_action_new"/>
+        tasks:showAsAction="never" />
     <item
         android:id="@+id/menu_new_filter"
-        android:showAsAction="never"
         android:title="@string/FLA_new_filter"
-        android:icon="@drawable/icn_menu_filters"/>
+        tasks:showAsAction="never" />
     <item
         android:id="@+id/menu_settings"
-        android:showAsAction="never"
         android:title="@string/TLA_menu_settings"
-        android:icon="?attr/ic_action_gear" />
+        tasks:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/astrid/src/main/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml
index f23e0b373..688f155cc 100644
--- a/astrid/src/main/res/values/attrs.xml
+++ b/astrid/src/main/res/values/attrs.xml
@@ -27,12 +27,10 @@
   <attr name="asQuickaddBackgroundColor" format="color" />
   <attr name="asFilterSelectedIcon" format="reference"/>
   <attr name="asTaskRowSelector" format="reference" />
-    <attr name="ic_action_gear" format="reference"/>
     <attr name="ic_action_camera" format="reference"/>
     <attr name="ic_action_new" format="reference"/>
     <attr name="ic_action_mic" format="reference" />
     <attr name="ic_action_search" format="reference"/>
-    <attr name="ic_action_discard" format="reference"/>
     <attr name="ic_drawer" format="reference"/>
     <attr name="drawer_background" format="color"/>
     <attr name="drawer_text" format="color"/>
diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml
index b9722a974..0ff410f4e 100644
--- a/astrid/src/main/res/values/styles.xml
+++ b/astrid/src/main/res/values/styles.xml
@@ -30,12 +30,10 @@
         <item name="asTaskRowSelector">@drawable/task_row_bg_dark</item>
         <item name="asHeaderTextColor">?attr/asThemeTextColor</item>
         <item name="asHeaderTextColorInverse">?attr/asAbBackgroundColor</item>
-        <item name="ic_action_gear">@drawable/ic_action_gear_light</item>
         <item name="ic_action_camera">@drawable/ic_action_camera_light</item>
         <item name="ic_action_mic">@drawable/ic_action_mic_light</item>
         <item name="ic_action_new">@drawable/ic_action_new_light</item>
         <item name="ic_action_search">@drawable/ic_action_search_light</item>
-        <item name="ic_action_discard">@drawable/ic_action_discard_light</item>
         <item name="ic_drawer">@drawable/ic_drawer_light</item>
         <item name="drawer_background">#303030</item>
         <item name="drawer_text">#ffffff</item>
@@ -74,12 +72,10 @@
         <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asAbBackgroundColor">#e9e9e9</item>
-        <item name="ic_action_gear">@drawable/ic_action_gear</item>
         <item name="ic_action_camera">@drawable/ic_action_camera</item>
         <item name="ic_action_mic">@drawable/ic_action_mic</item>
         <item name="ic_action_new">@drawable/ic_action_new</item>
         <item name="ic_action_search">@drawable/ic_action_search</item>
-        <item name="ic_action_discard">@drawable/ic_action_discard</item>
         <item name="ic_drawer">@drawable/ic_drawer</item>
         <item name="drawer_background">#efefef</item>
         <item name="drawer_text">#000</item>