diff --git a/res/drawable-hdpi/ic_folder_drafts_holo_dark.png b/res/drawable-hdpi/ic_folder_drafts_holo_dark.png
new file mode 100644
index 000000000..0e1d69319
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_drafts_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_folder_inbox_holo_dark.png b/res/drawable-hdpi/ic_folder_inbox_holo_dark.png
new file mode 100644
index 000000000..12b094b73
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_inbox_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_folder_outbox_holo_dark.png b/res/drawable-hdpi/ic_folder_outbox_holo_dark.png
new file mode 100644
index 000000000..3a02a078a
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_outbox_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_folder_sent_holo_dark.png b/res/drawable-hdpi/ic_folder_sent_holo_dark.png
new file mode 100644
index 000000000..4aaaa2b00
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_sent_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_folder_star_holo_dark.png b/res/drawable-hdpi/ic_folder_star_holo_dark.png
new file mode 100644
index 000000000..69ffc8cdb
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_star_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_folder_star_holo_light.png b/res/drawable-hdpi/ic_folder_star_holo_light.png
new file mode 100644
index 000000000..3051ead55
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_star_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_folder_trash_holo_dark.png b/res/drawable-hdpi/ic_folder_trash_holo_dark.png
new file mode 100644
index 000000000..1e40bd1c3
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_trash_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_folder_trash_holo_light.png b/res/drawable-hdpi/ic_folder_trash_holo_light.png
new file mode 100644
index 000000000..47676f074
Binary files /dev/null and b/res/drawable-hdpi/ic_folder_trash_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_exchange_minitab_selected.png b/res/drawable-mdpi/ic_exchange_minitab_selected.png
new file mode 100644
index 000000000..ef7e11657
Binary files /dev/null and b/res/drawable-mdpi/ic_exchange_minitab_selected.png differ
diff --git a/res/drawable-mdpi/ic_exchange_selected.png b/res/drawable-mdpi/ic_exchange_selected.png
new file mode 100644
index 000000000..116340678
Binary files /dev/null and b/res/drawable-mdpi/ic_exchange_selected.png differ
diff --git a/res/drawable-mdpi/ic_folder_drafts_holo_dark.png b/res/drawable-mdpi/ic_folder_drafts_holo_dark.png
new file mode 100644
index 000000000..15ddf1ae2
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_drafts_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_folder_drafts_holo_light.png b/res/drawable-mdpi/ic_folder_drafts_holo_light.png
new file mode 100644
index 000000000..6db6c812c
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_drafts_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_folder_inbox_holo_dark.png b/res/drawable-mdpi/ic_folder_inbox_holo_dark.png
new file mode 100644
index 000000000..91f696d79
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_inbox_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_folder_inbox_holo_light.png b/res/drawable-mdpi/ic_folder_inbox_holo_light.png
new file mode 100644
index 000000000..62f67d29b
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_inbox_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_folder_outbox_holo_dark.png b/res/drawable-mdpi/ic_folder_outbox_holo_dark.png
new file mode 100644
index 000000000..0e2ee23c2
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_outbox_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_folder_outbox_holo_light.png b/res/drawable-mdpi/ic_folder_outbox_holo_light.png
new file mode 100644
index 000000000..a7039e12e
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_outbox_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_folder_sent_holo_dark.png b/res/drawable-mdpi/ic_folder_sent_holo_dark.png
new file mode 100644
index 000000000..7ae995013
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_sent_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_folder_sent_holo_light.png b/res/drawable-mdpi/ic_folder_sent_holo_light.png
new file mode 100644
index 000000000..ca93d583b
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_sent_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_folder_star_holo_dark.png b/res/drawable-mdpi/ic_folder_star_holo_dark.png
new file mode 100644
index 000000000..b0707e882
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_star_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_folder_star_holo_light.png b/res/drawable-mdpi/ic_folder_star_holo_light.png
new file mode 100644
index 000000000..e9ab7efc0
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_star_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_folder_trash_holo_dark.png b/res/drawable-mdpi/ic_folder_trash_holo_dark.png
new file mode 100644
index 000000000..76165ff70
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_trash_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_folder_trash_holo_light.png b/res/drawable-mdpi/ic_folder_trash_holo_light.png
new file mode 100644
index 000000000..7e7c3fe8a
Binary files /dev/null and b/res/drawable-mdpi/ic_folder_trash_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png b/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png
new file mode 100644
index 000000000..8071c272d
Binary files /dev/null and b/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_folder_drafts_holo_dark.png b/res/drawable-xhdpi/ic_folder_drafts_holo_dark.png
new file mode 100644
index 000000000..46db128dd
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_drafts_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_folder_inbox_holo_dark.png b/res/drawable-xhdpi/ic_folder_inbox_holo_dark.png
new file mode 100644
index 000000000..f168d66b3
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_inbox_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_folder_outbox_holo_dark.png b/res/drawable-xhdpi/ic_folder_outbox_holo_dark.png
new file mode 100644
index 000000000..629a3cc93
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_outbox_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_folder_sent_holo_dark.png b/res/drawable-xhdpi/ic_folder_sent_holo_dark.png
new file mode 100644
index 000000000..e237694a2
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_sent_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_folder_star_holo_dark.png b/res/drawable-xhdpi/ic_folder_star_holo_dark.png
new file mode 100644
index 000000000..e0473bea9
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_star_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_folder_star_holo_light.png b/res/drawable-xhdpi/ic_folder_star_holo_light.png
new file mode 100644
index 000000000..b69c03485
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_star_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_folder_trash_holo_dark.png b/res/drawable-xhdpi/ic_folder_trash_holo_dark.png
new file mode 100644
index 000000000..7f06d5897
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_trash_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_folder_trash_holo_light.png b/res/drawable-xhdpi/ic_folder_trash_holo_light.png
new file mode 100644
index 000000000..56d68fa2d
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_trash_holo_light.png differ
diff --git a/res/drawable/ic_folder_drafts.xml b/res/drawable/ic_folder_drafts.xml
new file mode 100644
index 000000000..d76a4fc04
--- /dev/null
+++ b/res/drawable/ic_folder_drafts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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_activated="true" android:drawable="@drawable/ic_folder_drafts_holo_dark" />
+    <item android:drawable="@drawable/ic_folder_drafts_holo_light" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_inbox.xml b/res/drawable/ic_folder_inbox.xml
new file mode 100644
index 000000000..521125e22
--- /dev/null
+++ b/res/drawable/ic_folder_inbox.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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_activated="true" android:drawable="@drawable/ic_folder_inbox_holo_dark" />
+    <item android:drawable="@drawable/ic_folder_inbox_holo_light" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_outbox.xml b/res/drawable/ic_folder_outbox.xml
new file mode 100644
index 000000000..aa9437a08
--- /dev/null
+++ b/res/drawable/ic_folder_outbox.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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_activated="true" android:drawable="@drawable/ic_folder_outbox_holo_dark" />
+    <item android:drawable="@drawable/ic_folder_outbox_holo_light" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_sent.xml b/res/drawable/ic_folder_sent.xml
new file mode 100644
index 000000000..68c88b1d1
--- /dev/null
+++ b/res/drawable/ic_folder_sent.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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_activated="true" android:drawable="@drawable/ic_folder_sent_holo_dark" />
+    <item android:drawable="@drawable/ic_folder_sent_holo_light" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_star.xml b/res/drawable/ic_folder_star.xml
new file mode 100644
index 000000000..d702b6fee
--- /dev/null
+++ b/res/drawable/ic_folder_star.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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_activated="true" android:drawable="@drawable/ic_folder_star_holo_dark" />
+    <item android:drawable="@drawable/ic_folder_star_holo_light" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_trash.xml b/res/drawable/ic_folder_trash.xml
new file mode 100644
index 000000000..b262f028c
--- /dev/null
+++ b/res/drawable/ic_folder_trash.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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_activated="true" android:drawable="@drawable/ic_folder_trash_holo_dark" />
+    <item android:drawable="@drawable/ic_folder_trash_holo_light" />
+</selector>
\ No newline at end of file
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 0e36a4692..b7abc9a17 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -1970,12 +1970,12 @@ public class EmailProvider extends ContentProvider {
             + " ELSE " + UIProvider.FolderType.DEFAULT + " END";
 
     private static final String FOLDER_ICON = "CASE " + MailboxColumns.TYPE
-            + " WHEN " + Mailbox.TYPE_INBOX   + " THEN " + R.drawable.ic_folder_inbox_holo_light
-            + " WHEN " + Mailbox.TYPE_DRAFTS  + " THEN " + R.drawable.ic_folder_drafts_holo_light
-            + " WHEN " + Mailbox.TYPE_OUTBOX  + " THEN " + R.drawable.ic_folder_outbox_holo_light
-            + " WHEN " + Mailbox.TYPE_SENT    + " THEN " + R.drawable.ic_folder_sent_holo_light
-            + " WHEN " + Mailbox.TYPE_TRASH   + " THEN " + R.drawable.ic_menu_trash_holo_light
-            + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_menu_star_holo_light
+            + " WHEN " + Mailbox.TYPE_INBOX   + " THEN " + R.drawable.ic_folder_inbox
+            + " WHEN " + Mailbox.TYPE_DRAFTS  + " THEN " + R.drawable.ic_folder_drafts
+            + " WHEN " + Mailbox.TYPE_OUTBOX  + " THEN " + R.drawable.ic_folder_outbox
+            + " WHEN " + Mailbox.TYPE_SENT    + " THEN " + R.drawable.ic_folder_sent
+            + " WHEN " + Mailbox.TYPE_TRASH   + " THEN " + R.drawable.ic_folder_trash
+            + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_folder_star
             + " ELSE -1 END";
 
     private static ProjectionMap getFolderListMap() {
@@ -2994,13 +2994,13 @@ public class EmailProvider extends ContentProvider {
                    "=" + Mailbox.TYPE_INBOX + ") AND " + MessageColumns.FLAG_READ + "=0", null);
             row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_INBOX);
             row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count;
-            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_inbox_holo_light;
+            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_inbox;
             mc.addRow(row);
             count = EmailContent.count(context, Message.CONTENT_URI,
                     MessageColumns.FLAG_FAVORITE + "=1", null);
             row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_STARRED);
             row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count;
-            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_star_holo_light;
+            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_star;
             mc.addRow(row);
             row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_ALL_UNREAD);
             count = EmailContent.count(context, Message.CONTENT_URI,
@@ -3024,7 +3024,7 @@ public class EmailProvider extends ContentProvider {
             final long acctId = Long.parseLong(id);
             Object[] row = getVirtualMailboxRow(acctId, Mailbox.TYPE_STARRED);
             row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = numStarred;
-            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_star_holo_light;
+            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_star;
             mc.addRow(row);
             row = getVirtualMailboxRow(acctId, Mailbox.TYPE_ALL_UNREAD);
             int numUnread  = EmailContent.count(context, Message.CONTENT_URI,