diff --git a/astrid/src/main/res/drawable-hdpi/btn_dismiss_normal_blue_alt.png b/astrid/src/main/res/drawable-hdpi/btn_dismiss_normal_blue_alt.png
deleted file mode 100644
index ada2ab13a..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/btn_dismiss_normal_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed_blue_alt.png b/astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed_blue_alt.png
deleted file mode 100644
index ada2ab13a..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/camera_button_normal_blue_alt.png b/astrid/src/main/res/drawable-hdpi/camera_button_normal_blue_alt.png
deleted file mode 100644
index 06b19716f..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/camera_button_normal_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/footer_button_normal.png b/astrid/src/main/res/drawable-hdpi/footer_button_normal.png
deleted file mode 100644
index e792875d4..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/footer_button_normal.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/footer_button_pressed.png b/astrid/src/main/res/drawable-hdpi/footer_button_pressed.png
deleted file mode 100644
index 83ba182c4..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/footer_button_pressed.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/footer_button_selected.png b/astrid/src/main/res/drawable-hdpi/footer_button_selected.png
deleted file mode 100644
index daa845f5a..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/footer_button_selected.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/footer_edittext_focus.9.png b/astrid/src/main/res/drawable-hdpi/footer_edittext_focus.9.png
deleted file mode 100644
index f327ff3aa..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/footer_edittext_focus.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/footer_edittext_normal.9.png b/astrid/src/main/res/drawable-hdpi/footer_edittext_normal.9.png
deleted file mode 100644
index 33372f6b3..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/footer_edittext_normal.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_camera.png b/astrid/src/main/res/drawable-hdpi/ic_menu_camera.png
deleted file mode 100644
index 439e1118e..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_camera.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_camera_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_camera_blue_alt.png
deleted file mode 100644
index 31c8570df..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_camera_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png
deleted file mode 100644
index 047fc80c1..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_off.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_off.png
deleted file mode 100644
index c4822a4d8..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_off.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_on.png b/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_on.png
deleted file mode 100644
index e4ebaf152..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/people_menu_button_blue_alt_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_assign.png b/astrid/src/main/res/drawable-hdpi/tea_icn_assign.png
deleted file mode 100644
index c8fe71083..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_assign.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_assign_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_assign_gray.png
deleted file mode 100644
index cc1347686..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_assign_gray.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_assign_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_assign_lightblue.png
deleted file mode 100644
index 762e3af4e..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_assign_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_priority_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_priority_lightblue.png
deleted file mode 100644
index 7da124302..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_priority_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_lightblue.png
deleted file mode 100644
index 1f0e6f4e3..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_red.png b/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_red.png
deleted file mode 100644
index 73f1d68d8..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_red.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_share.png b/astrid/src/main/res/drawable-hdpi/tea_icn_share.png
deleted file mode 100644
index caf72de35..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_share.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_share_gray.png b/astrid/src/main/res/drawable-hdpi/tea_icn_share_gray.png
deleted file mode 100644
index 512edc440..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_share_gray.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_share_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_share_lightblue.png
deleted file mode 100644
index ca7969f56..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_share_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_waiting.png b/astrid/src/main/res/drawable-hdpi/tea_icn_waiting.png
deleted file mode 100644
index 1a421b3e4..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_waiting.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_waiting_lightblue.png b/astrid/src/main/res/drawable-hdpi/tea_icn_waiting_lightblue.png
deleted file mode 100644
index 0d59b31ce..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/tea_icn_waiting_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_assign.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_assign.png
deleted file mode 100644
index f4b32ac0b..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_assign.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_gray.png
deleted file mode 100644
index 6a62e88b0..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_gray.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_lightblue.png
deleted file mode 100644
index 0af69b7d4..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_assign_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_priority_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_priority_lightblue.png
deleted file mode 100644
index 882567ff8..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_priority_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_lightblue.png
deleted file mode 100644
index 788dc69fe..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_red.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_red.png
deleted file mode 100644
index 21aabe93f..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_red.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_share.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_share.png
deleted file mode 100644
index 4751a7c8b..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_share.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_share_gray.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_share_gray.png
deleted file mode 100644
index 42ceefeb2..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_share_gray.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_share_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_share_lightblue.png
deleted file mode 100644
index cb7dda3b5..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_share_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting.png
deleted file mode 100644
index 1cb893677..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting_lightblue.png b/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting_lightblue.png
deleted file mode 100644
index 7e5b76724..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/tea_icn_waiting_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/btn_dismiss_normal_blue_alt.png b/astrid/src/main/res/drawable/btn_dismiss_normal_blue_alt.png
deleted file mode 100644
index 37d9a36d2..000000000
Binary files a/astrid/src/main/res/drawable/btn_dismiss_normal_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/btn_dismiss_pressed_blue_alt.png b/astrid/src/main/res/drawable/btn_dismiss_pressed_blue_alt.png
deleted file mode 100644
index e796d551f..000000000
Binary files a/astrid/src/main/res/drawable/btn_dismiss_pressed_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator.xml b/astrid/src/main/res/drawable/custom_tab_indicator.xml
deleted file mode 100644
index 58903a5a1..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator.xml
+++ /dev/null
@@ -1,22 +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_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_layer" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_alt.xml b/astrid/src/main/res/drawable/custom_tab_indicator_alt.xml
deleted file mode 100644
index c190d8b34..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator_alt.xml
+++ /dev/null
@@ -1,22 +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_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_alt" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_alt_layer" />
-    
-</selector>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark.xml
deleted file mode 100644
index 68e6f4433..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator_dark.xml
+++ /dev/null
@@ -1,22 +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_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected_layer" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue.xml
deleted file mode 100644
index 2d7df74aa..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue.xml
+++ /dev/null
@@ -1,22 +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_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_unselected" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_selected_layer" />
-
-</selector>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected.9.png
deleted file mode 100644
index 899ea8e53..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml
deleted file mode 100644
index ad3816270..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/task_edit_background_white"/>
-    <item android:drawable="@drawable/custom_tab_indicator_dark_blue_selected"/>
-</layer-list>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png
deleted file mode 100644
index ba05ffda2..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_dark_blue_unselected.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected.9.png
deleted file mode 100644
index c62167dc0..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected_layer.xml
deleted file mode 100644
index 4d7ac0de9..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator_dark_selected_layer.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/task_edit_background"/>
-    <item android:drawable="@drawable/custom_tab_indicator_dark_selected"/>    
-
-</layer-list>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_dark_unselected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_dark_unselected.9.png
deleted file mode 100644
index 2af0e8704..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_dark_unselected.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_selected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_selected.9.png
deleted file mode 100644
index db329b874..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_selected.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt.9.png
deleted file mode 100644
index 0a1dc8e86..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt_layer.xml
deleted file mode 100644
index c8ddaef23..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator_selected_alt_layer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/task_edit_background_white"/>
-    <item android:drawable="@drawable/custom_tab_indicator_selected_alt"/>
-</layer-list>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_selected_layer.xml b/astrid/src/main/res/drawable/custom_tab_indicator_selected_layer.xml
deleted file mode 100644
index 9e1737c44..000000000
--- a/astrid/src/main/res/drawable/custom_tab_indicator_selected_layer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/task_edit_background_white"/>
-    <item android:drawable="@drawable/custom_tab_indicator_selected"/>
-</layer-list>
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_unselected.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_unselected.9.png
deleted file mode 100644
index efe783235..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_unselected.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/custom_tab_indicator_unselected_alt.9.png b/astrid/src/main/res/drawable/custom_tab_indicator_unselected_alt.9.png
deleted file mode 100644
index 5b0dc016c..000000000
Binary files a/astrid/src/main/res/drawable/custom_tab_indicator_unselected_alt.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/ic_menu_list_copy_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_list_copy_blue_alt.png
deleted file mode 100644
index 047fc80c1..000000000
Binary files a/astrid/src/main/res/drawable/ic_menu_list_copy_blue_alt.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_arrow_left_white.png b/astrid/src/main/res/drawable/icn_arrow_left_white.png
deleted file mode 100644
index 8eeb9d220..000000000
Binary files a/astrid/src/main/res/drawable/icn_arrow_left_white.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_arrow_right_white.png b/astrid/src/main/res/drawable/icn_arrow_right_white.png
deleted file mode 100644
index 5b40260f8..000000000
Binary files a/astrid/src/main/res/drawable/icn_arrow_right_white.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_edit_calendar.png b/astrid/src/main/res/drawable/icn_edit_calendar.png
deleted file mode 100644
index c52b2f525..000000000
Binary files a/astrid/src/main/res/drawable/icn_edit_calendar.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_edit_repeats.png b/astrid/src/main/res/drawable/icn_edit_repeats.png
deleted file mode 100644
index 66df80614..000000000
Binary files a/astrid/src/main/res/drawable/icn_edit_repeats.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_edit_repeats_blue.png b/astrid/src/main/res/drawable/icn_edit_repeats_blue.png
deleted file mode 100644
index 9055f89a2..000000000
Binary files a/astrid/src/main/res/drawable/icn_edit_repeats_blue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_edit_repeats_dark_blue.png b/astrid/src/main/res/drawable/icn_edit_repeats_dark_blue.png
deleted file mode 100644
index 59f9bf1c4..000000000
Binary files a/astrid/src/main/res/drawable/icn_edit_repeats_dark_blue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_edit_repeats_red.png b/astrid/src/main/res/drawable/icn_edit_repeats_red.png
deleted file mode 100644
index 80877cd69..000000000
Binary files a/astrid/src/main/res/drawable/icn_edit_repeats_red.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_edit_repeats_white.png b/astrid/src/main/res/drawable/icn_edit_repeats_white.png
deleted file mode 100644
index 7777c2bcf..000000000
Binary files a/astrid/src/main/res/drawable/icn_edit_repeats_white.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/icn_friends.png b/astrid/src/main/res/drawable/icn_friends.png
deleted file mode 100644
index d70a0876b..000000000
Binary files a/astrid/src/main/res/drawable/icn_friends.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/list_arrow_down.png b/astrid/src/main/res/drawable/list_arrow_down.png
deleted file mode 100644
index a0caa1517..000000000
Binary files a/astrid/src/main/res/drawable/list_arrow_down.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/notif_c2dm_assign.png b/astrid/src/main/res/drawable/notif_c2dm_assign.png
deleted file mode 100644
index 7000e4706..000000000
Binary files a/astrid/src/main/res/drawable/notif_c2dm_assign.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/notif_c2dm_done.png b/astrid/src/main/res/drawable/notif_c2dm_done.png
deleted file mode 100644
index 2e396ae7d..000000000
Binary files a/astrid/src/main/res/drawable/notif_c2dm_done.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/notif_c2dm_msg.png b/astrid/src/main/res/drawable/notif_c2dm_msg.png
deleted file mode 100644
index 3505a257c..000000000
Binary files a/astrid/src/main/res/drawable/notif_c2dm_msg.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/pdv_body.png b/astrid/src/main/res/drawable/pdv_body.png
deleted file mode 100644
index 5ff141418..000000000
Binary files a/astrid/src/main/res/drawable/pdv_body.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/people_menu_button_blue_alt_on.png b/astrid/src/main/res/drawable/people_menu_button_blue_alt_on.png
deleted file mode 100644
index f28f18989..000000000
Binary files a/astrid/src/main/res/drawable/people_menu_button_blue_alt_on.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/repeating_deadline.png b/astrid/src/main/res/drawable/repeating_deadline.png
deleted file mode 100644
index 8c2ec6406..000000000
Binary files a/astrid/src/main/res/drawable/repeating_deadline.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/silk_folder.png b/astrid/src/main/res/drawable/silk_folder.png
deleted file mode 100644
index 003d4546c..000000000
Binary files a/astrid/src/main/res/drawable/silk_folder.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/silk_user_gray.png b/astrid/src/main/res/drawable/silk_user_gray.png
deleted file mode 100644
index 20b8cdf7b..000000000
Binary files a/astrid/src/main/res/drawable/silk_user_gray.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/silk_user_orange.png b/astrid/src/main/res/drawable/silk_user_orange.png
deleted file mode 100644
index b818127df..000000000
Binary files a/astrid/src/main/res/drawable/silk_user_orange.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_assign.png b/astrid/src/main/res/drawable/tea_icn_assign.png
deleted file mode 100644
index 25bae4ca0..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_assign.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_assign_gray.png b/astrid/src/main/res/drawable/tea_icn_assign_gray.png
deleted file mode 100644
index d2f794b9f..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_assign_gray.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_assign_lightblue.png b/astrid/src/main/res/drawable/tea_icn_assign_lightblue.png
deleted file mode 100644
index f5f599e15..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_assign_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_priority_lightblue.png b/astrid/src/main/res/drawable/tea_icn_priority_lightblue.png
deleted file mode 100644
index dded6ac2d..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_priority_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_repeat_lightblue.png b/astrid/src/main/res/drawable/tea_icn_repeat_lightblue.png
deleted file mode 100644
index 4277c1cfe..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_repeat_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_repeat_red.png b/astrid/src/main/res/drawable/tea_icn_repeat_red.png
deleted file mode 100644
index 178b949da..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_repeat_red.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_share.png b/astrid/src/main/res/drawable/tea_icn_share.png
deleted file mode 100644
index beecc1e75..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_share.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_share_gray.png b/astrid/src/main/res/drawable/tea_icn_share_gray.png
deleted file mode 100644
index cb1b909e3..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_share_gray.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_share_lightblue.png b/astrid/src/main/res/drawable/tea_icn_share_lightblue.png
deleted file mode 100644
index 217f1edb3..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_share_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_waiting.png b/astrid/src/main/res/drawable/tea_icn_waiting.png
deleted file mode 100644
index b5dc8e7e2..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_waiting.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/tea_icn_waiting_lightblue.png b/astrid/src/main/res/drawable/tea_icn_waiting_lightblue.png
deleted file mode 100644
index 93e38e893..000000000
Binary files a/astrid/src/main/res/drawable/tea_icn_waiting_lightblue.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/wom_edit_background_white.xml b/astrid/src/main/res/drawable/wom_edit_background_white.xml
deleted file mode 100644
index 7e7bde0ea..000000000
--- a/astrid/src/main/res/drawable/wom_edit_background_white.xml
+++ /dev/null
@@ -1,24 +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" >
-            <solid
-                android:color="#aaa"/>
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-    <item android:bottom="2px" android:right="1px" android:top="1px" android:left="1px">
-        <shape android:shape="rectangle" >
-            <solid android:color="#ddd" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/astrid/src/main/res/layout/assigned_adapter_row.xml b/astrid/src/main/res/layout/assigned_adapter_row.xml
deleted file mode 100644
index 98ceb0742..000000000
--- a/astrid/src/main/res/layout/assigned_adapter_row.xml
+++ /dev/null
@@ -1,33 +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. 
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/org.tasks"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="8dip"
-    android:gravity="center_vertical">
-
-    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/person_image"
-        android:layout_width="44dip"
-        android:layout_height="44dip"
-        android:gravity="center"
-        android:layout_gravity="center_vertical"
-        android:scaleType="fitCenter"
-        astrid:defaultSrc="@drawable/icn_default_person_image" />
-	<CheckedTextView
-		android:id="@android:id/text1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		style="@style/TextAppearance.TEA_assigned"
-		android:textColor="?attr/asTextColor"
-		android:gravity="center_vertical"
-		android:checkMark="?android:attr/listChoiceIndicatorSingle"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
-	    android:layout_toRightOf="@id/person_image"/>
-
-</LinearLayout>
diff --git a/astrid/src/main/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml
index 33eb33d7e..8095a6781 100644
--- a/astrid/src/main/res/values/attrs.xml
+++ b/astrid/src/main/res/values/attrs.xml
@@ -10,7 +10,6 @@
   <attr name="asContentBackground" format="color"/>
   <attr name="asEditBackground" format="color"/>
   <attr name="asEditRowBackground" format="reference"/>
-  <attr name="asEditTabBackground" format="reference"/>
   <attr name="asHeaderBackground" format="reference"/>
   <attr name="asHeaderButtonBackground" format="reference"/>
   <attr name="asTextColor" format="color"/>
diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml
index 6cd8ffc82..fa0b4e572 100644
--- a/astrid/src/main/res/values/styles.xml
+++ b/astrid/src/main/res/values/styles.xml
@@ -28,7 +28,6 @@
         <item name="asEditTextBackground">@null</item>
         <item name="asEditBackground">#101010</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
-        <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
         <item name="asMainMenu">@drawable/menu_button_blue</item>
         <item name="asPeopleMenu">@drawable/people_menu_button_blue</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
@@ -98,7 +97,6 @@
         <item name="asAddButtonImg">@drawable/plus_button_red</item>
         <item name="asMicButtonImg">@drawable/mic_button_red</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
-        <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <item name="asMainMenu">@drawable/menu_button_red</item>
         <item name="asPeopleMenu">@drawable/people_menu_button_red</item>
         <item name="asThemeTextColor">@color/red_theme_color</item>
@@ -135,7 +133,6 @@
         <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="asEditTabBackground">@drawable/custom_tab_indicator_dark_blue</item>
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White.Blue</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.White.Blue</item>
     </style>
@@ -156,7 +153,6 @@
         <item name="asPeopleMenu">@drawable/people_menu_button_blue</item>
         <item name="asMainMenu">@drawable/menu_button_blue_alt</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_blue_alt</item>
-        <item name="asEditTabBackground">@drawable/custom_tab_indicator_alt</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
         <item name="asAbBackgroundColor">#eee</item>
         <item name="asHeaderTextColor">@android:color/white</item>
diff --git a/bin/find-unused-drawables.sh b/bin/find-unused-drawables.sh
index 185c331ac..b0d491717 100755
--- a/bin/find-unused-drawables.sh
+++ b/bin/find-unused-drawables.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
-#PATH="../astrid/res/drawable"
-for file in $(ls -l ../astrid/res/drawable | awk '{ print $9}' | sed 's/\..\+//g'); do 
-    if [ ! -f ../astrid/res/drawable/${file} ]; then
+DIR="../astrid/src/main/res/drawable"
+for file in $(ls -l ${DIR} | awk '{ print $9}' | sed 's/\..\+//g'); do
+    if [ ! -f ${DIR}/${file} ]; then
+        echo "ignoring ${file}"
         continue
     fi;
     filename=`basename ${file}`
-    filename=${filename%.*}
+    filename=${filename%%.*}
     git grep -q ${filename} ..
     if [ $? -ne 0 ]; then
         echo -e "${file} not used"
     fi;
 done;
-        #let "count+=$(grep -c @drawable/$file $SRCFILE)"; 
-        #let "count+=$(grep -c R.drawable.$file $SRCFILE)"; 
+        #let "count+=$(grep -c @drawable/$file $SRCFILE)";
+        #let "count+=$(grep -c R.drawable.$file $SRCFILE)";
diff --git a/bin/find-unused-layouts.sh b/bin/find-unused-layouts.sh
index a7c4eed25..5b87359fc 100755
--- a/bin/find-unused-layouts.sh
+++ b/bin/find-unused-layouts.sh
@@ -2,8 +2,8 @@
 PROJECT=$(cd `dirname $0`/..; pwd)
 pushd ${PROJECT}
 echo ${PROJECT}
-path=astrid/res/layout
-for file in $(ls -l ${path} | awk '{ print $9}' | sed 's/\..\+//g'); do 
+path=astrid/src/main/res/layout
+for file in $(ls -l ${path} | awk '{ print $9}' | sed 's/\..\+//g'); do
     if [ ! -f ${path}/${file} ]; then
         continue
     fi;
@@ -13,5 +13,5 @@ for file in $(ls -l ${path} | awk '{ print $9}' | sed 's/\..\+//g'); do
     if [ $? -ne 0 ]; then
         echo -e "${file} not used"
     fi;
-done; 
+done;
 popd