diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 1c553273b..acebf2f2d 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -93,9 +93,9 @@
 					</template>
 					<template #icon>
 						<FolderAlertIcon v-if="isFolder(topLevelItem) && hasErrorFeeds(topLevelItem)" v-tooltip="t('news', 'Has feeds with errors!')" style="width: 22px; color: red" />
-						<FolderIcon v-if="topLevelItem.feedCount !== undefined && !hasErrorFeeds(topLevelItem)" style="width:22px" />
-						<RssIcon v-if="topLevelItem.feedCount === undefined && !topLevelItem.faviconLink" />
-						<span v-if="topLevelItem.feedCount === undefined && topLevelItem.faviconLink" style="height: 16px; width: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + topLevelItem.faviconLink + ')' }" />
+						<FolderIcon v-if="isFolder(topLevelItem) && !hasErrorFeeds(topLevelItem)" style="width:22px" />
+						<RssIcon v-if="!isFolder(topLevelItem) && !topLevelItem.faviconLink" />
+						<span v-if="!isFolder(topLevelItem) && topLevelItem.faviconLink" style="height: 16px; width: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + topLevelItem.faviconLink + ')' }" />
 					</template>
 					<template #counter>
 						<NcCounterBubble v-if="topLevelItem.updateErrorCount > 0"
diff --git a/src/store/folder.ts b/src/store/folder.ts
index 882f1a62a..473e4c904 100644
--- a/src/store/folder.ts
+++ b/src/store/folder.ts
@@ -69,7 +69,7 @@ export const mutations = {
 		state: FolderState,
 		folders: Folder[],
 	) {
-		state.folders = [...folders]
+		state.folders = [...state.folders, ...folders]
 	},
 
 	[FOLDER_MUTATION_TYPES.DELETE_FOLDER](