diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index ceaf9a4a1b..f60763d5cc 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -316,11 +316,13 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
                 for (TupleAccountEx account : accounts) {
                     StringBuilder sb = new StringBuilder();
-                    sb.append(account);
+                    sb.append(account.name);
                     if (account.unseen > 0)
                         sb.append(" (").append(nf.format(account.unseen)).append(")");
                     items.add(new DrawerItem(account.id,
-                            "connected".equals(account.state) ? R.drawable.baseline_folder_24 : R.drawable.baseline_folder_open_24,
+                            "connected".equals(account.state)
+                                    ? account.primary ? R.drawable.baseline_folder_special_24 : R.drawable.baseline_folder_24
+                                    : R.drawable.baseline_folder_open_24,
                             account.color, sb.toString(), account.unseen > 0));
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 0c4abae2bc..f6f09cbc93 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1760,7 +1760,9 @@ public class FragmentMessages extends FragmentBase {
                 viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER);
 
         menu.findItem(R.id.menu_folders).setVisible(primary >= 0);
-        menu.findItem(R.id.menu_folders).setIcon(connected ? R.drawable.baseline_folder_24 : R.drawable.baseline_folder_open_24);
+        menu.findItem(R.id.menu_folders).setIcon(connected
+                ? R.drawable.baseline_folder_special_24
+                : R.drawable.baseline_folder_open_24);
 
         menu.findItem(R.id.menu_sort_on).setVisible(!selection &&
                 (viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER));