diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 6e8bc47cbb..818f12d5d6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -213,14 +213,14 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 else if (folder.state == null)
                     ivState.setImageResource(R.drawable.baseline_cloud_off_24);
                 else
-                    ivState.setImageResource(android.R.drawable.stat_sys_warning);
+                    ivState.setImageResource(R.drawable.baseline_warning_24);
             } else {
                 if ("syncing".equals(folder.sync_state))
                     ivState.setImageResource(R.drawable.baseline_compare_arrows_24);
                 else if ("downloading".equals(folder.sync_state))
                     ivState.setImageResource(R.drawable.baseline_cloud_download_24);
                 else
-                    ivState.setImageResource(android.R.drawable.stat_sys_warning);
+                    ivState.setImageResource(R.drawable.baseline_warning_24);
             }
             ivState.setVisibility(
                     folder.synchronize || folder.state != null || folder.sync_state != null
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavAccount.java b/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
index aac47e2a89..1293f9f6a3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavAccount.java
@@ -70,9 +70,13 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
         }
 
         private void bindTo(TupleAccountEx account) {
-            ivItem.setImageResource("connected".equals(account.state)
-                    ? account.primary ? R.drawable.baseline_folder_special_24 : R.drawable.baseline_folder_24
-                    : R.drawable.baseline_folder_open_24);
+            if (account.error == null)
+                ivItem.setImageResource("connected".equals(account.state)
+                        ? account.primary ? R.drawable.baseline_folder_special_24 : R.drawable.baseline_folder_24
+                        : R.drawable.baseline_folder_open_24);
+            else
+                ivItem.setImageResource(R.drawable.baseline_warning_24);
+
             if (account.color == null)
                 ivItem.clearColorFilter();
             else
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
index b8e174a7c0..1b9cb75f06 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
@@ -74,28 +74,31 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
         }
 
         private void bindTo(TupleFolderNav folder) {
-            if (EntityFolder.OUTBOX.equals(folder.type)) {
-                if ("syncing".equals(folder.sync_state))
-                    ivItem.setImageResource(R.drawable.baseline_compare_arrows_24);
-                else
-                    ivItem.setImageResource(R.drawable.baseline_send_24);
+            if (folder.error == null)
+                if (EntityFolder.OUTBOX.equals(folder.type)) {
+                    if ("syncing".equals(folder.sync_state))
+                        ivItem.setImageResource(R.drawable.baseline_compare_arrows_24);
+                    else
+                        ivItem.setImageResource(R.drawable.baseline_send_24);
 
-                ivItem.clearColorFilter();
-            } else {
-                if ("syncing".equals(folder.sync_state))
-                    ivItem.setImageResource(R.drawable.baseline_compare_arrows_24);
-                else if ("downloading".equals(folder.sync_state))
-                    ivItem.setImageResource(R.drawable.baseline_cloud_download_24);
-                else
-                    ivItem.setImageResource("connected".equals(folder.state)
-                            ? R.drawable.baseline_folder_24
-                            : R.drawable.baseline_folder_open_24);
-
-                if (folder.color == null)
                     ivItem.clearColorFilter();
-                else
-                    ivItem.setColorFilter(folder.color);
-            }
+                } else {
+                    if ("syncing".equals(folder.sync_state))
+                        ivItem.setImageResource(R.drawable.baseline_compare_arrows_24);
+                    else if ("downloading".equals(folder.sync_state))
+                        ivItem.setImageResource(R.drawable.baseline_cloud_download_24);
+                    else
+                        ivItem.setImageResource("connected".equals(folder.state)
+                                ? R.drawable.baseline_folder_24
+                                : R.drawable.baseline_folder_open_24);
+
+                    if (folder.color == null)
+                        ivItem.clearColorFilter();
+                    else
+                        ivItem.setColorFilter(folder.color);
+                }
+            else
+                ivItem.setImageResource(R.drawable.baseline_warning_24);
 
             int count = (EntityFolder.OUTBOX.equals(folder.type) ? folder.operations : folder.unseen);