diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index 5e4b097c6..729ec8d49 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -1,5 +1,4 @@
 import ko from 'ko';
-import { koComputable } from 'External/ko';
 
 import { Notification } from 'Common/Enums';
 import { FolderMetadataKeys } from 'Common/EnumsUser';
@@ -48,14 +47,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		this.folderListError = FolderUserStore.folderListError;
 		this.hideUnsubscribed = SettingsUserStore.hideUnsubscribed;
 
-		this.loading = koComputable(() => {
-			const loading = FolderUserStore.foldersLoading(),
-				creating = FolderUserStore.foldersCreating(),
-				deleting = FolderUserStore.foldersDeleting(),
-				renaming = FolderUserStore.foldersRenaming();
-
-			return loading || creating || deleting || renaming;
-		});
+		this.loading = FolderUserStore.foldersChanging;
 
 		this.folderForDeletion = folderForDeletion;
 
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index ba9e3512e..d92d447cd 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -64,7 +64,7 @@ export const FolderUserStore = new class {
 			foldersChanging: () =>
 				self.foldersLoading() | self.foldersCreating() | self.foldersDeleting() | self.foldersRenaming(),
 
-			folderListSystemNames: () => {
+			systemFoldersNames: () => {
 				const list = [getFolderInboxName()],
 				others = [self.sentFolder(), self.draftsFolder(), self.spamFolder(), self.trashFolder(), self.archiveFolder()];
 
@@ -74,8 +74,8 @@ export const FolderUserStore = new class {
 				return list;
 			},
 
-			folderListSystem: () =>
-				self.folderListSystemNames().map(name => getFolderFromCacheList(name)).filter(v => v)
+			systemFolders: () =>
+				self.systemFoldersNames().map(name => getFolderFromCacheList(name)).filter(v => v)
 		});
 
 		const
diff --git a/dev/View/Popup/FolderSystem.js b/dev/View/Popup/FolderSystem.js
index a5186a3f2..3b6994cbe 100644
--- a/dev/View/Popup/FolderSystem.js
+++ b/dev/View/Popup/FolderSystem.js
@@ -19,7 +19,7 @@ export class FolderSystemPopupView extends AbstractViewPopup {
 
 		this.folderSelectList = koComputable(() =>
 			folderListOptionsBuilder(
-				FolderUserStore.folderListSystemNames(),
+				FolderUserStore.systemFoldersNames(),
 				[
 					['', i18n('POPUPS_SYSTEM_FOLDERS/SELECT_CHOOSE_ONE')],
 					[UNUSED_OPTION_VALUE, i18n('POPUPS_SYSTEM_FOLDERS/SELECT_UNUSE_NAME')]
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index 7b05be5b5..cc6345827 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -31,9 +31,7 @@ export class MailFolderList extends AbstractViewLeft {
 
 		this.composeInEdit = AppUserStore.composeInEdit;
 
-		this.folderList = FolderUserStore.folderList;
-		this.folderListSystem = FolderUserStore.folderListSystem;
-		this.foldersChanging = FolderUserStore.foldersChanging;
+		this.systemFolders = FolderUserStore.systemFolders;
 
 		this.moveAction = moveAction;
 
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 0f540a3b3..7d480a68d 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
@@ -7,7 +7,7 @@
 		<a class="btn buttonContacts fontastic" data-bind="visible: allowContacts, click: contactsClick" data-i18n="[title]GLOBAL/CONTACTS">📇</a>
 	</div>
 	<div class="b-content">
-		<ul class="b-folders-system" data-bind="foreach: folderListSystem">
+		<ul class="b-folders-system" data-bind="foreach: systemFolders">
 			<li>
 				<a data-bind="dropmessages: $data,
 					css: { 'selected': selected, 'selectable': selectable, 'anim-action-class': actionBlink, 'is-flagged': isFlagged },
@@ -32,7 +32,7 @@
 		</div>
 		<div class="btn-group hide-on-panel-disabled">
 			<a class="btn" data-bind="click: createFolder" data-i18n="[title]POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER">
-				<i data-bind="css: {'icon-folder-add': !foldersChanging(), 'icon-spinner': foldersChanging()}"></i>
+				<i class="icon-folder-add"></i>
 			</a>
 			<a class="btn fontastic" data-bind="click: configureFolders">⚙</a>
 		</div>
diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css
index 27bfeee6d..e24d71924 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -68,10 +68,10 @@
   content: "\e033";
 }
 .icon-file-text::before {
-  content: "\e034";
+  content: "\e034"; /* 🖹 | 🖺 */
 }
 .icon-file-image::before {
-  content: "\e036";
+  content: "\e036"; /* 🖻 */
 }
 .icon-file-certificate::before {
   content: "\e038";