diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
index e7213ebd5..be96498e1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -11,6 +11,7 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.text.TextUtils;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.AdapterView;
@@ -334,7 +335,10 @@ public class RepeatControlSet extends PopupControlSet {
String date = String.format("%s %s", (Integer)value.getTag(), dateAbbrev[interval.getSelectedItemPosition()]); //$NON-NLS-1$
String text = String.format(activity.getString(R.string.repeat_detail_duedate), date); // Every freq int
repeatDisplay.setText(text);
- repeatImage.setImageResource(R.drawable.icn_edit_repeats_red);
+
+ TypedValue repeatIcon = new TypedValue();
+ activity.getTheme().resolveAttribute(R.attr.asRepeatIcon, repeatIcon, false);
+ repeatImage.setImageResource(repeatIcon.data);
} else {
diff --git a/astrid/res/drawable/icn_edit_repeats_blue.png b/astrid/res/drawable/icn_edit_repeats_blue.png
new file mode 100644
index 000000000..9055f89a2
Binary files /dev/null and b/astrid/res/drawable/icn_edit_repeats_blue.png differ
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index 75d9847d7..e7e04c890 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -25,6 +25,7 @@
+
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 89cdf10be..d97014be9 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -29,6 +29,7 @@
- @color/blue_theme_color
- @drawable/lists_disclosure_blue
- @drawable/taskedit_arrow_up_white
+ - @drawable/icn_edit_repeats_blue
- @drawable/header_blue
- useLogo|showHome|showTitle
@@ -81,6 +82,7 @@
- @color/red_theme_color
- @drawable/lists_disclosure_red
- @drawable/taskedit_arrow_up_white
+ - @drawable/icn_edit_repeats_red
- @drawable/header_red
- useLogo|showHome|showTitle
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index c5af4351b..1bf9759e9 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -1036,7 +1036,7 @@ public final class TaskEditFragment extends Fragment implements
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (editNotes.activityResult(requestCode, resultCode, data)) {
+ if (editNotes != null && editNotes.activityResult(requestCode, resultCode, data)) {
return;
}
if (requestCode == REQUEST_VOICE_RECOG