diff --git a/api/src/main/res/drawable/image_placeholder.png b/api/src/main/res/drawable/image_placeholder.png
deleted file mode 100644
index 34ae5497d..000000000
Binary files a/api/src/main/res/drawable/image_placeholder.png and /dev/null differ
diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java
index 1a7494e3b..fbb9cc199 100644
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java
@@ -15,6 +15,7 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -223,7 +224,9 @@ public abstract class CommentsFragment extends SherlockListFragment {
     }
 
     protected void resetPictureButton() {
-        pictureButton.setImageResource(R.drawable.camera_button);
+        TypedValue typedValue = new TypedValue();
+        getActivity().getTheme().resolveAttribute(R.attr.ic_action_camera, typedValue, true);
+        pictureButton.setImageResource(typedValue.resourceId);
     }
 
     protected void refreshUpdatesList() {
diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
index e5680b34f..1a7ca5674 100644
--- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -20,21 +13,16 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
@@ -45,7 +33,6 @@ import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncThread;
@@ -63,8 +50,6 @@ import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
 import com.todoroo.astrid.dao.TagDataDao;
 import com.todoroo.astrid.dao.TagMetadataDao;
-import com.todoroo.astrid.dao.TagMetadataDao.TagMetadataCriteria;
-import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.dao.TaskListMetadataDao;
 import com.todoroo.astrid.dao.UserDao;
 import com.todoroo.astrid.data.RemoteModel;
@@ -73,21 +58,21 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.TagMetadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskListMetadata;
-import com.todoroo.astrid.data.User;
-import com.todoroo.astrid.data.UserActivity;
-import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.service.SyncV2Service;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.subtasks.SubtasksTagListFragment;
 import com.todoroo.astrid.tags.TagFilterExposer;
-import com.todoroo.astrid.tags.TagMemberMetadata;
 import com.todoroo.astrid.tags.TagService;
-import com.todoroo.astrid.tags.TagService.Tag;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.Flags;
-import com.todoroo.astrid.utility.ResourceDrawableCache;
+
+import org.json.JSONArray;
+import org.tasks.R;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TagViewFragment extends TaskListFragment {
 
@@ -216,7 +201,7 @@ public class TagViewFragment extends TaskListFragment {
     protected void addMenuItems(Menu menu, Activity activity) {
         super.addMenuItems(menu, activity);
         MenuItem item = menu.add(Menu.NONE, MENU_LIST_SETTINGS_ID, 0, R.string.tag_settings_title);
-        item.setIcon(ThemeService.getDrawable(R.drawable.list_settings));
+        item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_gear));
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
     }
 
diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java
index 1bee8a4f3..b4cccc034 100644
--- a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -185,7 +185,9 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     }
 
     private int getDefaultCameraButton() {
-        return R.drawable.camera_button;
+        TypedValue typedValue = new TypedValue();
+        fragment.getActivity().getTheme().resolveAttribute(R.attr.ic_action_camera, typedValue, true);
+        return typedValue.resourceId;
     }
 
     private void fetchTask(long id) {
diff --git a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java
index 3f66f0ef4..873bcec76 100644
--- a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java
@@ -181,8 +181,8 @@ public class ThemeService {
             return R.drawable.ic_action_cancel_light;
         case R.drawable.ic_action_new_attachment:
                 return R.drawable.ic_action_new_attachment_light;
-        case R.drawable.list_settings:
-                return lightDrawable;
+        case R.drawable.ic_action_gear:
+                return R.drawable.ic_action_gear_light;
 
         case R.drawable.icn_menu_refresh:
             return R.drawable.icn_menu_refresh_dark;
diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java
index d8187f4f8..8ab845202 100644
--- a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java
+++ b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java
@@ -338,11 +338,11 @@ public class TasksWidget extends AppWidgetProvider {
             if (isDarkTheme()) {
                 layout = R.layout.widget_initialized_dark;
                 titleColor = r.getColor(R.color.widget_text_color_dark);
-                buttonDrawable = R.drawable.plus_button_blue;
+                buttonDrawable = R.drawable.ic_action_new_light;
             } else {
                 layout = R.layout.widget_initialized;
                 titleColor = r.getColor(R.color.widget_text_color_light);
-                buttonDrawable = R.drawable.plus_button_dark_blue;
+                buttonDrawable = R.drawable.ic_action_new;
             }
 
             views = new RemoteViews(packageName, layout);
diff --git a/astrid/src/main/res/drawable-hdpi/camera_button_normal.png b/astrid/src/main/res/drawable-hdpi/camera_button_normal.png
deleted file mode 100644
index c6e9a8d65..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/camera_button_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/camera_button_pressed.png b/astrid/src/main/res/drawable-hdpi/camera_button_pressed.png
deleted file mode 100644
index dbb70555d..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/camera_button_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_camera.png b/astrid/src/main/res/drawable-hdpi/ic_action_camera.png
new file mode 100644
index 000000000..87649ad19
Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_camera_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_camera_light.png
new file mode 100644
index 000000000..9b8ccf5d4
Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_camera_light.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_gear.png b/astrid/src/main/res/drawable-hdpi/ic_action_gear.png
new file mode 100644
index 000000000..23471f478
Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_gear.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_gear_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_gear_light.png
new file mode 100644
index 000000000..64eb6cbb2
Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_gear_light.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_new.png b/astrid/src/main/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 000000000..3bd2fa00f
Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_new.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_new_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_new_light.png
new file mode 100644
index 000000000..d866d6160
Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_new_light.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/list_settings.png b/astrid/src/main/res/drawable-hdpi/list_settings.png
deleted file mode 100644
index c9aef9b51..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/list_settings.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_off.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_off.png
deleted file mode 100644
index a09ec2187..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_on.png b/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_on.png
deleted file mode 100644
index 877d85e9c..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/lists_disclosure_red_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/menu_button_red_off.png b/astrid/src/main/res/drawable-hdpi/menu_button_red_off.png
deleted file mode 100644
index e7961c6f2..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/menu_button_red_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/menu_button_red_on.png b/astrid/src/main/res/drawable-hdpi/menu_button_red_on.png
deleted file mode 100644
index 5b736ecfa..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/menu_button_red_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/mic_button_blue_normal.png b/astrid/src/main/res/drawable-hdpi/mic_button_blue_normal.png
deleted file mode 100644
index 9c1cb54d1..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/mic_button_blue_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/mic_button_blue_pressed.png b/astrid/src/main/res/drawable-hdpi/mic_button_blue_pressed.png
deleted file mode 100644
index e96d5905e..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/mic_button_blue_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_normal.png b/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_normal.png
deleted file mode 100644
index f7d996e18..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_pressed.png b/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_pressed.png
deleted file mode 100644
index 74b6f1b0a..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/mic_button_dark_blue_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/mic_button_red_normal.png b/astrid/src/main/res/drawable-hdpi/mic_button_red_normal.png
deleted file mode 100644
index c15e56e40..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/mic_button_red_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/mic_button_red_pressed.png b/astrid/src/main/res/drawable-hdpi/mic_button_red_pressed.png
deleted file mode 100644
index b86d60418..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/mic_button_red_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_red_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_red_off.png
deleted file mode 100644
index 0cf8523b5..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_red_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_red_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_red_on.png
deleted file mode 100644
index 5a0e865ad..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_red_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/trashcan.png b/astrid/src/main/res/drawable-hdpi/trashcan.png
deleted file mode 100644
index 417fbf7b9..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/trashcan.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-v11/importance_title_1.xml b/astrid/src/main/res/drawable-v11/importance_title_1.xml
deleted file mode 100644
index e92f735c8..000000000
--- a/astrid/src/main/res/drawable-v11/importance_title_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_1" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
-</shape>
diff --git a/astrid/src/main/res/drawable-v11/importance_title_2.xml b/astrid/src/main/res/drawable-v11/importance_title_2.xml
deleted file mode 100644
index d72d40c67..000000000
--- a/astrid/src/main/res/drawable-v11/importance_title_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_2" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
-</shape>
diff --git a/astrid/src/main/res/drawable-v11/importance_title_3.xml b/astrid/src/main/res/drawable-v11/importance_title_3.xml
deleted file mode 100644
index 2e2a1b118..000000000
--- a/astrid/src/main/res/drawable-v11/importance_title_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_3" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
-</shape>
diff --git a/astrid/src/main/res/drawable-v11/importance_title_4.xml b/astrid/src/main/res/drawable-v11/importance_title_4.xml
deleted file mode 100644
index 15bb40096..000000000
--- a/astrid/src/main/res/drawable-v11/importance_title_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_4" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
-</shape>
diff --git a/astrid/src/main/res/drawable-v11/importance_title_5.xml b/astrid/src/main/res/drawable-v11/importance_title_5.xml
deleted file mode 100644
index cd9a211b1..000000000
--- a/astrid/src/main/res/drawable-v11/importance_title_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_5" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
-</shape>
diff --git a/astrid/src/main/res/drawable-v11/importance_title_6.xml b/astrid/src/main/res/drawable-v11/importance_title_6.xml
deleted file mode 100644
index 78d787149..000000000
--- a/astrid/src/main/res/drawable-v11/importance_title_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_6" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
-</shape>
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png b/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png
new file mode 100644
index 000000000..b4bd762f9
Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_camera_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_camera_light.png
new file mode 100644
index 000000000..31b4b221d
Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_camera_light.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_gear.png b/astrid/src/main/res/drawable-xhdpi/ic_action_gear.png
new file mode 100644
index 000000000..3be1a7821
Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_gear.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_gear_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_gear_light.png
new file mode 100644
index 000000000..cf3196465
Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_gear_light.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_new.png b/astrid/src/main/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 000000000..6038beee9
Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_new.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_new_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_new_light.png
new file mode 100644
index 000000000..dde2141f2
Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_new_light.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_off.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_off.png
deleted file mode 100644
index 1fc04ed41..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_on.png b/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_on.png
deleted file mode 100644
index 290c54805..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/lists_disclosure_red_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png
new file mode 100644
index 000000000..a83d40c70
Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_camera_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_camera_light.png
new file mode 100644
index 000000000..0d859c39c
Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_camera_light.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png
new file mode 100644
index 000000000..e00cd92c1
Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_gear_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_gear_light.png
new file mode 100644
index 000000000..27ad973e5
Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_gear_light.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_new.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_new.png
new file mode 100644
index 000000000..c0cd3d94d
Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_new.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_new_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_new_light.png
new file mode 100644
index 000000000..c42c2bfb5
Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_new_light.png differ
diff --git a/astrid/src/main/res/drawable/astrid_com_gradient.xml b/astrid/src/main/res/drawable/astrid_com_gradient.xml
deleted file mode 100644
index 1ec360c5c..000000000
--- a/astrid/src/main/res/drawable/astrid_com_gradient.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <gradient
-      android:type="radial"
-      android:startColor="#70cef1"
-      android:endColor="#2d8db6"
-      android:gradientRadius="300"
-      android:centerX="0.5"
-      android:centerY="0.5" />
-</shape>
diff --git a/astrid/src/main/res/drawable/btn_add.xml b/astrid/src/main/res/drawable/btn_add.xml
deleted file mode 100644
index eb597adab..000000000
--- a/astrid/src/main/res/drawable/btn_add.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_add_pressed" />
-    <item android:drawable="@drawable/btn_add_normal" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/btn_add_normal.png b/astrid/src/main/res/drawable/btn_add_normal.png
deleted file mode 100644
index 56cf1c7b2..000000000
Binary files a/astrid/src/main/res/drawable/btn_add_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/btn_add_pressed.png b/astrid/src/main/res/drawable/btn_add_pressed.png
deleted file mode 100644
index 25e764d8f..000000000
Binary files a/astrid/src/main/res/drawable/btn_add_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/camera_button.xml b/astrid/src/main/res/drawable/camera_button.xml
deleted file mode 100644
index ad82db4c2..000000000
--- a/astrid/src/main/res/drawable/camera_button.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/camera_button_pressed"/>
-    <item android:state_focused="true" android:drawable="@drawable/camera_button_pressed"/>
-    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/camera_button_normal"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/camera_button_normal.png b/astrid/src/main/res/drawable/camera_button_normal.png
deleted file mode 100644
index 6d39e3093..000000000
Binary files a/astrid/src/main/res/drawable/camera_button_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/camera_button_pressed.png b/astrid/src/main/res/drawable/camera_button_pressed.png
deleted file mode 100644
index 27b14e736..000000000
Binary files a/astrid/src/main/res/drawable/camera_button_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/edit_title_background.xml b/astrid/src/main/res/drawable/edit_title_background.xml
deleted file mode 100644
index 9c2e3427f..000000000
--- a/astrid/src/main/res/drawable/edit_title_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-      android:startColor="#eeeeee"
-      android:endColor="#ffffff"
-      android:angle="270"
-      android:height="20dp" />
-  <stroke 
-      android:color="#bbbbbf"
-      android:width="1dip" />
-  <size android:width="45dip"
-        android:height="45dip"/>
-</shape>
diff --git a/astrid/src/main/res/drawable/edit_title_background_dark.xml b/astrid/src/main/res/drawable/edit_title_background_dark.xml
deleted file mode 100644
index 53d249ee3..000000000
--- a/astrid/src/main/res/drawable/edit_title_background_dark.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-      android:startColor="#111111"
-      android:endColor="#181818"
-      android:angle="270"
-      android:height="20dp" />
-  <stroke 
-      android:color="#707070"
-      android:width="1dip" />
-  <size android:width="45dip"
-        android:height="45dip"/>
-</shape>
diff --git a/astrid/src/main/res/drawable/ic_action_camera.png b/astrid/src/main/res/drawable/ic_action_camera.png
new file mode 100644
index 000000000..bf2af6e5d
Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_camera_light.png b/astrid/src/main/res/drawable/ic_action_camera_light.png
new file mode 100644
index 000000000..75d6b8c20
Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_camera_light.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_gear.png b/astrid/src/main/res/drawable/ic_action_gear.png
new file mode 100644
index 000000000..46cad2641
Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_gear.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_gear_light.png b/astrid/src/main/res/drawable/ic_action_gear_light.png
new file mode 100644
index 000000000..b3c11924d
Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_gear_light.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_new.png b/astrid/src/main/res/drawable/ic_action_new.png
new file mode 100644
index 000000000..ca185e47b
Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_new.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_new_light.png b/astrid/src/main/res/drawable/ic_action_new_light.png
new file mode 100644
index 000000000..f17e7980e
Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_new_light.png differ
diff --git a/astrid/src/main/res/drawable/importance_check_1.xml b/astrid/src/main/res/drawable/importance_check_1.xml
deleted file mode 100644
index b691686b5..000000000
--- a/astrid/src/main/res/drawable/importance_check_1.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_1" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_1" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/importance_check_2.xml b/astrid/src/main/res/drawable/importance_check_2.xml
deleted file mode 100644
index 055dfb640..000000000
--- a/astrid/src/main/res/drawable/importance_check_2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_2" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_2" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/importance_check_3.xml b/astrid/src/main/res/drawable/importance_check_3.xml
deleted file mode 100644
index b2f23eb0f..000000000
--- a/astrid/src/main/res/drawable/importance_check_3.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_3" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_3" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/importance_check_4.xml b/astrid/src/main/res/drawable/importance_check_4.xml
deleted file mode 100644
index be715c051..000000000
--- a/astrid/src/main/res/drawable/importance_check_4.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_4" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_4" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/importance_check_repeat_1.xml b/astrid/src/main/res/drawable/importance_check_repeat_1.xml
deleted file mode 100644
index d2279f799..000000000
--- a/astrid/src/main/res/drawable/importance_check_repeat_1.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_1" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_1" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/importance_check_repeat_2.xml b/astrid/src/main/res/drawable/importance_check_repeat_2.xml
deleted file mode 100644
index fd162c923..000000000
--- a/astrid/src/main/res/drawable/importance_check_repeat_2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_2" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_2" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/importance_check_repeat_3.xml b/astrid/src/main/res/drawable/importance_check_repeat_3.xml
deleted file mode 100644
index 9ae144dcb..000000000
--- a/astrid/src/main/res/drawable/importance_check_repeat_3.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_3" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_3" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/importance_check_repeat_4.xml b/astrid/src/main/res/drawable/importance_check_repeat_4.xml
deleted file mode 100644
index 95275aff1..000000000
--- a/astrid/src/main/res/drawable/importance_check_repeat_4.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_4" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_4" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/list_settings.png b/astrid/src/main/res/drawable/list_settings.png
deleted file mode 100644
index f80abd5e5..000000000
Binary files a/astrid/src/main/res/drawable/list_settings.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/lists_disclosure_blue_alt.xml b/astrid/src/main/res/drawable/lists_disclosure_blue_alt.xml
deleted file mode 100644
index de11462c6..000000000
--- a/astrid/src/main/res/drawable/lists_disclosure_blue_alt.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_blue_off"/>
-    <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_red_on"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/lists_disclosure_red.xml b/astrid/src/main/res/drawable/lists_disclosure_red.xml
deleted file mode 100644
index 2110728db..000000000
--- a/astrid/src/main/res/drawable/lists_disclosure_red.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_red_off"/>
-    <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_red_on"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/lists_disclosure_red_off.png b/astrid/src/main/res/drawable/lists_disclosure_red_off.png
deleted file mode 100644
index b9fd612c1..000000000
Binary files a/astrid/src/main/res/drawable/lists_disclosure_red_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/lists_disclosure_red_on.png b/astrid/src/main/res/drawable/lists_disclosure_red_on.png
deleted file mode 100644
index aee89221d..000000000
Binary files a/astrid/src/main/res/drawable/lists_disclosure_red_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/menu_button_red.xml b/astrid/src/main/res/drawable/menu_button_red.xml
deleted file mode 100644
index 89f42d428..000000000
--- a/astrid/src/main/res/drawable/menu_button_red.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="false" android:drawable="@drawable/menu_button_red_off"/>
-    <item android:state_selected="true" android:drawable="@drawable/menu_button_red_on"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/menu_button_red_off.png b/astrid/src/main/res/drawable/menu_button_red_off.png
deleted file mode 100644
index 7f66cbce3..000000000
Binary files a/astrid/src/main/res/drawable/menu_button_red_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/menu_button_red_on.png b/astrid/src/main/res/drawable/menu_button_red_on.png
deleted file mode 100644
index 02ed03c02..000000000
Binary files a/astrid/src/main/res/drawable/menu_button_red_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/mic_button_blue.xml b/astrid/src/main/res/drawable/mic_button_blue.xml
deleted file mode 100644
index 8827b01af..000000000
--- a/astrid/src/main/res/drawable/mic_button_blue.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/mic_button_blue_pressed"/>
-    <item android:state_focused="true" android:drawable="@drawable/mic_button_blue_pressed"/>
-    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/mic_button_blue_normal"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/mic_button_blue_normal.png b/astrid/src/main/res/drawable/mic_button_blue_normal.png
deleted file mode 100644
index c5428b66a..000000000
Binary files a/astrid/src/main/res/drawable/mic_button_blue_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/mic_button_blue_pressed.png b/astrid/src/main/res/drawable/mic_button_blue_pressed.png
deleted file mode 100644
index 6897a0c9a..000000000
Binary files a/astrid/src/main/res/drawable/mic_button_blue_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/mic_button_dark_blue.xml b/astrid/src/main/res/drawable/mic_button_dark_blue.xml
deleted file mode 100644
index 0104fb90c..000000000
--- a/astrid/src/main/res/drawable/mic_button_dark_blue.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/mic_button_dark_blue_pressed"/>
-    <item android:state_focused="true" android:drawable="@drawable/mic_button_dark_blue_pressed"/>
-    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/mic_button_dark_blue_normal"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/mic_button_dark_blue_normal.png b/astrid/src/main/res/drawable/mic_button_dark_blue_normal.png
deleted file mode 100644
index 8e32ccd6d..000000000
Binary files a/astrid/src/main/res/drawable/mic_button_dark_blue_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/mic_button_dark_blue_pressed.png b/astrid/src/main/res/drawable/mic_button_dark_blue_pressed.png
deleted file mode 100644
index b7f0b86d4..000000000
Binary files a/astrid/src/main/res/drawable/mic_button_dark_blue_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/mic_button_red.xml b/astrid/src/main/res/drawable/mic_button_red.xml
deleted file mode 100644
index 7e8878af6..000000000
--- a/astrid/src/main/res/drawable/mic_button_red.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/mic_button_red_pressed"/>
-    <item android:state_focused="true" android:drawable="@drawable/mic_button_red_pressed"/>
-    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/mic_button_red_normal"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/mic_button_red_normal.png b/astrid/src/main/res/drawable/mic_button_red_normal.png
deleted file mode 100644
index 526c54e3b..000000000
Binary files a/astrid/src/main/res/drawable/mic_button_red_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/mic_button_red_pressed.png b/astrid/src/main/res/drawable/mic_button_red_pressed.png
deleted file mode 100644
index 0a4ce96a5..000000000
Binary files a/astrid/src/main/res/drawable/mic_button_red_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/people_menu_button_red.xml b/astrid/src/main/res/drawable/people_menu_button_red.xml
deleted file mode 100644
index e1b9da0d5..000000000
--- a/astrid/src/main/res/drawable/people_menu_button_red.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="false" android:drawable="@drawable/people_menu_button_red_off"/>
-    <item android:state_selected="true" android:drawable="@drawable/people_menu_button_red_on"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/people_menu_button_red_off.png b/astrid/src/main/res/drawable/people_menu_button_red_off.png
deleted file mode 100644
index 4fbdeb11d..000000000
Binary files a/astrid/src/main/res/drawable/people_menu_button_red_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/people_menu_button_red_on.png b/astrid/src/main/res/drawable/people_menu_button_red_on.png
deleted file mode 100644
index edefe1fe3..000000000
Binary files a/astrid/src/main/res/drawable/people_menu_button_red_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/plus_button_blue.xml b/astrid/src/main/res/drawable/plus_button_blue.xml
deleted file mode 100644
index c97c563e3..000000000
--- a/astrid/src/main/res/drawable/plus_button_blue.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/plus_button_blue_pressed"/>
-    <item android:state_focused="true" android:drawable="@drawable/plus_button_blue_pressed"/>
-    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_blue_normal"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/plus_button_blue_normal.png b/astrid/src/main/res/drawable/plus_button_blue_normal.png
deleted file mode 100644
index ee761fa18..000000000
Binary files a/astrid/src/main/res/drawable/plus_button_blue_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/plus_button_blue_pressed.png b/astrid/src/main/res/drawable/plus_button_blue_pressed.png
deleted file mode 100644
index 236adfc4b..000000000
Binary files a/astrid/src/main/res/drawable/plus_button_blue_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/plus_button_dark_blue.xml b/astrid/src/main/res/drawable/plus_button_dark_blue.xml
deleted file mode 100644
index 271f514c8..000000000
--- a/astrid/src/main/res/drawable/plus_button_dark_blue.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/plus_button_dark_blue_pressed"/>
-    <item android:state_focused="true" android:drawable="@drawable/plus_button_dark_blue_pressed"/>
-    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_dark_blue_normal"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/plus_button_dark_blue_normal.png b/astrid/src/main/res/drawable/plus_button_dark_blue_normal.png
deleted file mode 100644
index 3bb550fa5..000000000
Binary files a/astrid/src/main/res/drawable/plus_button_dark_blue_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/plus_button_dark_blue_pressed.png b/astrid/src/main/res/drawable/plus_button_dark_blue_pressed.png
deleted file mode 100644
index fe6a1940d..000000000
Binary files a/astrid/src/main/res/drawable/plus_button_dark_blue_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/plus_button_red.xml b/astrid/src/main/res/drawable/plus_button_red.xml
deleted file mode 100644
index 1587b536b..000000000
--- a/astrid/src/main/res/drawable/plus_button_red.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/plus_button_red_pressed"/>
-    <item android:state_focused="true" android:drawable="@drawable/plus_button_red_pressed"/>
-    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_red_normal"/>
-</selector>
diff --git a/astrid/src/main/res/drawable/plus_button_red_normal.png b/astrid/src/main/res/drawable/plus_button_red_normal.png
deleted file mode 100644
index 52f9b92f6..000000000
Binary files a/astrid/src/main/res/drawable/plus_button_red_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/plus_button_red_pressed.png b/astrid/src/main/res/drawable/plus_button_red_pressed.png
deleted file mode 100644
index 253647193..000000000
Binary files a/astrid/src/main/res/drawable/plus_button_red_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/task_edit_background_transparent_black.xml b/astrid/src/main/res/drawable/task_edit_background_transparent_black.xml
deleted file mode 100644
index 15536092a..000000000
--- a/astrid/src/main/res/drawable/task_edit_background_transparent_black.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- Bottom 2dp Shadow -->
-    <item>
-        <shape android:shape="rectangle" >
-            <gradient
-                android:endColor="#33111111"
-                android:startColor="#33222222" />
-
-            <corners android:radius="4dp" />
-        </shape>
-    </item>
-    <item android:bottom="2dp" android:right="1dp">
-        <shape android:shape="rectangle" >
-            <solid android:color="#33000000" />
-            <corners android:radius="4dp" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/astrid/src/main/res/drawable/trashcan.png b/astrid/src/main/res/drawable/trashcan.png
deleted file mode 100644
index 54ba462ca..000000000
Binary files a/astrid/src/main/res/drawable/trashcan.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/widget_body_legacy.xml b/astrid/src/main/res/drawable/widget_body_legacy.xml
deleted file mode 100644
index 3e02f31db..000000000
--- a/astrid/src/main/res/drawable/widget_body_legacy.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
-    <corners 
-        android:bottomLeftRadius="8dip"
-        android:bottomRightRadius="8dip"/>
-    <solid 
-        android:color="@color/widget_body_legacy"/>
-</shape>
diff --git a/astrid/src/main/res/drawable/widget_header_legacy.xml b/astrid/src/main/res/drawable/widget_header_legacy.xml
deleted file mode 100644
index c0f3925b0..000000000
--- a/astrid/src/main/res/drawable/widget_header_legacy.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
-    <corners 
-        android:topLeftRadius="8dip"
-        android:topRightRadius="8dip"/>
-    <gradient 
-        android:centerX="0.5"
-        android:centerY="0.5"
-        android:startColor="@color/widget_header_legacy_start"
-        android:endColor="@color/widget_header_legacy_end"/>
-</shape>
diff --git a/astrid/src/main/res/layout-land/widget_initialized.xml b/astrid/src/main/res/layout-land/widget_initialized.xml
index 11322deba..9b5ad80fc 100644
--- a/astrid/src/main/res/layout-land/widget_initialized.xml
+++ b/astrid/src/main/res/layout-land/widget_initialized.xml
@@ -40,7 +40,7 @@
             android:layout_height="39dip"
             android:layout_gravity="right|center_vertical"
             android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
+            android:src="@drawable/ic_action_new"
             android:scaleType="fitCenter"/>
       
     </LinearLayout>
diff --git a/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml b/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml
index 31fd26670..a18eb73e9 100644
--- a/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml
+++ b/astrid/src/main/res/layout-xlarge-land/widget_initialized.xml
@@ -40,7 +40,7 @@
             android:layout_height="39dip"
             android:layout_gravity="right|center_vertical"
             android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
+            android:src="@drawable/ic_action_new"
             android:scaleType="fitCenter"/>
       
     </LinearLayout>
diff --git a/astrid/src/main/res/layout/control_set_notes.xml b/astrid/src/main/res/layout/control_set_notes.xml
index 17312d9d9..937075a93 100644
--- a/astrid/src/main/res/layout/control_set_notes.xml
+++ b/astrid/src/main/res/layout/control_set_notes.xml
@@ -32,7 +32,7 @@
             android:paddingRight="10dip"
 	        android:background="@android:color/transparent"
 	        android:scaleType="center"
-	        android:src="?attr/asMicButtonImg"
+	        android:src="?attr/ic_action_mic"
 	        android:layout_gravity="top"
 	        android:visibility="gone" />
         <EditText
diff --git a/astrid/src/main/res/layout/quick_add_bar.xml b/astrid/src/main/res/layout/quick_add_bar.xml
index bc2a4db58..533d236b7 100644
--- a/astrid/src/main/res/layout/quick_add_bar.xml
+++ b/astrid/src/main/res/layout/quick_add_bar.xml
@@ -27,8 +27,7 @@
 	        <ImageButton android:id="@+id/voiceAddButton"
 	            android:layout_width="39dip"
 	            android:layout_height="39dip"
-	            android:layout_gravity="top"
-	            android:layout_marginTop="-2dip"
+	            android:layout_gravity="center_vertical"
 	            android:layout_marginLeft="4dip"
 	            android:layout_marginRight="2dip"
 	            android:paddingLeft="10dip"
@@ -36,7 +35,7 @@
 	            android:layout_weight="1"
 	            android:visibility="gone"
 	            android:background="@android:color/transparent"
-	            android:src="?attr/asMicButtonImg"
+	            android:src="?attr/ic_action_mic"
 	            android:scaleType="center"/> 
 	    
 	        <!-- Quick Add Task -->
@@ -63,7 +62,7 @@
 	            android:layout_marginRight="5dip"
 	            android:layout_weight="1"
 	            android:background="@android:color/transparent"
-	            android:src="?attr/asAddButtonImg"
+	            android:src="?attr/ic_action_new"
 	            android:scaleType="center"/> 
 	
 	    </LinearLayout>
diff --git a/astrid/src/main/res/layout/tag_updates_fragment.xml b/astrid/src/main/res/layout/tag_updates_fragment.xml
index 91e00a52e..30a6b7559 100644
--- a/astrid/src/main/res/layout/tag_updates_fragment.xml
+++ b/astrid/src/main/res/layout/tag_updates_fragment.xml
@@ -52,7 +52,7 @@
             android:background="@android:color/transparent"
             android:paddingBottom="2dip"
             android:scaleType="centerInside"
-            android:src="@drawable/camera_button" />
+            android:src="?attr/ic_action_camera" />
 
         <!-- Quick Add Task -->
 
@@ -81,7 +81,7 @@
             android:layout_height="39dip"
             android:layout_marginRight="5dip"
             android:layout_weight="1"
-            android:background="?attr/asAddButtonImg"
+            android:background="?attr/ic_action_new"
             android:scaleType="center" />
     </LinearLayout>
 
diff --git a/astrid/src/main/res/layout/task_edit_activity.xml b/astrid/src/main/res/layout/task_edit_activity.xml
index 3e7920aee..83eb391dc 100644
--- a/astrid/src/main/res/layout/task_edit_activity.xml
+++ b/astrid/src/main/res/layout/task_edit_activity.xml
@@ -85,7 +85,7 @@
             android:paddingBottom="2dip"
             android:scaleType="centerInside"
             android:background="@android:color/transparent"
-            android:src="@drawable/camera_button" />
+            android:src="?attr/ic_action_camera" />
 
         <!-- Quick Add Task -->
 
@@ -146,7 +146,7 @@
             android:layout_marginLeft="3dip"
             android:layout_weight="1"
             android:background="@android:color/transparent"
-            android:src="?attr/asAddButtonImg"
+            android:src="?attr/ic_action_new"
             android:scaleType="center"
             android:visibility="gone" />
     </LinearLayout>
diff --git a/astrid/src/main/res/layout/task_list_body_tag.xml b/astrid/src/main/res/layout/task_list_body_tag.xml
index 88b8876d4..87d940a4b 100644
--- a/astrid/src/main/res/layout/task_list_body_tag.xml
+++ b/astrid/src/main/res/layout/task_list_body_tag.xml
@@ -41,7 +41,7 @@
 		    android:layout_height="43dip"
 		    android:padding="5dip"
 		    android:layout_weight="1"
-		    android:src="@drawable/list_settings"
+		    android:src="?attr/ic_action_gear"
 		    android:scaleType="fitCenter"/>
 	  </LinearLayout>
 	  
diff --git a/astrid/src/main/res/layout/widget_initialized.xml b/astrid/src/main/res/layout/widget_initialized.xml
index b11c24217..dc5bd9a29 100644
--- a/astrid/src/main/res/layout/widget_initialized.xml
+++ b/astrid/src/main/res/layout/widget_initialized.xml
@@ -40,7 +40,7 @@
             android:layout_height="39dip"
             android:layout_gravity="right|center_vertical"
             android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
+            android:src="@drawable/ic_action_new"
             android:scaleType="fitCenter"/>
       
     </LinearLayout>
diff --git a/astrid/src/main/res/layout/widget_initialized_dark.xml b/astrid/src/main/res/layout/widget_initialized_dark.xml
index e4122db82..9fc4cf784 100644
--- a/astrid/src/main/res/layout/widget_initialized_dark.xml
+++ b/astrid/src/main/res/layout/widget_initialized_dark.xml
@@ -40,7 +40,7 @@
             android:layout_height="39dip"
             android:layout_gravity="right|center_vertical"
             android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
+            android:src="@drawable/ic_action_new"
             android:scaleType="fitCenter"/>
       
     </LinearLayout>
diff --git a/astrid/src/main/res/layout/widget_loading.xml b/astrid/src/main/res/layout/widget_loading.xml
index 6e7f69679..0ce30cfb6 100644
--- a/astrid/src/main/res/layout/widget_loading.xml
+++ b/astrid/src/main/res/layout/widget_loading.xml
@@ -39,7 +39,7 @@
             android:layout_height="39dip"
             android:layout_gravity="right|center_vertical"
             android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
+            android:src="@drawable/ic_action_new"
             android:scaleType="fitCenter"/>
       
     </LinearLayout>
diff --git a/astrid/src/main/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml
index 8095a6781..e48f17429 100644
--- a/astrid/src/main/res/values/attrs.xml
+++ b/astrid/src/main/res/values/attrs.xml
@@ -31,8 +31,6 @@
   <attr name="asEditTextBackground" format="reference"/>
   <attr name="asReadonlyTaskBackground" format="color" />
   <attr name="asListsDisclosure" format="reference"/>
-  <attr name="asAddButtonImg" format="reference" />
-  <attr name="asMicButtonImg" format="reference" />
   <attr name="asMainMenu" format="reference" />
   <attr name="asPeopleMenu" format="reference" />
   <attr name="asAbBackgroundColor" format="color"/>
@@ -41,8 +39,12 @@
   <attr name="asListArrowUp" format="reference"/>
   <attr name="asFilterSelectedIcon" format="reference"/>
   <attr name="asTaskRowSelector" format="reference" />
+    <attr name="ic_action_gear" format="reference"/>
+    <attr name="ic_action_camera" format="reference"/>
+    <attr name="ic_action_new" format="reference"/>
+    <attr name="ic_action_mic" format="reference" />
 
-  <declare-styleable name="ContactsAutoComplete">
+    <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>
     <attr name="completeTags" format="boolean"/>
   </declare-styleable>
diff --git a/astrid/src/main/res/values/colors.xml b/astrid/src/main/res/values/colors.xml
index d1d2cae43..42056d907 100644
--- a/astrid/src/main/res/values/colors.xml
+++ b/astrid/src/main/res/values/colors.xml
@@ -31,9 +31,6 @@
     <color name="widget_header_dark">#dd000000</color>
     <color name="widget_body_light">#ddffffff</color>
     <color name="widget_body_dark">#dd000000</color>
-    <color name="widget_header_legacy_start">#fc1c2334</color>
-    <color name="widget_header_legacy_end">#fc243455</color>
-    <color name="widget_body_legacy">#fc1c1c1c</color>
     <color name="task_row_bg_dark_pressed">#303030</color>
     <color name="task_row_bg_white_pressed">#dde1eb</color>
         
diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml
index c3180787d..9e6470fd0 100644
--- a/astrid/src/main/res/values/styles.xml
+++ b/astrid/src/main/res/values/styles.xml
@@ -23,8 +23,6 @@
         <item name="asMembersHeaderBackground">#909090</item>
         <item name="asSeparatorBackground">#888888</item>
         <item name="asListDividerColor">#555555</item>
-        <item name="asAddButtonImg">@drawable/plus_button_blue</item>
-        <item name="asMicButtonImg">@drawable/mic_button_blue</item>
         <item name="asEditTextBackground">@null</item>
         <item name="asEditBackground">#101010</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
@@ -41,7 +39,10 @@
         <item name="asReadonlyTaskBackground">#322c19</item>
         <item name="asHeaderTextColor">?attr/asThemeTextColor</item>
         <item name="asHeaderTextColorInverse">?attr/asAbBackgroundColor</item>
-        
+        <item name="ic_action_gear">@drawable/ic_action_gear_light</item>
+        <item name="ic_action_camera">@drawable/ic_action_camera_light</item>
+        <item name="ic_action_mic">@drawable/ic_action_mic_light</item>
+        <item name="ic_action_new">@drawable/ic_action_new_light</item>
         <!-- actionbar-styling -->
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle</item>
@@ -77,13 +78,15 @@
         <item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
         <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
         <item name="asReadonlyTaskBackground">#fff6d7</item>
-        <item name="asAddButtonImg">@drawable/plus_button_dark_blue</item>
-        <item name="asMicButtonImg">@drawable/mic_button_dark_blue</item>
         <item name="asMainMenu">@drawable/menu_button_dark_blue</item>
         <item name="asPeopleMenu">@drawable/people_menu_button_dark_blue</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_dark_blue</item>
         <item name="asAbBackgroundColor">#e9e9e9</item>
+        <item name="ic_action_gear">@drawable/ic_action_gear</item>
+        <item name="ic_action_camera">@drawable/ic_action_camera</item>
+        <item name="ic_action_mic">@drawable/ic_action_mic</item>
+        <item name="ic_action_new">@drawable/ic_action_new</item>
         <!-- actionbar-styling -->
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.White</item>
diff --git a/greendroid/src/main/res/drawable-hdpi/gd_shadow_bottom.9.png b/greendroid/src/main/res/drawable-hdpi/gd_shadow_bottom.9.png
deleted file mode 100644
index 91f8313fa..000000000
Binary files a/greendroid/src/main/res/drawable-hdpi/gd_shadow_bottom.9.png and /dev/null differ
diff --git a/greendroid/src/main/res/drawable-hdpi/gd_shadow_top.9.png b/greendroid/src/main/res/drawable-hdpi/gd_shadow_top.9.png
deleted file mode 100644
index 0217c677b..000000000
Binary files a/greendroid/src/main/res/drawable-hdpi/gd_shadow_top.9.png and /dev/null differ
diff --git a/greendroid/src/main/res/drawable-mdpi/gd_shadow_bottom.9.png b/greendroid/src/main/res/drawable-mdpi/gd_shadow_bottom.9.png
deleted file mode 100644
index efd35a5b6..000000000
Binary files a/greendroid/src/main/res/drawable-mdpi/gd_shadow_bottom.9.png and /dev/null differ
diff --git a/greendroid/src/main/res/drawable-mdpi/gd_shadow_top.9.png b/greendroid/src/main/res/drawable-mdpi/gd_shadow_top.9.png
deleted file mode 100644
index 63a1a5d45..000000000
Binary files a/greendroid/src/main/res/drawable-mdpi/gd_shadow_top.9.png and /dev/null differ