diff --git a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
index e98a022ebc..4713f4b35b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
@@ -86,7 +86,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
                 if ("syncing".equals(folder.sync_state))
                     ivItem.setImageResource(R.drawable.baseline_compare_arrows_24);
                 else
-                    ivItem.setImageResource(R.drawable.baseline_send_24);
+                    ivItem.setImageResource(EntityFolder.getIcon(folder.type));
 
                 ivItem.clearColorFilter();
             } else {
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 7c8161c433..40f8321398 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -203,10 +203,12 @@ public class EntityFolder extends EntityOrder implements Serializable {
     static int getIcon(String type) {
         if (EntityFolder.INBOX.equals(type))
             return R.drawable.baseline_inbox_24;
+        if (EntityFolder.OUTBOX.equals(type))
+            return R.drawable.baseline_send_24;
         if (EntityFolder.DRAFTS.equals(type))
             return R.drawable.baseline_drafts_24;
         if (EntityFolder.SENT.equals(type))
-            return R.drawable.baseline_send_24;
+            return R.drawable.baseline_forward_24;
         if (EntityFolder.ARCHIVE.equals(type))
             return R.drawable.baseline_archive_24;
         if (EntityFolder.TRASH.equals(type))