diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index df2cdcdb9..52ee731fc 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -467,6 +467,19 @@ export class FolderModel extends AbstractModel {
 
 			detailedName: () => this.name() + ' ' + this.nameInfo(),
 
+			icon: () => {
+				switch (this.type())
+				{
+					case 1: return '📥'; // FolderType.Inbox
+					case 2: return '📧'; // FolderType.Sent icon-paper-plane
+					case 3: return '🗎'; // FolderType.Drafts
+					case 4: return '⚠'; // FolderType.Junk
+					case 5: return '🗑'; // FolderType.Trash
+					case 6: return '🗄'; // FolderType.Archive
+				}
+				return null;
+			},
+
 			hasSubscribedUnreadMessagesSubfolders: () =>
 				!!this.subFolders().find(
 					folder => folder.unreadEmails() | folder.hasSubscribedUnreadMessagesSubfolders()
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index 920f8bc3b..3103049a1 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -11,7 +11,7 @@
 			<li>
 				<a data-bind="dropmessages: $data,
 					css: { 'selected': selected, 'selectable': selectable, 'anim-action-class': actionBlink, 'is-flagged': isFlagged },
-					attr: { 'data-unread': unreadCount }">
+					attr: { 'data-icon': icon, 'data-unread': unreadCount }">
 					<!-- ko text: localName --><!-- /ko -->
 					<!-- ko if: isInbox -->
 					<span class="flag-icon fontastic"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
index 34a09d9b6..b8d8ad6cc 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
@@ -6,27 +6,27 @@
 	<div class="form-horizontal">
 		<div class="alert" data-bind="visible: '' !== notification()" data-bind="text: notification"></div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/SENT_NAME"></label>
+			<label data-icon="📧" data-i18n="FOLDER_LIST/SENT_NAME"></label>
 			<select data-bind="options: folderSelectList, value: sentFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/DRAFTS_NAME"></label>
+			<label data-icon="🗎" data-i18n="FOLDER_LIST/DRAFTS_NAME"></label>
 			<select data-bind="options: folderSelectList, value: draftsFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="GLOBAL/SPAM"></label>
+			<label data-icon="⚠" data-i18n="GLOBAL/SPAM"></label>
 			<select data-bind="options: folderSelectList, value: spamFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/TRASH_NAME"></label>
+			<label data-icon="🗑" data-i18n="FOLDER_LIST/TRASH_NAME"></label>
 			<select data-bind="options: folderSelectList, value: trashFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/ARCHIVE_NAME"></label>
+			<label data-icon="🗄" data-i18n="FOLDER_LIST/ARCHIVE_NAME"></label>
 			<select data-bind="options: folderSelectList, value: archiveFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>