103 files changed, 7 insertions, 133 deletions

diff --git a/res/drawable-v21/ic_archive_wht_24dp.xml b/res/drawable-anydpi-v21/ic_archive_wht_24dp.xml
index 377764938..377764938 100644
--- a/res/drawable-v21/ic_archive_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_archive_wht_24dp.xml
diff --git a/res/drawable-v21/ic_arrow_back_24dp.xml b/res/drawable-anydpi-v21/ic_arrow_back_24dp.xml
index 170de0c90..170de0c90 100644
--- a/res/drawable-v21/ic_arrow_back_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_arrow_back_24dp.xml
diff --git a/res/drawable-v21/ic_arrow_back_wht_24dp.xml b/res/drawable-anydpi-v21/ic_arrow_back_wht_24dp.xml
index 22925c279..22925c279 100644
--- a/res/drawable-v21/ic_arrow_back_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_arrow_back_wht_24dp.xml
diff --git a/res/drawable-v21/ic_attach_file_wht_24dp.xml b/res/drawable-anydpi-v21/ic_attach_file_wht_24dp.xml
index b51492a2b..b51492a2b 100644
--- a/res/drawable-v21/ic_attach_file_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_attach_file_wht_24dp.xml
diff --git a/res/drawable-v21/ic_cancel_24dp.xml b/res/drawable-anydpi-v21/ic_cancel_24dp.xml
index 0e5c113ff..0e5c113ff 100644
--- a/res/drawable-v21/ic_cancel_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_cancel_24dp.xml
diff --git a/res/drawable-v21/ic_cancel_wht_24dp.xml b/res/drawable-anydpi-v21/ic_cancel_wht_24dp.xml
index fe62a2bb5..fe62a2bb5 100644
--- a/res/drawable-v21/ic_cancel_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_cancel_wht_24dp.xml
diff --git a/res/drawable-v21/ic_check_24dp.xml b/res/drawable-anydpi-v21/ic_check_24dp.xml
index 53f0018a6..53f0018a6 100644
--- a/res/drawable-v21/ic_check_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_check_24dp.xml
diff --git a/res/drawable-v21/ic_close_24dp.xml b/res/drawable-anydpi-v21/ic_close_24dp.xml
index 3d2f35316..3d2f35316 100644
--- a/res/drawable-v21/ic_close_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_close_24dp.xml
diff --git a/res/drawable-v21/ic_close_wht_24dp.xml b/res/drawable-anydpi-v21/ic_close_wht_24dp.xml
index 61fcb174c..61fcb174c 100644
--- a/res/drawable-v21/ic_close_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_close_wht_24dp.xml
diff --git a/res/drawable-v21/ic_cv_loading_24dp.xml b/res/drawable-anydpi-v21/ic_cv_loading_24dp.xml
index 34a770dc4..34a770dc4 100644
--- a/res/drawable-v21/ic_cv_loading_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_cv_loading_24dp.xml
diff --git a/res/drawable-v21/ic_delete_wht_24dp.xml b/res/drawable-anydpi-v21/ic_delete_wht_24dp.xml
index 8cd047f8b..8cd047f8b 100644
--- a/res/drawable-v21/ic_delete_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_delete_wht_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_accnt_check_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_accnt_check_24dp.xml
index 0cf223762..0cf223762 100644
--- a/res/drawable-v21/ic_drawer_accnt_check_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_accnt_check_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_drafts_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_drafts_24dp.xml
index b7978f4ed..b7978f4ed 100644
--- a/res/drawable-v21/ic_drawer_drafts_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_drafts_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_folder_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_folder_24dp.xml
index dce6bb0de..dce6bb0de 100644
--- a/res/drawable-v21/ic_drawer_folder_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_folder_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_help_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_help_24dp.xml
index 27cb28c81..27cb28c81 100644
--- a/res/drawable-v21/ic_drawer_help_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_help_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_inbox_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_inbox_24dp.xml
index c8b53edb9..c8b53edb9 100644
--- a/res/drawable-v21/ic_drawer_inbox_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_inbox_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_outbox_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_outbox_24dp.xml
index 83ba35e53..83ba35e53 100644
--- a/res/drawable-v21/ic_drawer_outbox_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_outbox_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_sent_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_sent_24dp.xml
index b7dd43952..b7dd43952 100644
--- a/res/drawable-v21/ic_drawer_sent_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_sent_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_settings_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_settings_24dp.xml
index 1bd6c19ec..1bd6c19ec 100644
--- a/res/drawable-v21/ic_drawer_settings_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_settings_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_starred_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_starred_24dp.xml
index c2b807650..c2b807650 100644
--- a/res/drawable-v21/ic_drawer_starred_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_starred_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_trash_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_trash_24dp.xml
index 3e87cf92a..3e87cf92a 100644
--- a/res/drawable-v21/ic_drawer_trash_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_trash_24dp.xml
diff --git a/res/drawable-v21/ic_drawer_unread_24dp.xml b/res/drawable-anydpi-v21/ic_drawer_unread_24dp.xml
index dd0698512..dd0698512 100644
--- a/res/drawable-v21/ic_drawer_unread_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drawer_unread_24dp.xml
diff --git a/res/drawable-v21/ic_drop_down_24dp.xml b/res/drawable-anydpi-v21/ic_drop_down_24dp.xml
index f6234beab..f6234beab 100644
--- a/res/drawable-v21/ic_drop_down_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drop_down_24dp.xml
diff --git a/res/drawable-v21/ic_drop_up_24dp.xml b/res/drawable-anydpi-v21/ic_drop_up_24dp.xml
index 5ec36b703..5ec36b703 100644
--- a/res/drawable-v21/ic_drop_up_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_drop_up_24dp.xml
diff --git a/res/drawable-v21/ic_empty_default.xml b/res/drawable-anydpi-v21/ic_empty_default.xml
index ab49e8dc9..ab49e8dc9 100644
--- a/res/drawable-v21/ic_empty_default.xml
+++ b/res/drawable-anydpi-v21/ic_empty_default.xml
diff --git a/res/drawable-v21/ic_empty_inbox.xml b/res/drawable-anydpi-v21/ic_empty_inbox.xml
index 5006751b1..5006751b1 100644
--- a/res/drawable-v21/ic_empty_inbox.xml
+++ b/res/drawable-anydpi-v21/ic_empty_inbox.xml
diff --git a/res/drawable-v21/ic_empty_search.xml b/res/drawable-anydpi-v21/ic_empty_search.xml
index 98216aa9f..98216aa9f 100644
--- a/res/drawable-v21/ic_empty_search.xml
+++ b/res/drawable-anydpi-v21/ic_empty_search.xml
diff --git a/res/drawable-v21/ic_empty_spam.xml b/res/drawable-anydpi-v21/ic_empty_spam.xml
index 4dbaf5353..4dbaf5353 100644
--- a/res/drawable-v21/ic_empty_spam.xml
+++ b/res/drawable-anydpi-v21/ic_empty_spam.xml
diff --git a/res/drawable-v21/ic_empty_trash.xml b/res/drawable-anydpi-v21/ic_empty_trash.xml
index 9cfc6e8ae..9cfc6e8ae 100644
--- a/res/drawable-v21/ic_empty_trash.xml
+++ b/res/drawable-anydpi-v21/ic_empty_trash.xml
diff --git a/res/drawable-v21/ic_expand_more_24dp.xml b/res/drawable-anydpi-v21/ic_expand_more_24dp.xml
index f394179e9..f394179e9 100644
--- a/res/drawable-v21/ic_expand_more_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_expand_more_24dp.xml
diff --git a/res/drawable-v21/ic_folder_parent_24dp.xml b/res/drawable-anydpi-v21/ic_folder_parent_24dp.xml
index 4a26931ac..4a26931ac 100644
--- a/res/drawable-v21/ic_folder_parent_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_folder_parent_24dp.xml
diff --git a/res/drawable-v21/ic_forward_24dp.xml b/res/drawable-anydpi-v21/ic_forward_24dp.xml
index bbc93883a..bbc93883a 100644
--- a/res/drawable-v21/ic_forward_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_forward_24dp.xml
diff --git a/res/drawable-v21/ic_history_24dp.xml b/res/drawable-anydpi-v21/ic_history_24dp.xml
index 156410661..156410661 100644
--- a/res/drawable-v21/ic_history_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_history_24dp.xml
diff --git a/res/drawable-v21/ic_mark_read_wht_24dp.xml b/res/drawable-anydpi-v21/ic_mark_read_wht_24dp.xml
index db6222bf9..db6222bf9 100644
--- a/res/drawable-v21/ic_mark_read_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_mark_read_wht_24dp.xml
diff --git a/res/drawable-v21/ic_mark_unread_wht_24dp.xml b/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
index dd0698512..1129c076b 100644
--- a/res/drawable-v21/ic_mark_unread_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
@@ -19,6 +19,6 @@ Copyright (C) 2014 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#8a000000"
+        android:fillColor="#ffffffff"
         android:pathData="M22.0,8.0c0.0,-0.7 -0.4,-1.3 -0.9,-1.7L12.0,1.0L2.9,6.3C2.4,6.7 2.0,7.3 2.0,8.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l16.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,8.0zM12.0,13.0L3.7,7.8L12.0,3.0l8.3,4.8L12.0,13.0z"/>
 </vector>
diff --git a/res/drawable-v21/ic_menu_search.xml b/res/drawable-anydpi-v21/ic_menu_search.xml
index 4ea382a83..4ea382a83 100644
--- a/res/drawable-v21/ic_menu_search.xml
+++ b/res/drawable-anydpi-v21/ic_menu_search.xml
diff --git a/res/drawable-v21/ic_menu_wht_24dp.xml b/res/drawable-anydpi-v21/ic_menu_wht_24dp.xml
index 6122e6f1f..6122e6f1f 100644
--- a/res/drawable-v21/ic_menu_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_menu_wht_24dp.xml
diff --git a/res/drawable-v21/ic_mic_24dp.xml b/res/drawable-anydpi-v21/ic_mic_24dp.xml
index fdb6126dc..fdb6126dc 100644
--- a/res/drawable-v21/ic_mic_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_mic_24dp.xml
diff --git a/res/drawable-v21/ic_mic_wht_24dp.xml b/res/drawable-anydpi-v21/ic_mic_wht_24dp.xml
index e4bd31854..e4bd31854 100644
--- a/res/drawable-v21/ic_mic_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_mic_wht_24dp.xml
diff --git a/res/drawable-v21/ic_move_to_inbox_wht_24dp.xml b/res/drawable-anydpi-v21/ic_move_to_inbox_wht_24dp.xml
index 7d5aac06f..7d5aac06f 100644
--- a/res/drawable-v21/ic_move_to_inbox_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_move_to_inbox_wht_24dp.xml
diff --git a/res/drawable-v21/ic_move_to_wht_24dp.xml b/res/drawable-anydpi-v21/ic_move_to_wht_24dp.xml
index 3be9cc088..3be9cc088 100644
--- a/res/drawable-v21/ic_move_to_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_move_to_wht_24dp.xml
diff --git a/res/drawable-v21/ic_next_24dp.xml b/res/drawable-anydpi-v21/ic_next_24dp.xml
index 91577e1a7..91577e1a7 100644
--- a/res/drawable-v21/ic_next_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_next_24dp.xml
diff --git a/res/drawable-v21/ic_notification_anonymous_avatar_32dp.xml b/res/drawable-anydpi-v21/ic_notification_anonymous_avatar_32dp.xml
index 45c520744..45c520744 100644
--- a/res/drawable-v21/ic_notification_anonymous_avatar_32dp.xml
+++ b/res/drawable-anydpi-v21/ic_notification_anonymous_avatar_32dp.xml
diff --git a/res/drawable-v21/ic_overflow_24dp.xml b/res/drawable-anydpi-v21/ic_overflow_24dp.xml
index e06a4b7ad..e06a4b7ad 100644
--- a/res/drawable-v21/ic_overflow_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_overflow_24dp.xml
diff --git a/res/drawable-v21/ic_pencil_24dp.xml b/res/drawable-anydpi-v21/ic_pencil_24dp.xml
index 929229fe5..929229fe5 100644
--- a/res/drawable-v21/ic_pencil_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_pencil_24dp.xml
diff --git a/res/drawable-v21/ic_pencil_wht_24dp.xml b/res/drawable-anydpi-v21/ic_pencil_wht_24dp.xml
index fbefd3a66..fbefd3a66 100644
--- a/res/drawable-v21/ic_pencil_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_pencil_wht_24dp.xml
diff --git a/res/drawable-v21/ic_remove_label_wht_24dp.xml b/res/drawable-anydpi-v21/ic_remove_label_wht_24dp.xml
index a5aae7e7b..a5aae7e7b 100644
--- a/res/drawable-v21/ic_remove_label_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_remove_label_wht_24dp.xml
diff --git a/res/drawable-v21/ic_reply_24dp.xml b/res/drawable-anydpi-v21/ic_reply_24dp.xml
index 79f8a781a..79f8a781a 100644
--- a/res/drawable-v21/ic_reply_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_reply_24dp.xml
diff --git a/res/drawable-v21/ic_reply_all_24dp.xml b/res/drawable-anydpi-v21/ic_reply_all_24dp.xml
index 6ed312a54..6ed312a54 100644
--- a/res/drawable-v21/ic_reply_all_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_reply_all_24dp.xml
diff --git a/res/drawable-v21/ic_reply_all_wht_24dp.xml b/res/drawable-anydpi-v21/ic_reply_all_wht_24dp.xml
index 411d302a3..411d302a3 100644
--- a/res/drawable-v21/ic_reply_all_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_reply_all_wht_24dp.xml
diff --git a/res/drawable-v21/ic_reply_wht_24dp.xml b/res/drawable-anydpi-v21/ic_reply_wht_24dp.xml
index 1086f97f6..1086f97f6 100644
--- a/res/drawable-v21/ic_reply_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_reply_wht_24dp.xml
diff --git a/res/drawable-v21/ic_send_wht_24dp.xml b/res/drawable-anydpi-v21/ic_send_wht_24dp.xml
index f522da2cc..f522da2cc 100644
--- a/res/drawable-v21/ic_send_wht_24dp.xml
+++ b/res/drawable-anydpi-v21/ic_send_wht_24dp.xml
diff --git a/res/drawable-v21/ic_warning_56dp.xml b/res/drawable-anydpi-v21/ic_warning_56dp.xml
index c84680757..c84680757 100644
--- a/res/drawable-v21/ic_warning_56dp.xml
+++ b/res/drawable-anydpi-v21/ic_warning_56dp.xml
diff --git a/res/drawable-hdpi/ic_folder_parent_24dp.png b/res/drawable-hdpi/ic_folder_parent_24dp.png
index 5b709603a..3a5ced895 100644
--- a/res/drawable-hdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-hdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-hdpi/ic_notification_mail_24dp.png b/res/drawable-hdpi/ic_notification_mail_wht_24dp.png
index d40e2fe1e..d40e2fe1e 100644
--- a/res/drawable-hdpi/ic_notification_mail_24dp.png
+++ b/res/drawable-hdpi/ic_notification_mail_wht_24dp.png
diff --git a/res/drawable-hdpi/ic_notification_multiple_mail_24dp.png b/res/drawable-hdpi/ic_notification_multiple_mail_wht_24dp.png
index a733c2add..a733c2add 100644
--- a/res/drawable-hdpi/ic_notification_multiple_mail_24dp.png
+++ b/res/drawable-hdpi/ic_notification_multiple_mail_wht_24dp.png
diff --git a/res/drawable-mdpi/ic_folder_parent_24dp.png b/res/drawable-mdpi/ic_folder_parent_24dp.png
index 87bd54783..732cb77ed 100644
--- a/res/drawable-mdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-mdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-mdpi/ic_notification_mail_24dp.png b/res/drawable-mdpi/ic_notification_mail_wht_24dp.png
index 86e06b9c3..86e06b9c3 100644
--- a/res/drawable-mdpi/ic_notification_mail_24dp.png
+++ b/res/drawable-mdpi/ic_notification_mail_wht_24dp.png
diff --git a/res/drawable-mdpi/ic_notification_multiple_mail_24dp.png b/res/drawable-mdpi/ic_notification_multiple_mail_wht_24dp.png
index 8071c272d..8071c272d 100644
--- a/res/drawable-mdpi/ic_notification_multiple_mail_24dp.png
+++ b/res/drawable-mdpi/ic_notification_multiple_mail_wht_24dp.png
diff --git a/res/drawable-v21/ic_check_wht_24dp.xml b/res/drawable-v21/ic_check_wht_24dp.xml
deleted file mode 100644
index fa02710b8..000000000
--- a/res/drawable-v21/ic_check_wht_24dp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-Copyright (C) 2014 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M0 0h24v24h-24z"
-        android:fillColor="#00000000"/>
-    <path
-        android:fillColor="#ffffffff"
-        android:pathData="M9.0,16.17l-4.17,-4.17 -1.42,1.41 5.59,5.59 12.0,-12.0 -1.41,-1.41z"/>
-</vector>
diff --git a/res/drawable-v21/ic_notification_mail_24dp.xml b/res/drawable-v21/ic_notification_mail_24dp.xml
deleted file mode 100644
index 7fdf07e4f..000000000
--- a/res/drawable-v21/ic_notification_mail_24dp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2014 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#ffffffff"
-        android:pathData="M20.0,4.0L4.0,4.0C2.9,4.0 2.0,4.9 2.0,6.0l0.0,12.0c0.0,1.1 0.9,2.0 2.0,2.0l16.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,6.0C22.0,4.9 21.1,4.0 20.0,4.0zM20.0,18.0l-2.0,0.0L18.0,9.2L12.0,13.0L6.0,9.2L6.0,18.0L4.0,18.0L4.0,6.0l1.2,0.0l6.8,4.2L18.8,6.0L20.0,6.0L20.0,18.0z"/>
-</vector>
diff --git a/res/drawable-v21/ic_notification_multiple_mail_24dp.xml b/res/drawable-v21/ic_notification_multiple_mail_24dp.xml
deleted file mode 100644
index 2c24e3fd5..000000000
--- a/res/drawable-v21/ic_notification_multiple_mail_24dp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-Copyright (C) 2014 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#8a000000"
-        android:pathData="M2.0,6.033888L2.0,18.0C2.0,19.104 2.896,20.0 4.0,20.0L20.978577,20.0L20.978577,18.0L4.0,18.0L4.0,6.033888L2.0,6.033888Z"/>
-    <path
-        android:fillColor="#8a000000"
-        android:pathData="M20.3,3.0L6.7,3.0C5.761175,3.0 5.008925,3.7835624 5.008925,4.75L5.0,15.25C5.0,16.216438 5.761175,17.0 6.7,17.0L20.3,17.0C21.238825,17.0 22.0,16.216438 22.0,15.25L22.0,4.75C22.0,3.7835624 21.238825,3.0 20.3,3.0L20.3,3.0ZM18.5,15.0L18.5,6.9974947L13.5,10.5L8.5,6.9974947L8.5,15.0L7.0,15.0L7.0,5.0L8.5,5.0L13.5,8.5L18.5,5.0L20.0,5.0L20.0,15.0L18.5,15.0Z"/>
-</vector>
diff --git a/res/drawable-v21/ic_star_20dp.xml b/res/drawable-v21/ic_star_20dp.xml
deleted file mode 100644
index b2cc432e5..000000000
--- a/res/drawable-v21/ic_star_20dp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2014 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20.0dp"
-        android:height="20.0dp"
-        android:viewportWidth="20.0"
-        android:viewportHeight="20.0">
-    <path
-        android:fillColor="#ffFEB500"
-        android:pathData="M10.0,0.0L7.192,6.9757895L0.0,7.625263L5.455,12.601052L3.82,20.0L10.0,16.07579L16.18,20.0L14.545,12.601052L20.0,7.625263L12.809,6.9757895L10.0,0.0"/>
-</vector>
diff --git a/res/drawable-v21/ic_star_outline_20dp.xml b/res/drawable-v21/ic_star_outline_20dp.xml
deleted file mode 100644
index 454d0372a..000000000
--- a/res/drawable-v21/ic_star_outline_20dp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Copyright (C) 2014 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20.0dp"
-        android:height="20.0dp"
-        android:viewportWidth="20.0"
-        android:viewportHeight="20.0">
-    <path
-        android:fillColor="#33000000"
-        android:pathData="M10.0,0.0L7.192,6.9757895L0.0,7.625263L5.455,12.601052L3.82,20.0L10.0,16.07579L16.18,20.0L14.545,12.601052L20.0,7.625263L12.809,6.9757895L10.0,0.0"/>
-</vector>
diff --git a/res/drawable-xhdpi/ic_folder_parent_24dp.png b/res/drawable-xhdpi/ic_folder_parent_24dp.png
index a4133b170..29a83d322 100644
--- a/res/drawable-xhdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-xhdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-xhdpi/ic_notification_mail_24dp.png b/res/drawable-xhdpi/ic_notification_mail_wht_24dp.png
index 0317760ee..0317760ee 100644
--- a/res/drawable-xhdpi/ic_notification_mail_24dp.png
+++ b/res/drawable-xhdpi/ic_notification_mail_wht_24dp.png
diff --git a/res/drawable-xhdpi/ic_notification_multiple_mail_24dp.png b/res/drawable-xhdpi/ic_notification_multiple_mail_wht_24dp.png
index 03bf26cec..03bf26cec 100644
--- a/res/drawable-xhdpi/ic_notification_multiple_mail_24dp.png
+++ b/res/drawable-xhdpi/ic_notification_multiple_mail_wht_24dp.png
diff --git a/res/drawable-xxhdpi/ic_folder_parent_24dp.png b/res/drawable-xxhdpi/ic_folder_parent_24dp.png
index 19f2e4be6..c94acd240 100644
--- a/res/drawable-xxhdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-xxhdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-xxhdpi/ic_notification_mail_24dp.png b/res/drawable-xxhdpi/ic_notification_mail_wht_24dp.png
index ba98c67a9..ba98c67a9 100644
--- a/res/drawable-xxhdpi/ic_notification_mail_24dp.png
+++ b/res/drawable-xxhdpi/ic_notification_mail_wht_24dp.png
diff --git a/res/drawable-xxhdpi/ic_notification_multiple_mail_24dp.png b/res/drawable-xxhdpi/ic_notification_multiple_mail_wht_24dp.png
index 67dcf5c20..67dcf5c20 100644
--- a/res/drawable-xxhdpi/ic_notification_multiple_mail_24dp.png
+++ b/res/drawable-xxhdpi/ic_notification_multiple_mail_wht_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_attach_file_wht_24dp.png b/res/drawable-xxxhdpi/ic_attach_file_wht_24dp.png
deleted file mode 100644
index 7ac13a195..000000000
--- a/res/drawable-xxxhdpi/ic_attach_file_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_cancel_24dp.png b/res/drawable-xxxhdpi/ic_cancel_24dp.png
deleted file mode 100644
index 1e3c5c124..000000000
--- a/res/drawable-xxxhdpi/ic_cancel_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_check_24dp.png b/res/drawable-xxxhdpi/ic_check_24dp.png
deleted file mode 100644
index 73c945a7e..000000000
--- a/res/drawable-xxxhdpi/ic_check_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_close_24dp.png b/res/drawable-xxxhdpi/ic_close_24dp.png
deleted file mode 100644
index cb7a27ca8..000000000
--- a/res/drawable-xxxhdpi/ic_close_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_close_wht_24dp.png b/res/drawable-xxxhdpi/ic_close_wht_24dp.png
deleted file mode 100644
index 81f51a3f2..000000000
--- a/res/drawable-xxxhdpi/ic_close_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_cv_loading_24dp.png b/res/drawable-xxxhdpi/ic_cv_loading_24dp.png
deleted file mode 100644
index 53490758e..000000000
--- a/res/drawable-xxxhdpi/ic_cv_loading_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png b/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png
deleted file mode 100644
index 96191150a..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png b/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png
deleted file mode 100644
index a2a58be39..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png b/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png
deleted file mode 100644
index 1bd36266f..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_help_24dp.png b/res/drawable-xxxhdpi/ic_drawer_help_24dp.png
deleted file mode 100644
index 667aea889..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_help_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png b/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png
deleted file mode 100644
index 17977510c..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png b/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png
deleted file mode 100644
index 7d1ad2910..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png b/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png
deleted file mode 100644
index 23e475e58..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png b/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png
deleted file mode 100644
index 83b92c4fa..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png b/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png
deleted file mode 100644
index d1b77caf8..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png b/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png
deleted file mode 100644
index 3bf1f7e8e..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png b/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png
deleted file mode 100644
index a36596d65..000000000
--- a/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drop_down_24dp.png b/res/drawable-xxxhdpi/ic_drop_down_24dp.png
deleted file mode 100644
index 8f918b2fd..000000000
--- a/res/drawable-xxxhdpi/ic_drop_down_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drop_up_24dp.png b/res/drawable-xxxhdpi/ic_drop_up_24dp.png
deleted file mode 100644
index 3d0e5cc14..000000000
--- a/res/drawable-xxxhdpi/ic_drop_up_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_expand_more_24dp.png b/res/drawable-xxxhdpi/ic_expand_more_24dp.png
deleted file mode 100644
index d5a4eef29..000000000
--- a/res/drawable-xxxhdpi/ic_expand_more_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_folder_parent_24dp.png b/res/drawable-xxxhdpi/ic_folder_parent_24dp.png
deleted file mode 100644
index d218c6c4d..000000000
--- a/res/drawable-xxxhdpi/ic_folder_parent_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_mark_read_wht_24dp.png b/res/drawable-xxxhdpi/ic_mark_read_wht_24dp.png
deleted file mode 100644
index fc9c3e58d..000000000
--- a/res/drawable-xxxhdpi/ic_mark_read_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_mark_unread_wht_24dp.png b/res/drawable-xxxhdpi/ic_mark_unread_wht_24dp.png
deleted file mode 100644
index 50c1d6912..000000000
--- a/res/drawable-xxxhdpi/ic_mark_unread_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_menu_search.png b/res/drawable-xxxhdpi/ic_menu_search.png
deleted file mode 100644
index 9b6da5705..000000000
--- a/res/drawable-xxxhdpi/ic_menu_search.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_menu_wht_24dp.png b/res/drawable-xxxhdpi/ic_menu_wht_24dp.png
deleted file mode 100644
index fa8e6dee6..000000000
--- a/res/drawable-xxxhdpi/ic_menu_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_mic_24dp.png b/res/drawable-xxxhdpi/ic_mic_24dp.png
deleted file mode 100644
index c586bb535..000000000
--- a/res/drawable-xxxhdpi/ic_mic_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_mic_wht_24dp.png b/res/drawable-xxxhdpi/ic_mic_wht_24dp.png
deleted file mode 100644
index fe00ae5fe..000000000
--- a/res/drawable-xxxhdpi/ic_mic_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_next_24dp.png b/res/drawable-xxxhdpi/ic_next_24dp.png
deleted file mode 100644
index 4e7264d9f..000000000
--- a/res/drawable-xxxhdpi/ic_next_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_pencil_wht_24dp.png b/res/drawable-xxxhdpi/ic_pencil_wht_24dp.png
deleted file mode 100644
index 6f0622311..000000000
--- a/res/drawable-xxxhdpi/ic_pencil_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_send_wht_24dp.png b/res/drawable-xxxhdpi/ic_send_wht_24dp.png
deleted file mode 100644
index f872669e4..000000000
--- a/res/drawable-xxxhdpi/ic_send_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_warning_56dp.png b/res/drawable-xxxhdpi/ic_warning_56dp.png
deleted file mode 100644
index 65bc0fb6b..000000000
--- a/res/drawable-xxxhdpi/ic_warning_56dp.png
+++ /dev/null
diff --git a/src/com/android/mail/utils/NotificationActionUtils.java b/src/com/android/mail/utils/NotificationActionUtils.java
index 496a7deb5..6620a1317 100644
--- a/src/com/android/mail/utils/NotificationActionUtils.java
+++ b/src/com/android/mail/utils/NotificationActionUtils.java
@@ -633,7 +633,7 @@ public class NotificationActionUtils {
 
         final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
 
-        builder.setSmallIcon(R.drawable.ic_notification_mail_24dp);
+        builder.setSmallIcon(R.drawable.ic_notification_mail_wht_24dp);
         builder.setWhen(notificationAction.getWhen());
         builder.setCategory(NotificationCompat.CATEGORY_EMAIL);
 
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index f850a675f..98f334ceb 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -630,9 +630,9 @@ public class NotificationUtils {
             }
 
             if(unseenCount > 1) {
-                notification.setSmallIcon(R.drawable.ic_notification_multiple_mail_24dp);
+                notification.setSmallIcon(R.drawable.ic_notification_multiple_mail_wht_24dp);
             } else {
-                notification.setSmallIcon(R.drawable.ic_notification_mail_24dp);
+                notification.setSmallIcon(R.drawable.ic_notification_mail_wht_24dp);
             }
             notification.setTicker(account.getDisplayName());
             notification.setVisibility(NotificationCompat.VISIBILITY_PRIVATE);
@@ -868,9 +868,9 @@ public class NotificationUtils {
         if (multipleUnseen) {
             builder.setGroup(createGroupKey(account, folder));
             builder.setGroupSummary(true);
-            builder.setSmallIcon(R.drawable.ic_notification_multiple_mail_24dp);
+            builder.setSmallIcon(R.drawable.ic_notification_multiple_mail_wht_24dp);
         } else {
-            builder.setSmallIcon(R.drawable.ic_notification_mail_24dp);
+            builder.setSmallIcon(R.drawable.ic_notification_mail_wht_24dp);
         }
 
         return builder.build();
@@ -1073,7 +1073,7 @@ public class NotificationUtils {
                             conversationNotif.setCategory(NotificationCompat.CATEGORY_EMAIL);
 
                             conversationNotif.setSmallIcon(
-                                    R.drawable.ic_notification_multiple_mail_24dp);
+                                    R.drawable.ic_notification_multiple_mail_wht_24dp);
 
                             if (com.android.mail.utils.Utils.isRunningLOrLater()) {
                                 conversationNotif.setColor(