diff --git a/app/src/main/java/i2p/bote/android/FolderListAdapter.java b/app/src/main/java/i2p/bote/android/FolderListAdapter.java
index eb311cc..2d38dc1 100644
--- a/app/src/main/java/i2p/bote/android/FolderListAdapter.java
+++ b/app/src/main/java/i2p/bote/android/FolderListAdapter.java
@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 public class FolderListAdapter extends ArrayAdapter<EmailFolder> implements FolderListener {
@@ -37,10 +38,12 @@ public class FolderListAdapter extends ArrayAdapter<EmailFolder> implements Fold
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        View v = mInflater.inflate(R.layout.listitem_folder, parent, false);
+        View v = mInflater.inflate(R.layout.listitem_folder_with_icon, parent, false);
         EmailFolder folder = getItem(position);
 
+        ImageView icon = (ImageView) v.findViewById(R.id.folder_icon);
         TextView name = (TextView) v.findViewById(R.id.folder_name);
+        icon.setImageDrawable(BoteHelper.getFolderIcon(getContext(), folder));
         try {
             name.setText(BoteHelper.getFolderDisplayNameWithNew(getContext(), folder));
         } catch (PasswordException e) {
diff --git a/app/src/main/java/i2p/bote/android/util/BoteHelper.java b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
index 77a300b..26d3625 100644
--- a/app/src/main/java/i2p/bote/android/util/BoteHelper.java
+++ b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
@@ -18,6 +18,7 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -80,6 +81,20 @@ public class BoteHelper extends GeneralHelper {
         return displayName;
     }
 
+    public static Drawable getFolderIcon(Context ctx, EmailFolder folder) {
+        String name = folder.getName();
+        if ("inbox".equals(name))
+            return ctx.getResources().getDrawable(R.drawable.ic_inbox_grey600_24dp);
+        else if ("outbox".equals(name))
+            return ctx.getResources().getDrawable(R.drawable.ic_cloud_queue_grey600_24dp);
+        else if ("sent".equals(name))
+            return ctx.getResources().getDrawable(R.drawable.ic_send_grey600_24dp);
+        else if ("trash".equals(name))
+            return ctx.getResources().getDrawable(R.drawable.ic_delete_grey600_24dp);
+        else
+            return null;
+    }
+
     public static String getDisplayAddress(String address) throws PasswordException, IOException, GeneralSecurityException, MessagingException {
         String fullAdr = getNameAndDestination(address);
         String emailDest = extractEmailDestination(fullAdr);
diff --git a/app/src/main/res/drawable-hdpi/ic_cloud_queue_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_cloud_queue_grey600_24dp.png
new file mode 100644
index 0000000..4ab024e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_cloud_queue_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_contacts_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_contacts_grey600_24dp.png
new file mode 100644
index 0000000..c63509b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_contacts_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
new file mode 100644
index 0000000..b72a9f3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_inbox_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_inbox_grey600_24dp.png
new file mode 100644
index 0000000..3c8dce6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_inbox_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_send_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_send_grey600_24dp.png
new file mode 100644
index 0000000..b771392
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_send_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cloud_queue_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_cloud_queue_grey600_24dp.png
new file mode 100644
index 0000000..2eeb59c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_cloud_queue_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_contacts_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_contacts_grey600_24dp.png
new file mode 100644
index 0000000..719ca6e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_contacts_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
new file mode 100644
index 0000000..e757fdb
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_inbox_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_inbox_grey600_24dp.png
new file mode 100644
index 0000000..4980a8a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_inbox_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png
new file mode 100644
index 0000000..6fef488
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cloud_queue_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_cloud_queue_grey600_24dp.png
new file mode 100644
index 0000000..6efd5e2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_cloud_queue_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_contacts_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_contacts_grey600_24dp.png
new file mode 100644
index 0000000..917e077
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_contacts_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
new file mode 100644
index 0000000..c6bb43e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_inbox_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_inbox_grey600_24dp.png
new file mode 100644
index 0000000..04c486d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_inbox_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png
new file mode 100644
index 0000000..e138046
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cloud_queue_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_cloud_queue_grey600_24dp.png
new file mode 100644
index 0000000..2317d35
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_cloud_queue_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_contacts_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_contacts_grey600_24dp.png
new file mode 100644
index 0000000..60693b6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_contacts_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
new file mode 100644
index 0000000..4886ab1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_inbox_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_inbox_grey600_24dp.png
new file mode 100644
index 0000000..fee47a1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_inbox_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png
new file mode 100644
index 0000000..2c7a802
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 30de58a..972a6b8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+    <android.support.v7.widget.Toolbar
         android:id="@+id/main_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -51,23 +52,33 @@
                 android:layout_alignParentBottom="true"
                 android:orientation="vertical">
 
-                <FrameLayout
+                <RelativeLayout
                     android:id="@+id/address_book"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/folder_activated_background">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:paddingEnd="@dimen/nav_horizontal_margin"
+                        android:paddingLeft="@dimen/listitem_horizontal_margin"
+                        android:paddingRight="@dimen/nav_horizontal_margin"
+                        android:paddingStart="@dimen/listitem_horizontal_margin"
+                        android:src="@drawable/ic_contacts_grey600_24dp" />
+
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/nav_entry_height"
                         android:gravity="center_vertical"
                         android:paddingEnd="@dimen/nav_horizontal_margin"
-                        android:paddingLeft="@dimen/nav_horizontal_margin"
+                        android:paddingLeft="@dimen/listitem_text_left_margin"
                         android:paddingRight="@dimen/nav_horizontal_margin"
-                        android:paddingStart="@dimen/nav_horizontal_margin"
+                        android:paddingStart="@dimen/listitem_text_left_margin"
                         android:text="@string/address_book"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-                </FrameLayout>
+                </RelativeLayout>
 
                 <FrameLayout
                     android:id="@+id/network_status"
diff --git a/app/src/main/res/layout/listitem_folder_with_icon.xml b/app/src/main/res/layout/listitem_folder_with_icon.xml
new file mode 100644
index 0000000..5f5d1e9
--- /dev/null
+++ b/app/src/main/res/layout/listitem_folder_with_icon.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/folder_activated_background">
+
+    <ImageView
+        android:id="@+id/folder_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:paddingLeft="@dimen/listitem_horizontal_margin"
+        android:paddingStart="@dimen/listitem_horizontal_margin"/>
+
+    <TextView
+        android:id="@+id/folder_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/nav_entry_height"
+        android:gravity="center_vertical"
+        android:paddingEnd="@dimen/nav_horizontal_margin"
+        android:paddingLeft="@dimen/listitem_text_left_margin"
+        android:paddingRight="@dimen/nav_horizontal_margin"
+        android:paddingStart="@dimen/listitem_text_left_margin"
+        android:text="Folder Name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+</RelativeLayout>