diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 60722d5b9..eb3560a34 100755
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -88,7 +88,6 @@ import org.tasks.R;
 import org.tasks.injection.InjectingFragment;
 import org.tasks.notifications.NotificationManager;
 import org.tasks.preferences.ActivityPreferences;
-import org.tasks.preferences.ResourceResolver;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -100,8 +99,6 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import javax.inject.Inject;
 
-import static android.support.v4.view.MenuItemCompat.setShowAsAction;
-
 /**
  * This activity is responsible for creating new tasks and editing existing
  * ones. It saves a task when it is paused (screen rotated, back button pressed)
@@ -154,14 +151,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     public static final int REQUEST_CODE_ATTACH_FILE = 40;
     public static final int REQUEST_CODE_BEAST_MODE = 50;
 
-    // --- menu codes
-
-    private static final int MENU_SAVE_ID = R.string.TEA_menu_save;
-    private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
-    private static final int MENU_ATTACH_ID = R.string.premium_attach_file;
-    private static final int MENU_RECORD_ID = R.string.premium_record_audio;
-    private static final int MENU_DELETE_TASK_ID = R.string.delete_task;
-
     // --- result codes
 
     public static final String OVERRIDE_FINISH_ANIM = "finishAnim"; //$NON-NLS-1$
@@ -184,7 +173,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     @Inject GCalHelper gcalHelper;
     @Inject ActivityPreferences preferences;
     @Inject DateChangedAlerts dateChangedAlerts;
-    @Inject ResourceResolver resourceResolver;
 
     // --- UI components
 
@@ -922,19 +910,19 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-        case MENU_SAVE_ID:
+        case R.id.menu_save:
             saveButtonClick();
             return true;
-        case MENU_DISCARD_ID:
+        case R.id.menu_discard:
             discardButtonClick();
             return true;
-        case MENU_ATTACH_ID:
+        case R.id.menu_attach:
             startAttachFile();
             return true;
-        case MENU_RECORD_ID:
+        case R.id.menu_record_note:
             startRecordingAudio();
             return true;
-        case MENU_DELETE_TASK_ID:
+        case R.id.menu_delete:
             deleteButtonClick();
             return true;
         case android.R.id.home:
@@ -953,39 +941,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        MenuItem item;
 
-        item = menu.add(Menu.NONE, MENU_ATTACH_ID, 0, R.string.premium_attach_file);
-        item.setIcon(resourceResolver.getResource(R.attr.ic_action_new_attachment));
-
-        setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1) {
+        inflater.inflate(R.menu.task_edit_fragment, menu);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD_MR1) {
             // media recorder aac support requires api level 10
             // approximately 1% of current installs are using api level 7-9
-            item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio);
-            item.setIcon(resourceResolver.getResource(R.attr.ic_action_mic));
-            setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS);
-        }
-
-        item = menu.add(Menu.NONE, MENU_DELETE_TASK_ID, 0, R.string.delete_task);
-        item.setIcon(resourceResolver.getResource(R.attr.ic_action_discard));
-        setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS);
-
-        boolean useSaveAndCancel = preferences.getBoolean(R.string.p_save_and_cancel, false);
-
-        if (useSaveAndCancel || preferences.useTabletLayout()) {
-            if (useSaveAndCancel) {
-                item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
-                item.setIcon(resourceResolver.getResource(R.attr.ic_action_cancel));
-                setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS);
-            }
-
-            if (!(getActivity() instanceof TaskEditActivity)) {
-                item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-                item.setIcon(resourceResolver.getResource(R.attr.ic_action_save));
-                setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS);
-            }
+            menu.findItem(R.id.menu_record_note).setVisible(false);
         }
     }
 
diff --git a/astrid/src/main/res/drawable/filter_pencil.png b/astrid/src/main/res/drawable/filter_pencil.png
deleted file mode 100644
index cba9d1c10..000000000
Binary files a/astrid/src/main/res/drawable/filter_pencil.png and /dev/null differ
diff --git a/astrid/src/main/res/menu/task_edit_fragment.xml b/astrid/src/main/res/menu/task_edit_fragment.xml
new file mode 100644
index 000000000..088286188
--- /dev/null
+++ b/astrid/src/main/res/menu/task_edit_fragment.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:tasks="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_attach"
+        android:title="@string/premium_attach_file"
+        tasks:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_record_note"
+        android:title="@string/premium_record_audio"
+        tasks:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_save"
+        android:title="@string/TEA_menu_save"
+        tasks:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_discard"
+        android:title="@string/TEA_menu_discard"
+        tasks:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_delete"
+        android:title="@string/delete_task"
+        android:icon="?attr/ic_action_discard"
+        tasks:showAsAction="ifRoom"/>
+
+</menu>
\ No newline at end of file
diff --git a/astrid/src/main/res/menu/task_list_activity.xml b/astrid/src/main/res/menu/task_list_activity.xml
index 1cd733fe8..2070a6b9e 100644
--- a/astrid/src/main/res/menu/task_list_activity.xml
+++ b/astrid/src/main/res/menu/task_list_activity.xml
@@ -15,7 +15,6 @@
     <item
         android:id="@+id/menu_rename_list"
         android:title="@string/tag_cm_rename"
-        android:icon="@drawable/filter_pencil"
         android:visible="false"
         tasks:showAsAction="never" />
     <item