diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 10343e17a..771dce085 100755
--- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -362,6 +362,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         GCalControlSet gcalControl = new GCalControlSet(preferences, gcalHelper, getActivity());
 
+        controlSetMap.put(getString(R.string.TEA_ctrl_repeat_pref), repeatControls);
+
         // The deadline control set contains the repeat controls and the
         // calendar controls.
         // NOTE: we add the gcalControl AFTER the
@@ -369,10 +371,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         // otherwise the correct date may not be written to the calendar event.
         // Order matters!
         DeadlineControlSet deadlineControl = new DeadlineControlSet(
-                preferences, getActivity(), R.layout.control_set_deadline, repeatControls,
-                repeatControls.getDisplayView(), gcalControl.getDisplayView());
-        controlSetMap.put(getString(R.string.TEA_ctrl_when_pref),
-                deadlineControl);
+                preferences, getActivity(), R.layout.control_set_deadline, gcalControl.getDisplayView());
+        controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl);
         controls.add(repeatControls);
         repeatControls.addListener(editTitle);
         controls.add(deadlineControl);
@@ -385,7 +385,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 importanceControl);
 
         DescriptionControlSet notesControlSet = new DescriptionControlSet(getActivity());
-        EditText notesEditText = (EditText) notesControlSet.getView().findViewById(R.id.notes);
         controls.add(notesControlSet);
         controlSetMap.put(getString(R.string.TEA_ctrl_notes_pref),
                 notesControlSet);
diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index 49856f43b..824f66ce2 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -17,7 +17,6 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -379,50 +378,26 @@ public class RepeatControlSet extends PopupControlSet {
         }
     }
 
-    public boolean isRecurrenceSet() {
-        return doRepeat;
-    }
-
-    /**
-     * @return the recurrence display string if set, null
-     * if not set
-     */
-    public String getStringForExternalDisplay() {
-        if (isRecurrenceSet()) {
-            return getRepeatString(false);
-        }
-        return null;
-    }
-
     @Override
     protected void refreshDisplayView() {
         TextView repeatDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-        ImageView repeatImage = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
         if (doRepeat) {
-            repeatDisplay.setText(getRepeatString(true));
+            repeatDisplay.setText(getRepeatString());
             repeatDisplay.setTextColor(themeColor);
-            repeatImage.setImageResource(R.drawable.tea_icn_repeat);
-
         } else {
             repeatDisplay.setTextColor(unsetColor);
             repeatDisplay.setText(R.string.repeat_never);
-            repeatImage.setImageResource(R.drawable.tea_icn_repeat_gray);
         }
     }
 
-    private String getRepeatString(boolean useAbbrev) {
-        int arrayResource;
-        if (useAbbrev) {
-            arrayResource = R.array.repeat_interval_short;
-        } else {
-            arrayResource = R.array.repeat_interval;
-        }
+    private String getRepeatString() {
+        int arrayResource = R.array.repeat_interval;
 
         String[] dates = activity.getResources().getStringArray(
                     arrayResource);
         String date = String.format("%s %s", repeatValue, dates[intervalValue]); //$NON-NLS-1$
         if (repeatUntilValue > 0) {
-            return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, useAbbrev, useAbbrev));
+            return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, false, false));
         } else {
             return activity.getString(R.string.repeat_detail_duedate, date); // Every freq int
         }
diff --git a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java
index 5afd5144f..a09a48fce 100644
--- a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java
@@ -20,7 +20,6 @@ import android.widget.TextView;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.repeats.RepeatControlSet;
 
 import org.tasks.R;
 import org.tasks.preferences.ActivityPreferences;
@@ -28,14 +27,12 @@ import org.tasks.preferences.ActivityPreferences;
 public class DeadlineControlSet extends PopupControlSet {
 
     private DateAndTimePicker dateAndTimePicker;
-    private final View[] extraViews;
-    private final RepeatControlSet repeatControlSet;
+    private final View extraView;
 
     public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int displayViewLayout,
-            RepeatControlSet repeatControlSet, View...extraViews) {
+            View extraViews) {
         super(preferences, activity, R.layout.control_set_deadline_dialog, displayViewLayout, 0);
-        this.extraViews = extraViews;
-        this.repeatControlSet = repeatControlSet;
+        this.extraView = extraViews;
     }
 
     @Override
@@ -50,13 +47,6 @@ public class DeadlineControlSet extends PopupControlSet {
             displayString.append(DateAndTimePicker.getDisplayString(activity, model.getDueDate(), false, false));
         }
 
-        if (repeatControlSet != null) {
-            String repeatString = repeatControlSet.getStringForExternalDisplay();
-            if (!TextUtils.isEmpty(repeatString)) {
-                displayString.append("\n"); //$NON-NLS-1$
-                displayString.append(repeatString);
-            }
-        }
         TextView dateDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
         if (TextUtils.isEmpty(displayString)) {
             dateDisplay.setText(R.string.TEA_deadline_hint);
@@ -75,9 +65,9 @@ public class DeadlineControlSet extends PopupControlSet {
     protected void afterInflate() {
         dateAndTimePicker = (DateAndTimePicker) getView().findViewById(R.id.date_and_time);
         LinearLayout extras = (LinearLayout) getView().findViewById(R.id.datetime_extras);
-        for (View v : extraViews) {
+        if (extraView != null) {
             LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f);
-            extras.addView(v, lp);
+            extras.addView(extraView, lp);
         }
 
         LinearLayout body = (LinearLayout) getView().findViewById(R.id.datetime_body);
diff --git a/src/main/res/drawable-hdpi/ic_action_reload.png b/src/main/res/drawable-hdpi/ic_action_reload.png
new file mode 100644
index 000000000..e21f314c7
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_reload.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_reload_white.png b/src/main/res/drawable-hdpi/ic_action_reload_white.png
new file mode 100644
index 000000000..b42c47e09
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_reload_white.png differ
diff --git a/src/main/res/drawable-hdpi/tea_icn_repeat.png b/src/main/res/drawable-hdpi/tea_icn_repeat.png
deleted file mode 100644
index eef47c95a..000000000
Binary files a/src/main/res/drawable-hdpi/tea_icn_repeat.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png b/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png
deleted file mode 100644
index ba20bcd52..000000000
Binary files a/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_reload.png b/src/main/res/drawable-xhdpi/ic_action_reload.png
new file mode 100644
index 000000000..79548cb7d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_reload.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_reload_white.png b/src/main/res/drawable-xhdpi/ic_action_reload_white.png
new file mode 100644
index 000000000..5cc479fc6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_reload_white.png differ
diff --git a/src/main/res/drawable-xhdpi/tea_icn_repeat.png b/src/main/res/drawable-xhdpi/tea_icn_repeat.png
deleted file mode 100644
index 5c5ca4bf3..000000000
Binary files a/src/main/res/drawable-xhdpi/tea_icn_repeat.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png b/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png
deleted file mode 100644
index 4818a9551..000000000
Binary files a/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_reload.png b/src/main/res/drawable-xxhdpi/ic_action_reload.png
new file mode 100644
index 000000000..e2c99eefe
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_reload.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_reload_white.png b/src/main/res/drawable-xxhdpi/ic_action_reload_white.png
new file mode 100644
index 000000000..d24d82b0f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_reload_white.png differ
diff --git a/src/main/res/drawable/ic_action_reload.png b/src/main/res/drawable/ic_action_reload.png
new file mode 100644
index 000000000..319ce0593
Binary files /dev/null and b/src/main/res/drawable/ic_action_reload.png differ
diff --git a/src/main/res/drawable/ic_action_reload_white.png b/src/main/res/drawable/ic_action_reload_white.png
new file mode 100644
index 000000000..307d032cb
Binary files /dev/null and b/src/main/res/drawable/ic_action_reload_white.png differ
diff --git a/src/main/res/drawable/tea_icn_repeat.png b/src/main/res/drawable/tea_icn_repeat.png
deleted file mode 100644
index d5fa6a945..000000000
Binary files a/src/main/res/drawable/tea_icn_repeat.png and /dev/null differ
diff --git a/src/main/res/drawable/tea_icn_repeat_gray.png b/src/main/res/drawable/tea_icn_repeat_gray.png
deleted file mode 100644
index 8af89490d..000000000
Binary files a/src/main/res/drawable/tea_icn_repeat_gray.png and /dev/null differ
diff --git a/src/main/res/layout/control_set_repeat_display.xml b/src/main/res/layout/control_set_repeat_display.xml
index d9d70e0f9..357773463 100644
--- a/src/main/res/layout/control_set_repeat_display.xml
+++ b/src/main/res/layout/control_set_repeat_display.xml
@@ -4,40 +4,41 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-  <!-- tags -->
-  <LinearLayout
-      android:id="@+id/repeat_body"
-      android:layout_width="fill_parent"
-      android:layout_height="50dip"
-      android:gravity="center_vertical">
-      <ImageView android:id="@+id/display_row_icon"
-             android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"
-             android:scaleType="fitCenter"/>
-	  <TextView
-	      android:id="@+id/display_row_edit"
-	      android:layout_width="fill_parent"
-	      android:layout_height="wrap_content"
-	      android:layout_weight="1"
-	      android:gravity="left"
-	      android:paddingLeft="5dip"
-          android:textColor="?attr/asThemeTextColor" />
-	  <View
-	      android:layout_width="1px"
-	      android:layout_height="fill_parent"
-          android:background="?android:attr/listDivider" />
-  </LinearLayout>
-  <View
-      android:layout_width="fill_parent"
-      android:layout_height="1px"
-      android:padding="5dip"
-      android:background="?android:attr/listDivider" />
-    
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:src="?attr/ic_action_reload"
+        android:contentDescription="@string/repeat_until_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:padding="@dimen/task_edit_drawable_padding" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/display_row_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:gravity="start"
+            android:textColor="?attr/asThemeTextColor"
+            android:textSize="@dimen/task_edit_text_size"
+            android:paddingTop="@dimen/task_edit_padding_top_bottom"
+            android:paddingBottom="@dimen/task_edit_padding_top_bottom"
+            android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
+            android:layout_marginBottom="@dimen/task_edit_padding_top_bottom"
+            android:paddingRight="@dimen/task_edit_padding_right"
+            android:paddingEnd="@dimen/task_edit_padding_right" />
+
+        <include layout="@layout/task_edit_divider"/>
+
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 7d516a072..390702e5b 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -46,6 +46,7 @@
     <attr name="ic_action_box" format="reference" />
     <attr name="ic_action_bell" format="reference" />
     <attr name="ic_action_alarm" format="reference" />
+    <attr name="ic_action_reload" format="reference" />
     <attr name="drawer_text" format="color"/>
     <attr name="importance_background_selected" format="reference"/>
     <attr name="tea_icn_addcal" format="reference"/>
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 66533ee3f..0a453783b 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -237,35 +237,36 @@
       <item >@string/TEA_control_timer</item>
       <item >@string/TEA_control_hidden_section</item>
   </string-array>
-  
-  <string name="TEA_ctrl_title_pref">TEA_ctrl_title_pref</string> <!-- Deprecated -->
-  <string name="TEA_ctrl_when_pref">TEA_ctrl_when_pref</string>
-  <string name="TEA_ctrl_more_pref">TEA_ctrl_more_pref</string>
-  <string name="TEA_ctrl_importance_pref">TEA_ctrl_importance_pref</string>
-  <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
-  <string name="TEA_ctrl_notes_pref">TEA_ctrl_notes_pref</string>
-  <string name="TEA_ctrl_files_pref">TEA_ctrl_files_pref</string>
-    <string name="TEA_ctrl_hide_until_pref">TEA_ctrl_hide_until_pref</string>
-  <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
-  <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
-  <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
-  <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string>
+
     <string name="p_use_dark_theme">use_dark_theme</string>
     <string name="p_use_dark_theme_widget">use_dark_theme_widget</string>
     <string name="p_debug_logging">debug_logging</string>
-    <!-- Deprecated -->
 
-  <string-array name="TEA_control_sets_prefs">
-      <item>@string/TEA_ctrl_when_pref</item>
-      <item>@string/TEA_ctrl_importance_pref</item>
-      <item>@string/TEA_ctrl_lists_pref</item>
-      <item>@string/TEA_ctrl_notes_pref</item>
-      <item>@string/TEA_ctrl_files_pref</item>
-      <item>@string/TEA_ctrl_hide_until_pref</item>
-      <item>@string/TEA_ctrl_reminders_pref</item>
-      <item>@string/TEA_ctrl_timer_pref</item>
-      <item>@string/TEA_ctrl_hide_section_pref</item>
-  </string-array>
-  
-  
+    <string name="TEA_ctrl_title_pref">TEA_ctrl_title_pref</string> <!-- Deprecated -->
+    <string name="TEA_ctrl_when_pref">TEA_ctrl_when_pref</string>
+    <string name="TEA_ctrl_repeat_pref">TEA_ctrl_repeat_pref</string>
+    <string name="TEA_ctrl_more_pref">TEA_ctrl_more_pref</string>
+    <string name="TEA_ctrl_importance_pref">TEA_ctrl_importance_pref</string>
+    <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
+    <string name="TEA_ctrl_notes_pref">TEA_ctrl_notes_pref</string>
+    <string name="TEA_ctrl_files_pref">TEA_ctrl_files_pref</string>
+    <string name="TEA_ctrl_hide_until_pref">TEA_ctrl_hide_until_pref</string>
+    <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
+    <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
+    <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
+    <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string>
+
+    <string-array name="TEA_control_sets_prefs">
+        <item>@string/TEA_ctrl_when_pref</item>
+        <item>@string/TEA_ctrl_repeat_pref</item>
+        <item>@string/TEA_ctrl_importance_pref</item>
+        <item>@string/TEA_ctrl_lists_pref</item>
+        <item>@string/TEA_ctrl_notes_pref</item>
+        <item>@string/TEA_ctrl_files_pref</item>
+        <item>@string/TEA_ctrl_hide_until_pref</item>
+        <item>@string/TEA_ctrl_reminders_pref</item>
+        <item>@string/TEA_ctrl_timer_pref</item>
+        <item>@string/TEA_ctrl_hide_section_pref</item>
+    </string-array>
+
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index cdaa6a3fc..87b06a9f9 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -65,6 +65,7 @@
         <item name="ic_action_box">@drawable/ic_action_box</item>
         <item name="ic_action_bell">@drawable/ic_action_bell</item>
         <item name="ic_action_alarm">@drawable/ic_action_alarm</item>
+        <item name="ic_action_reload">@drawable/ic_action_reload</item>
     </style>
 
     <style name="Tasks.Dark">
@@ -93,6 +94,7 @@
         <item name="ic_action_box">@drawable/ic_action_box_white</item>
         <item name="ic_action_bell">@drawable/ic_action_bell_white</item>
         <item name="ic_action_alarm">@drawable/ic_action_alarm_white</item>
+        <item name="ic_action_reload">@drawable/ic_action_reload_white</item>
         <item name="asDueDateColor">#c3c3c3</item>
     </style>