diff --git a/astrid/res/layout/control_set_notes_display.xml b/astrid/res/layout/control_set_notes_display.xml
index 4804c3dad..c0d93f09e 100644
--- a/astrid/res/layout/control_set_notes_display.xml
+++ b/astrid/res/layout/control_set_notes_display.xml
@@ -34,7 +34,7 @@
             android:id="@+id/display_row_edit"
             style="@style/TextAppearance.EditRowDisplay"
             android:layout_width="fill_parent"
-            android:paddingBottom="4dip"
+            android:paddingBottom="10dip"
             android:layout_height="wrap_content"
             android:gravity="left" />
     </LinearLayout>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 127638102..c73f4feb7 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -272,6 +272,10 @@
   
   <string name="p_fullTaskTitle">fullTaskTitle</string>
   
+  <string name="p_edit_screen">p_edit_screen</string>
+  
+  <string name="p_time_increment">p_time_increment</string>
+  
   <!-- Configurations -->
   <string name="p_configurations">p_configurations</string>
   <string name="p_config_default">p_config_default</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 011f23857..e1f973fde 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -663,11 +663,17 @@
   
   <!-- slide 34c: Preference: Task List Show Notes -->
   <string name="EPr_showNotes_title">Show description in task</string>
+  
+  <!-- Edit screen preference category -->
+  <string name="EPr_edit_screen_options">Edit screen options</string>
+  
   <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Task edit screen</string>
+  <string name="EPr_beastMode_title">Edit screen order</string>
   
   <string name="EPr_beastMode_shortcut">Customize</string>
   
+  <string name="EPr_time_increment">5 minute increments</string>
+  
   <!-- slide 35h -->
   <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
   <!-- slide 35j -->
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 4adfd5870..7981c158f 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -181,6 +181,13 @@
 	    <item name="android:backgroundDimEnabled">false</item>
 	    <item name="android:windowIsFloating">true</item>
 	</style>
+	
+    <style name="SaveAsBack">
+        <item name="abLogo">@drawable/ic_menu_save</item>
+    </style>
+    <style name="SaveAsBackWhite">
+        <item name="abLogo">@drawable/ic_menu_save_blue_alt</item>
+    </style>
     
     <style name="Theme.Dialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowBackground">@null</item>
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index 686de6a15..54936a70f 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -65,8 +65,28 @@
         
         </PreferenceScreen>
         
-        <PreferenceScreen android:title="@string/EPr_beastMode_title" 
-            android:key="@string/p_beastMode"/>
+        <PreferenceScreen android:title="@string/EPr_edit_screen_options" 
+                android:key="@string/p_edit_screen">
+	        
+	        <PreferenceScreen android:title="@string/EPr_beastMode_title" 
+	            android:key="@string/p_beastMode"/>
+	            
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_show_task_edit_comments"
+	            android:title="@string/EPr_show_task_edit_comments"
+	            android:defaultValue="true"/>
+	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                android:key="@string/p_time_increment"
+                android:title="@string/EPr_time_increment"
+                android:defaultValue="true"/>
+	            
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_autoIdea"
+	            android:title="@string/EPr_ideaAuto_title"
+	            android:defaultValue="true" />
+            
+        </PreferenceScreen>
         
         <PreferenceScreen android:title="@string/EPr_list_view" android:key="@string/p_list_view">
             <PreferenceScreen android:title="@string/EPr_menu_items" android:key="@string/p_menu_items">
@@ -161,21 +181,11 @@
             android:key="@string/p_showSmartConfirmation_key"
             android:title="@string/EPr_showSmartConfirmation_title"
             android:defaultValue="true"/>
-
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	        android:key="@string/p_autoIdea"
-	        android:title="@string/EPr_ideaAuto_title"
-	        android:defaultValue="true" />
         
         <CheckBoxPreference
 	        android:title="@string/EPr_force_phone_layout"
 	        android:key="@string/p_force_phone_layout"
 	        android:defaultValue="false"/>
-
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_show_task_edit_comments"
-            android:title="@string/EPr_show_task_edit_comments"
-            android:defaultValue="true"/>
         
         <CheckBoxPreference
 	        android:key="@string/p_use_contact_picker"
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index e9630092b..e481379a3 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -215,8 +215,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
             }
         });
 
-        PreferenceScreen appearance = (PreferenceScreen) screen.getPreference(APPEARANCE_PREFERENCE);
-        Preference beastMode = appearance.getPreference(3);
+        Preference beastMode = findPreference(getString(R.string.p_beastMode));
         beastMode.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference p) {
@@ -242,6 +241,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
         disablePremiumPrefs();
 
+        PreferenceScreen appearance = (PreferenceScreen) screen.getPreference(APPEARANCE_PREFERENCE);
         if (!AndroidUtilities.isTabletSized(this)) {
             appearance.removePreference(screen.findPreference(getString(R.string.p_force_phone_layout)));
         } else {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index fc496ebb8..e2a003f13 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -23,7 +23,12 @@ public class TaskEditActivity extends AstridActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
         ThemeService.applyTheme(this);
-		super.onCreate(savedInstanceState);
+        if (ThemeService.getUnsimplifiedTheme() == R.style.Theme_White_Alt)
+            getTheme().applyStyle(R.style.SaveAsBackWhite, true);
+        else
+            getTheme().applyStyle(R.style.SaveAsBack, true);
+
+        super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_edit_wrapper_activity);
 
 		ActionBar actionBar = getSupportActionBar();
@@ -33,6 +38,7 @@ public class TaskEditActivity extends AstridActivity {
 		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setCustomView(R.layout.header_title_view);
 		((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask);
+
 	}
 
 	public void updateTitle(boolean isNewTask) {
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 93f7423fa..5a9a4edb0 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -1239,9 +1239,11 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close));
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
-        item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-        item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save));
-        item.setShowAsAction(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(ThemeService.getDrawable(R.drawable.ic_menu_save));
+            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        }
 
         boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null;
         if(wouldShowComments && showEditComments) {
diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
index 38c50d261..3dec1510e 100644
--- a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
@@ -21,6 +21,7 @@ import android.widget.ToggleButton;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.andlib.utility.Preferences;
 
 public class AstridTimePicker extends LinearLayout {
 
@@ -51,6 +52,11 @@ public class AstridTimePicker extends LinearLayout {
         hours = (NumberPicker) findViewById(R.id.hours);
         minutes = (NumberPicker) findViewById(R.id.minutes);
 
+        if (Preferences.getBoolean(R.string.p_time_increment, false))
+            minutes.setIncrementBy(5);
+        else
+            minutes.setIncrementBy(1);
+
         setupButtonBackgrounds(context);
 
         initialize(context);