diff --git a/res/drawable/ic_list_combined_inbox.png b/res/drawable/ic_list_combined_inbox.png
new file mode 100644
index 000000000..4d82a2dd3
Binary files /dev/null and b/res/drawable/ic_list_combined_inbox.png differ
diff --git a/res/drawable/ic_list_drafts.png b/res/drawable/ic_list_drafts.png
new file mode 100644
index 000000000..7ad323aef
Binary files /dev/null and b/res/drawable/ic_list_drafts.png differ
diff --git a/res/drawable/ic_list_folder.png b/res/drawable/ic_list_folder.png
new file mode 100644
index 000000000..65021df76
Binary files /dev/null and b/res/drawable/ic_list_folder.png differ
diff --git a/res/drawable/ic_list_inbox.png b/res/drawable/ic_list_inbox.png
new file mode 100644
index 000000000..73b19b433
Binary files /dev/null and b/res/drawable/ic_list_inbox.png differ
diff --git a/res/drawable/ic_list_outbox.png b/res/drawable/ic_list_outbox.png
new file mode 100644
index 000000000..510d1b020
Binary files /dev/null and b/res/drawable/ic_list_outbox.png differ
diff --git a/res/drawable/ic_list_sent.png b/res/drawable/ic_list_sent.png
new file mode 100644
index 000000000..66c66474e
Binary files /dev/null and b/res/drawable/ic_list_sent.png differ
diff --git a/res/drawable/ic_list_spam.png b/res/drawable/ic_list_spam.png
new file mode 100644
index 000000000..a67a29bd6
Binary files /dev/null and b/res/drawable/ic_list_spam.png differ
diff --git a/res/drawable/ic_list_starred.png b/res/drawable/ic_list_starred.png
new file mode 100644
index 000000000..32a34ee00
Binary files /dev/null and b/res/drawable/ic_list_starred.png differ
diff --git a/res/drawable/ic_list_trash.png b/res/drawable/ic_list_trash.png
new file mode 100644
index 000000000..5acd1f084
Binary files /dev/null and b/res/drawable/ic_list_trash.png differ
diff --git a/res/layout/mailbox_list_item.xml b/res/layout/mailbox_list_item.xml
index 3d9210e51..20b770f32 100644
--- a/res/layout/mailbox_list_item.xml
+++ b/res/layout/mailbox_list_item.xml
@@ -32,7 +32,7 @@
         android:id="@+id/folder_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/expander_ic_folder_minimized"
+        android:src="@drawable/ic_list_folder"
         android:paddingLeft="2dip"/>
     <LinearLayout
         android:layout_width="0dip"
diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java
index 4f1c185cb..d6b8c0717 100644
--- a/src/com/android/email/activity/MailboxList.java
+++ b/src/com/android/email/activity/MailboxList.java
@@ -47,6 +47,7 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.CursorAdapter;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -409,6 +410,7 @@ public class MailboxList extends ListActivity implements OnItemClickListener, On
                 MailboxColumns.DISPLAY_NAME, MailboxColumns.UNREAD_COUNT, MailboxColumns.TYPE };
         private final int COLUMN_DISPLAY_NAME = 1;
         private final int COLUMN_UNREAD_COUNT = 2;
+        private final int COLUMN_TYPE = 3;
 
         Context mContext;
         private LayoutInflater mInflater;
@@ -456,7 +458,29 @@ public class MailboxList extends ListActivity implements OnItemClickListener, On
                 nameView.setTypeface(Typeface.DEFAULT);
                 countView.setVisibility(View.GONE);
             }
-
+            ImageView folderIcon = (ImageView) view.findViewById(R.id.folder_icon);
+            int type = cursor.getInt(COLUMN_TYPE);
+            int resId = -1;
+            switch (type) {
+                case Mailbox.TYPE_INBOX:
+                    resId = R.drawable.ic_list_inbox;
+                    break;
+                case Mailbox.TYPE_OUTBOX:
+                    resId = R.drawable.ic_list_outbox;
+                    break;
+                case Mailbox.TYPE_DRAFTS:
+                    resId = R.drawable.ic_list_drafts;
+                    break;
+                case Mailbox.TYPE_SENT:
+                    resId = R.drawable.ic_list_sent;
+                    break;
+                case Mailbox.TYPE_TRASH:
+                    resId = R.drawable.ic_list_trash;
+                default:
+                    resId = R.drawable.ic_list_folder;
+                    break;
+            }
+            folderIcon.setImageResource(resId);
         }
 
         @Override