diff --git a/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt b/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
index 241ca6b4d359f66bae122e5a9b48838e196f5c04..981905219d82435e8d6fac7067496b2545878e59 100644
--- a/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
+++ b/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
@@ -3,13 +3,18 @@ package com.fsck.k9.ui.settings
 import com.fsck.k9.ui.R
 import com.xwray.groupie.kotlinandroidextensions.Item
 import com.xwray.groupie.kotlinandroidextensions.ViewHolder
-import kotlinx.android.synthetic.main.text_list_item.*
+import kotlinx.android.synthetic.main.text_icon_list_item.*
+import android.util.TypedValue
 
-internal class SettingsActionItem(val text: String, val action: SettingsAction) : Item() {
+internal class SettingsActionItem(val text: String, val action: SettingsAction, val icon: Int) : Item() {
 
-    override fun getLayout(): Int = R.layout.text_list_item
+    override fun getLayout(): Int = R.layout.text_icon_list_item
 
     override fun bind(viewHolder: ViewHolder, position: Int) {
         viewHolder.text.text = text
+
+        val outValue = TypedValue()
+        viewHolder.icon.context.theme.resolveAttribute(icon, outValue, true)
+        viewHolder.icon.setImageResource(outValue.resourceId)
     }
 }
diff --git a/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt b/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt
index 1d4104524b8b864ec06a486f29663494b1db1bf5..e054c0e3fb109a243a06f5e9e14698d93868557d 100644
--- a/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt
+++ b/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt
@@ -58,8 +58,16 @@ class SettingsActivity : K9Activity() {
     private fun populateSettingsList(accounts: List<Account>) {
         settingsAdapter.clear()
 
+        val miscSection = Section().apply {
+            val item = SettingsActionItem(getString(R.string.about_action), SettingsAction.ABOUT_SCREEN, R.attr.iconSettingsAbout)
+            add(item)
+        }
+        settingsAdapter.add(miscSection)
+
         val generalSection = Section().apply {
-            add(SettingsActionItem(getString(R.string.general_settings_title), SettingsAction.GENERAL_SETTINGS))
+            val item = SettingsActionItem(getString(R.string.general_settings_title),
+                    SettingsAction.GENERAL_SETTINGS, R.attr.iconSettingsGeneral)
+            add(item)
         }
         settingsAdapter.add(generalSection)
 
@@ -67,15 +75,11 @@ class SettingsActivity : K9Activity() {
             for (account in accounts) {
                 add(AccountItem(account))
             }
-            add(SettingsActionItem(getString(R.string.add_account_action), SettingsAction.ADD_ACCOUNT))
+            val item = SettingsActionItem(getString(R.string.add_account_action), SettingsAction.ADD_ACCOUNT, R.attr.iconSettingsAccountAdd)
+            add(item)
         }
+        accountSection.setHeader(SettingsDividerItem(getString(R.string.accounts_title)))
         settingsAdapter.add(accountSection)
-
-        //TODO: add header and/or divider
-        val miscSection = Section().apply {
-            add(SettingsActionItem(getString(R.string.about_action), SettingsAction.ABOUT_SCREEN))
-        }
-        settingsAdapter.add(miscSection)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt b/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
new file mode 100644
index 0000000000000000000000000000000000000000..9cdc929b574e1774bae6666f632b5af960a3e129
--- /dev/null
+++ b/app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
@@ -0,0 +1,14 @@
+package com.fsck.k9.ui.settings
+
+import com.fsck.k9.ui.R
+import com.xwray.groupie.kotlinandroidextensions.Item
+import com.xwray.groupie.kotlinandroidextensions.ViewHolder
+import kotlinx.android.synthetic.main.text_divider_list_item.*
+
+internal class SettingsDividerItem(val text: String) : Item() {
+    override fun getLayout(): Int = R.layout.text_divider_list_item
+
+    override fun bind(viewHolder: ViewHolder, position: Int) {
+        viewHolder.text.text = text
+    }
+}
diff --git a/app/ui/src/main/res/drawable-anydpi/ic_account_dark.xml b/app/ui/src/main/res/drawable-anydpi/ic_account_dark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..31a4de14413121f3ac55855d7dfb3c0abb985e5c
--- /dev/null
+++ b/app/ui/src/main/res/drawable-anydpi/ic_account_dark.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
+</vector>
diff --git a/app/ui/src/main/res/drawable-anydpi/ic_account_light.xml b/app/ui/src/main/res/drawable-anydpi/ic_account_light.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4fa8d1d22f85bca0a146fb237eacf10ef7466030
--- /dev/null
+++ b/app/ui/src/main/res/drawable-anydpi/ic_account_light.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:alpha="0.54"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path android:fillColor="#FF000000" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
+</vector>
diff --git a/app/ui/src/main/res/drawable-anydpi/ic_account_plus_dark.xml b/app/ui/src/main/res/drawable-anydpi/ic_account_plus_dark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a0077b7b757889de1604276ebe117d8a764c62be
--- /dev/null
+++ b/app/ui/src/main/res/drawable-anydpi/ic_account_plus_dark.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
diff --git a/app/ui/src/main/res/drawable-anydpi/ic_account_plus_light.xml b/app/ui/src/main/res/drawable-anydpi/ic_account_plus_light.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1aff5ace25387a0a127f584bb61f99b2cbd2d05e
--- /dev/null
+++ b/app/ui/src/main/res/drawable-anydpi/ic_account_plus_light.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:alpha="0.54"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path android:fillColor="#FF000000" android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
\ No newline at end of file
diff --git a/app/ui/src/main/res/layout/account_list_item.xml b/app/ui/src/main/res/layout/account_list_item.xml
index b0673b983f71c91452397d617c4f80cb53807a93..eb06f4db107880018034ad097a938c22df611266 100644
--- a/app/ui/src/main/res/layout/account_list_item.xml
+++ b/app/ui/src/main/res/layout/account_list_item.xml
@@ -7,31 +7,42 @@
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:orientation="vertical">
+    android:orientation="horizontal"
+    android:paddingLeft="8dp">
 
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:paddingBottom="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="8dp"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        tools:text="Personal" />
+    <ImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:contentDescription="@string/account_settings_action"
+        android:padding="8dp"
+        android:src="?attr/iconSettingsAccount" />
 
-    <TextView
-        android:id="@+id/email"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:paddingBottom="8dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        tools:text="test@example.org" />
+        android:orientation="vertical"
+        android:paddingLeft="24dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:paddingBottom="4dp"
+            android:paddingTop="8dp"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            tools:text="Personal" />
+
+        <TextView
+            android:id="@+id/email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:paddingBottom="8dp"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            tools:text="test@example.org" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/ui/src/main/res/layout/text_list_item.xml b/app/ui/src/main/res/layout/text_divider_list_item.xml
similarity index 53%
rename from app/ui/src/main/res/layout/text_list_item.xml
rename to app/ui/src/main/res/layout/text_divider_list_item.xml
index 816ae378204e119d8c8e4aa08e23532dd4e486e2..8fde784fb11afce3d6b5862168df7aae64e2e701 100644
--- a/app/ui/src/main/res/layout/text_list_item.xml
+++ b/app/ui/src/main/res/layout/text_divider_list_item.xml
@@ -4,16 +4,14 @@
     android:id="@+id/text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:clickable="true"
     android:ellipsize="end"
-    android:focusable="true"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:paddingBottom="8dp"
+    android:paddingBottom="4dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:paddingTop="8dp"
+    android:paddingTop="4dp"
     android:singleLine="true"
-    android:textAppearance="?android:attr/textAppearanceListItem"
-    tools:text="List item with simple text" />
+    android:textAppearance="?android:attr/textAppearanceSmall"
+    android:textColor="?attr/colorAccent"
+    android:textStyle="bold"
+    tools:text="Divider" />
diff --git a/app/ui/src/main/res/layout/text_icon_list_item.xml b/app/ui/src/main/res/layout/text_icon_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78b203297502f26650c525b9c3325b37f1f03b68
--- /dev/null
+++ b/app/ui/src/main/res/layout/text_icon_list_item.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingLeft="8dp">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:contentDescription="@string/account_settings_action"
+        android:padding="8dp"
+        android:src="?attr/iconActionSettings" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:paddingBottom="8dp"
+        android:paddingLeft="24dp"
+        android:paddingRight="16dp"
+        android:paddingTop="8dp"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceListItem"
+        tools:text="List item with simple text" />
+</LinearLayout>
diff --git a/app/ui/src/main/res/values/attrs.xml b/app/ui/src/main/res/values/attrs.xml
index 4c6add7c85d7a40eb900fde0c3066238166b93a7..1cd82728dbfe28bbe5b18dbcf47db8affe90c1f4 100644
--- a/app/ui/src/main/res/values/attrs.xml
+++ b/app/ui/src/main/res/values/attrs.xml
@@ -52,6 +52,10 @@
         <attr name="iconPreferencesVarious" format="reference" />
         <attr name="iconPreferencesPrivacy" format="reference" />
         <attr name="iconPreferencesDebug" format="reference" />
+        <attr name="iconSettingsAbout" format="reference" />
+        <attr name="iconSettingsGeneral" format="reference" />
+        <attr name="iconSettingsAccount" format="reference" />
+        <attr name="iconSettingsAccountAdd" format="reference" />
         <attr name="textColorPrimaryRecipientDropdown" format="reference" />
         <attr name="textColorSecondaryRecipientDropdown" format="reference" />
         <attr name="backgroundColorChooseAccountHeader" format="color" />
diff --git a/app/ui/src/main/res/values/themes.xml b/app/ui/src/main/res/values/themes.xml
index 248b713a1c0c322f00181d32138d2bb32140c371..a65236f4f27eea7e17e82aca0409da7d2d9bbb00 100644
--- a/app/ui/src/main/res/values/themes.xml
+++ b/app/ui/src/main/res/values/themes.xml
@@ -72,6 +72,10 @@
         <item name="iconPreferencesVarious">@drawable/ic_widgets_light</item>
         <item name="iconPreferencesPrivacy">@drawable/ic_shield_light</item>
         <item name="iconPreferencesDebug">@drawable/ic_bug_light</item>
+        <item name="iconSettingsAbout">@drawable/ic_info_outline_light</item>
+        <item name="iconSettingsGeneral">@drawable/ic_cog_light</item>
+        <item name="iconSettingsAccount">@drawable/ic_account_light</item>
+        <item name="iconSettingsAccountAdd">@drawable/ic_account_plus_light</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
         <item name="messageListSelectedBackgroundColor">#8038B8E2</item>
@@ -164,6 +168,10 @@
         <item name="iconPreferencesVarious">@drawable/ic_widgets_dark</item>
         <item name="iconPreferencesPrivacy">@drawable/ic_shield_dark</item>
         <item name="iconPreferencesDebug">@drawable/ic_bug_dark</item>
+        <item name="iconSettingsAbout">@drawable/ic_info_outline_dark</item>
+        <item name="iconSettingsGeneral">@drawable/ic_cog_dark</item>
+        <item name="iconSettingsAccount">@drawable/ic_account_dark</item>
+        <item name="iconSettingsAccountAdd">@drawable/ic_account_plus_dark</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_dark</item>
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_dark</item>
         <item name="messageListSelectedBackgroundColor">#8038B8E2</item>