diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
index feab4282c..7170dee84 100644
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -50,7 +50,7 @@ public class TagSettingsActivity extends InjectingActionBarActivity {
     public static final String TOKEN_NEW_FILTER = "newFilter"; //$NON-NLS-1$
 
     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_DISCARD_ID = R.string.TEA_menu_discard_changes;
 
     public static final int REQUEST_ACTFM_LOGIN = 3;
 
@@ -244,7 +244,7 @@ public class TagSettingsActivity extends InjectingActionBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        MenuItem item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
+        MenuItem item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard_changes);
         item.setIcon(resourceResolver.getResource(R.attr.ic_action_cancel));
         setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
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 1b8d9f103..a27e3832e 100755
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -937,14 +937,16 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-
+        menu.clear();
         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
             menu.findItem(R.id.menu_record_note).setVisible(false);
         }
+        if (preferences.useTabletLayout()) {
+            menu.findItem(R.id.menu_save).setVisible(true);
+        }
     }
 
     @Override
diff --git a/astrid/src/main/res/menu/task_edit_fragment.xml b/astrid/src/main/res/menu/task_edit_fragment.xml
index 088286188..9ecddb58d 100644
--- a/astrid/src/main/res/menu/task_edit_fragment.xml
+++ b/astrid/src/main/res/menu/task_edit_fragment.xml
@@ -2,26 +2,28 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:tasks="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_save"
+        android:title="@string/TEA_menu_save"
+        android:icon="?attr/ic_action_save"
+        android:visible="false"
+        tasks:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_attach"
         android:title="@string/premium_attach_file"
-        tasks:showAsAction="never"/>
+        android:icon="?attr/ic_action_new_attachment"
+        tasks:showAsAction="ifRoom"/>
     <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"/>
+        android:icon="?attr/ic_action_mic"
+        tasks:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_discard"
-        android:title="@string/TEA_menu_discard"
+        android:title="@string/TEA_menu_discard_changes"
         tasks:showAsAction="never"/>
     <item
         android:id="@+id/menu_delete"
         android:title="@string/delete_task"
-        android:icon="?attr/ic_action_discard"
-        tasks:showAsAction="ifRoom"/>
-
+        tasks:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml
index 4c2bf5cbc..6d8048a9b 100644
--- a/astrid/src/main/res/values-ca/strings.xml
+++ b/astrid/src/main/res/values-ca/strings.xml
@@ -112,7 +112,6 @@
 	<string name="TEA_estimatedDuration_label">Quant temps us portarà?</string>
 	<string name="TEA_elapsedDuration_label">Temps que ja s\'ha invertit en la Tasca</string>
 	<string name="TEA_menu_save">Desa els canvis</string>
-	<string name="TEA_menu_discard">No ho desis</string>
 	<string name="TEA_tab_activity">Activitat</string>
 	<string-array name="TEA_urgency">
 		<item>Sense venciment</item>
diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml
index c0b252e75..37a3d3846 100644
--- a/astrid/src/main/res/values-cs/strings.xml
+++ b/astrid/src/main/res/values-cs/strings.xml
@@ -109,7 +109,6 @@
 	<string name="TEA_estimatedDuration_label">Kolik času asi zabere?</string>
 	<string name="TEA_elapsedDuration_label">Jak dlouho už na úkolu pracujete</string>
 	<string name="TEA_menu_save">Uložit změny</string>
-	<string name="TEA_menu_discard">Neukládat</string>
 	<string name="TEA_tab_activity">Činnost</string>
 	<string-array name="TEA_urgency">
 		<item>Bez termínu</item>
diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml
index 34ca4e6fc..6125ef04f 100644
--- a/astrid/src/main/res/values-da/strings.xml
+++ b/astrid/src/main/res/values-da/strings.xml
@@ -88,7 +88,6 @@
 	<string name="TEA_estimatedDuration_label">Hvor lang tid tager det?</string>
 	<string name="TEA_elapsedDuration_label">Tid allerede brugt på denne opgave</string>
 	<string name="TEA_menu_save">Gem ændringer</string>
-	<string name="TEA_menu_discard">Gem ikke</string>
 	<string name="TEA_tab_activity">Aktivitet</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml
index 57234ff98..f065c1e08 100644
--- a/astrid/src/main/res/values-de/strings.xml
+++ b/astrid/src/main/res/values-de/strings.xml
@@ -113,7 +113,6 @@
 	<string name="TEA_estimatedDuration_label">Wie lange wird es dauern?</string>
 	<string name="TEA_elapsedDuration_label">Zeit, die schon für die Aufgabe gebraucht wurde</string>
 	<string name="TEA_menu_save">Änderungen speichern</string>
-	<string name="TEA_menu_discard">Nicht speichern</string>
 	<string name="TEA_tab_activity">Aktivität</string>
 	<string name="TEA_timer_elap">%s verstrichen</string>
 	<string-array name="TEA_urgency">
diff --git a/astrid/src/main/res/values-el/strings.xml b/astrid/src/main/res/values-el/strings.xml
index a658ce226..f657de7d6 100644
--- a/astrid/src/main/res/values-el/strings.xml
+++ b/astrid/src/main/res/values-el/strings.xml
@@ -79,7 +79,6 @@
 	<string name="TEA_estimatedDuration_label">Πόσο θα διαρκέσει?</string>
 	<string name="TEA_elapsedDuration_label">Χρόνος που ήδη πέρασε</string>
 	<string name="TEA_menu_save">Αποθήκευση αλλαγών</string>
-	<string name="TEA_menu_discard">Μη αποθήκευση</string>
 	<string name="TEA_tab_activity">Δραστηριότητα</string>
 	<string name="TEA_timer_est">Εκτιμώμενο %s</string>
 	<string name="TEA_timer_elap">Πέρασε %s</string>
diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml
index e78a41582..29b4403f6 100644
--- a/astrid/src/main/res/values-es/strings.xml
+++ b/astrid/src/main/res/values-es/strings.xml
@@ -119,7 +119,6 @@
 	<string name="TEA_estimatedDuration_label">¿Cuanto tiempo llevará?</string>
 	<string name="TEA_elapsedDuration_label">Tiempo ya empleado en la tarea</string>
 	<string name="TEA_menu_save">Guardar cambios</string>
-	<string name="TEA_menu_discard">No guardar</string>
 	<string name="TEA_tab_activity">Actividad</string>
 	<string name="TEA_timer_est">Estimado %s</string>
 	<string name="TEA_timer_elap">Transcurrido %s</string>
diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml
index 053b06dee..48d38406b 100644
--- a/astrid/src/main/res/values-fr/strings.xml
+++ b/astrid/src/main/res/values-fr/strings.xml
@@ -115,7 +115,6 @@
 	<string name="TEA_estimatedDuration_label">Combien de temps cela va-t-il prendre ?</string>
 	<string name="TEA_elapsedDuration_label">Temps déjà passé sur la tâche</string>
 	<string name="TEA_menu_save">Sauvegarder les modifications</string>
-	<string name="TEA_menu_discard">Ne pas enregistrer</string>
 	<string name="TEA_tab_activity">Activité</string>
 	<string name="TEA_timer_est">Restant %s</string>
 	<string name="TEA_timer_elap">Passé %s</string>
diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml
index 8c91ad3b0..b9b2307cd 100644
--- a/astrid/src/main/res/values-it/strings.xml
+++ b/astrid/src/main/res/values-it/strings.xml
@@ -107,7 +107,6 @@
 	<string name="TEA_estimatedDuration_label">Quanto tempo impiegherà?</string>
 	<string name="TEA_elapsedDuration_label">Tempo già speso per l\'attività</string>
 	<string name="TEA_menu_save">Salva le modifiche</string>
-	<string name="TEA_menu_discard">Non salvare</string>
 	<string name="TEA_tab_activity">Attività</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml
index 1b0190771..edd1b04be 100644
--- a/astrid/src/main/res/values-iw/strings.xml
+++ b/astrid/src/main/res/values-iw/strings.xml
@@ -118,7 +118,6 @@
 	<string name="TEA_estimatedDuration_label">כמה זמן תיקח המשימה?</string>
 	<string name="TEA_elapsedDuration_label">זמן שכבר הושקע במשימה</string>
 	<string name="TEA_menu_save">שמירת השינויים</string>
-	<string name="TEA_menu_discard">לא לשמור</string>
 	<string name="TEA_tab_activity">פעילות</string>
 	<string name="TEA_timer_elap">זמן שעבר %s</string>
 	<string-array name="TEA_urgency">
diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml
index be828192a..d84492caa 100644
--- a/astrid/src/main/res/values-ja/strings.xml
+++ b/astrid/src/main/res/values-ja/strings.xml
@@ -94,7 +94,6 @@
 	<string name="TEA_estimatedDuration_label">所要時間は?</string>
 	<string name="TEA_elapsedDuration_label">既にタスクに費やした時間</string>
 	<string name="TEA_menu_save">変更の保存</string>
-	<string name="TEA_menu_discard">保存しない</string>
 	<string name="TEA_tab_activity">活動</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml
index 3f6b5b23b..26e0284f2 100644
--- a/astrid/src/main/res/values-ko/strings.xml
+++ b/astrid/src/main/res/values-ko/strings.xml
@@ -121,7 +121,6 @@
 	<string name="TEA_estimatedDuration_label">일정 완료 예상 시간은?</string>
 	<string name="TEA_elapsedDuration_label">일정에 이미 소모한 시간</string>
 	<string name="TEA_menu_save">변경사항 저장</string>
-	<string name="TEA_menu_discard">저장하지 않음</string>
 	<string name="TEA_tab_activity">활동 내역</string>
 	<string name="TEA_timer_est">동부표준시 %s</string>
 	<string name="TEA_timer_elap">경과 시간: %s</string>
diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml
index 55f4a632d..8e79aa0c1 100644
--- a/astrid/src/main/res/values-nb/strings.xml
+++ b/astrid/src/main/res/values-nb/strings.xml
@@ -72,7 +72,6 @@
 	<string name="TEA_estimatedDuration_label">Hvor lang tid vil det ta?</string>
 	<string name="TEA_elapsedDuration_label">Tid brukt på oppgaven til nå</string>
 	<string name="TEA_menu_save">Lagre endringer</string>
-	<string name="TEA_menu_discard">Ikke lagre</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
 		<item>Specific day</item>
diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml
index 400b26406..3ef342806 100644
--- a/astrid/src/main/res/values-nl/strings.xml
+++ b/astrid/src/main/res/values-nl/strings.xml
@@ -117,7 +117,6 @@
 	<string name="TEA_estimatedDuration_label">Tijdsduur</string>
 	<string name="TEA_elapsedDuration_label">Bestede tijd tot nu toe</string>
 	<string name="TEA_menu_save">Wijzigingen opslaan</string>
-	<string name="TEA_menu_discard">Niet opslaan</string>
 	<string name="TEA_tab_activity">Activiteit</string>
 	<string name="TEA_timer_est">Gesch. %s</string>
 	<string name="TEA_timer_elap">Verstreken %s</string>
diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml
index 369aaab32..9fa01e0a0 100644
--- a/astrid/src/main/res/values-pl/strings.xml
+++ b/astrid/src/main/res/values-pl/strings.xml
@@ -112,7 +112,6 @@
 	<string name="TEA_estimatedDuration_label">Jak długo to zajmie?</string>
 	<string name="TEA_elapsedDuration_label">Czas dotychczas spędzony nad tym zadaniem</string>
 	<string name="TEA_menu_save">Zapisz zmiany</string>
-	<string name="TEA_menu_discard">Nie zapisuj</string>
 	<string name="TEA_tab_activity">Aktywność</string>
 	<string-array name="TEA_urgency">
 		<item>Brak daty</item>
diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml
index 38f5ea2e2..93deff6b6 100644
--- a/astrid/src/main/res/values-pt-rBR/strings.xml
+++ b/astrid/src/main/res/values-pt-rBR/strings.xml
@@ -115,7 +115,6 @@
 	<string name="TEA_estimatedDuration_label">Quanto tempo isto vai levar?</string>
 	<string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
 	<string name="TEA_menu_save">Salvar alterações</string>
-	<string name="TEA_menu_discard">Não salvar</string>
 	<string name="TEA_tab_activity">Atividades</string>
 	<string name="TEA_timer_elap">Decorrido %s</string>
 	<string-array name="TEA_urgency">
diff --git a/astrid/src/main/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml
index 65c569ed0..d6fa03897 100644
--- a/astrid/src/main/res/values-pt/strings.xml
+++ b/astrid/src/main/res/values-pt/strings.xml
@@ -80,7 +80,6 @@
 	<string name="TEA_estimatedDuration_label">Quanto tempo irá durar?</string>
 	<string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
 	<string name="TEA_menu_save">Guardar Alterações</string>
-	<string name="TEA_menu_discard">Não Gravar</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
 		<item>Specific day</item>
diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml
index a8260646b..ebb7fe244 100644
--- a/astrid/src/main/res/values-ru/strings.xml
+++ b/astrid/src/main/res/values-ru/strings.xml
@@ -119,7 +119,6 @@
 	<string name="TEA_estimatedDuration_label">Как долго это продлится?</string>
 	<string name="TEA_elapsedDuration_label">Время уже потраченное на задачу</string>
 	<string name="TEA_menu_save">Сохранить изменения</string>
-	<string name="TEA_menu_discard">Не сохранять</string>
 	<string name="TEA_tab_activity">Действия</string>
 	<string name="TEA_timer_est">Ост. %s</string>
 	<string name="TEA_timer_elap">Прошло %s</string>
diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/astrid/src/main/res/values-sl-rSI/strings.xml
index 1afb738e5..3f3b96f4e 100644
--- a/astrid/src/main/res/values-sl-rSI/strings.xml
+++ b/astrid/src/main/res/values-sl-rSI/strings.xml
@@ -121,7 +121,6 @@
 	<string name="TEA_estimatedDuration_label">Kako dolgo bo trajalo?</string>
 	<string name="TEA_elapsedDuration_label">Porabljen čas</string>
 	<string name="TEA_menu_save">Shrani spremembe</string>
-	<string name="TEA_menu_discard">Ne shrani</string>
 	<string name="TEA_tab_activity">Dejavnost</string>
 	<string name="TEA_timer_est">Cca. %s</string>
 	<string name="TEA_timer_elap">%s je potekel</string>
diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml
index de496b3a8..010320969 100644
--- a/astrid/src/main/res/values-sv/strings.xml
+++ b/astrid/src/main/res/values-sv/strings.xml
@@ -114,7 +114,6 @@
 	<string name="TEA_estimatedDuration_label">Hur lång tid kommer det att ta?</string>
 	<string name="TEA_elapsedDuration_label">Tid redan spenderad på uppgiften</string>
 	<string name="TEA_menu_save">Spara ändringar</string>
-	<string name="TEA_menu_discard">Spara inte</string>
 	<string name="TEA_tab_activity">Aktivitet</string>
 	<string name="TEA_timer_est">Ung. %s</string>
 	<string name="TEA_timer_elap">Förfluten %s</string>
diff --git a/astrid/src/main/res/values-th/strings.xml b/astrid/src/main/res/values-th/strings.xml
index 32da9133e..58592b6c6 100644
--- a/astrid/src/main/res/values-th/strings.xml
+++ b/astrid/src/main/res/values-th/strings.xml
@@ -52,7 +52,6 @@
 	<string name="TEA_importance_label">ความสำคัญ</string>
 	<string name="TEA_note_label">บันทึกย่อ</string>
 	<string name="TEA_menu_save">บันทึกการเปลี่ยนแปลง</string>
-	<string name="TEA_menu_discard">ไม่บันทึก</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
 		<item>Specific day</item>
diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml
index 15f6d6831..a0ace9423 100644
--- a/astrid/src/main/res/values-tr/strings.xml
+++ b/astrid/src/main/res/values-tr/strings.xml
@@ -105,7 +105,6 @@
 	<string name="TEA_estimatedDuration_label">Ne kadar sürecek?</string>
 	<string name="TEA_elapsedDuration_label">Görev üzerinde çalışılan zaman</string>
 	<string name="TEA_menu_save">Değişiklikleri Kaydet</string>
-	<string name="TEA_menu_discard">Kaydetme</string>
 	<string name="TEA_tab_activity">Etkinlik</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml
index e8a625283..d3f6bd9a4 100644
--- a/astrid/src/main/res/values-uk/strings.xml
+++ b/astrid/src/main/res/values-uk/strings.xml
@@ -121,7 +121,6 @@
 	<string name="TEA_estimatedDuration_label">Як довго це триватиме?</string>
 	<string name="TEA_elapsedDuration_label">Час вже потрачео</string>
 	<string name="TEA_menu_save">Зберегти зміни</string>
-	<string name="TEA_menu_discard">Не зберігати зміни</string>
 	<string name="TEA_tab_activity">Активність</string>
 	<string name="TEA_timer_est">Зал. %s</string>
 	<string name="TEA_timer_elap">Час, що минув %s</string>
diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml
index b00a9126e..c17a9197c 100644
--- a/astrid/src/main/res/values-zh-rCN/strings.xml
+++ b/astrid/src/main/res/values-zh-rCN/strings.xml
@@ -108,7 +108,6 @@
 	<string name="TEA_estimatedDuration_label">要花多久时间?</string>
 	<string name="TEA_elapsedDuration_label">已用于任务的时间</string>
 	<string name="TEA_menu_save">保存更改</string>
-	<string name="TEA_menu_discard">不保存</string>
 	<string name="TEA_tab_activity">活动</string>
 	<string-array name="TEA_urgency">
 		<item>No date</item>
diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml
index 74615b302..db867d005 100644
--- a/astrid/src/main/res/values-zh-rTW/strings.xml
+++ b/astrid/src/main/res/values-zh-rTW/strings.xml
@@ -117,7 +117,6 @@
 	<string name="TEA_estimatedDuration_label">要花多久時間?</string>
 	<string name="TEA_elapsedDuration_label">已經用掉的時間</string>
 	<string name="TEA_menu_save">儲存變更</string>
-	<string name="TEA_menu_discard">不要儲存</string>
 	<string name="TEA_tab_activity">活動</string>
 	<string name="TEA_timer_elap">已經過 %s</string>
 	<string-array name="TEA_urgency">
diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml
index d52cdbbac..e14dd1b21 100644
--- a/astrid/src/main/res/values/strings-core.xml
+++ b/astrid/src/main/res/values/strings-core.xml
@@ -240,7 +240,7 @@
   <string name="TEA_menu_save">Save Changes</string>
   
   <!-- Menu: Don't Save -->
-  <string name="TEA_menu_discard">Don\'t Save</string>
+  <string name="TEA_menu_discard_changes">Discard changes</string>
   
   <!-- slide 15b: Task edit tab: activity -->
   <string name="TEA_tab_activity">Activity</string>