diff --git a/package-lock.json b/package-lock.json
index 2f1cc83e..b613cd3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,8 @@
         "@nextcloud/l10n": "^2.1.0",
         "@nextcloud/router": "^2.2.1",
         "@nextcloud/vue": "^8.28.0",
-        "vue": "^2.7.14"
+        "vue": "^2.7.14",
+        "vue-material-design-icons": "^5.3.1"
       },
       "devDependencies": {
         "@nextcloud/babel-config": "^1.2.0",
@@ -14874,6 +14875,12 @@
         }
       }
     },
+    "node_modules/vue-material-design-icons": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.3.1.tgz",
+      "integrity": "sha512-6UNEyhlTzlCeT8ZeX5WbpUGFTTPSbOoTQeoASTv7X4Ylh0pe8vltj+36VMK56KM0gG8EQVoMK/Qw/6evalg8lA==",
+      "license": "MIT"
+    },
     "node_modules/vue-resize": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
@@ -26168,6 +26175,11 @@
         "vue-style-loader": "^4.1.0"
       }
     },
+    "vue-material-design-icons": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.3.1.tgz",
+      "integrity": "sha512-6UNEyhlTzlCeT8ZeX5WbpUGFTTPSbOoTQeoASTv7X4Ylh0pe8vltj+36VMK56KM0gG8EQVoMK/Qw/6evalg8lA=="
+    },
     "vue-resize": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
diff --git a/package.json b/package.json
index 6ab425b3..0ca5177b 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "@nextcloud/l10n": "^2.1.0",
     "@nextcloud/router": "^2.2.1",
     "@nextcloud/vue": "^8.28.0",
-    "vue": "^2.7.14"
+    "vue": "^2.7.14",
+    "vue-material-design-icons": "^5.3.1"
   },
   "devDependencies": {
     "@nextcloud/babel-config": "^1.2.0",
diff --git a/src/components/SharingEntrySimple.vue b/src/components/SharingEntrySimple.vue
index f5ecee84..4c7265a3 100644
--- a/src/components/SharingEntrySimple.vue
+++ b/src/components/SharingEntrySimple.vue
@@ -74,18 +74,21 @@ export default {
 .sharing-entry {
 	display: flex;
 	align-items: center;
-	height: 44px;
+
 	&__desc {
 		padding: 8px;
 		line-height: 1.2em;
 		position: relative;
 		flex: 1 1;
 		min-width: 0;
+
 		h5 {
+			font-size: 16px;
 			white-space: nowrap;
 			text-overflow: ellipsis;
 			overflow: hidden;
 			max-width: inherit;
+			margin-block: 0;
 		}
 		p {
 			color: var(--color-text-maxcontrast);
diff --git a/src/views/SharedSubfolders.vue b/src/views/SharedSubfolders.vue
index edbd9c0b..2e76ffe2 100644
--- a/src/views/SharedSubfolders.vue
+++ b/src/views/SharedSubfolders.vue
@@ -21,46 +21,67 @@
   -->
 
 <template>
-	<div class="sharing-entry__subfolders">
-		<!-- Main collapsible entry -->
-		<SharedEntrySimple :title="mainTitle" :subtitle="subTitle">
-			<template #avatar>
-				<div class="avatar-subfolder avatar-subfolder--primary" />
-			</template>
-			<NcActionButton :icon="showSubfoldersIcon" @click.prevent.stop="toggleSubfolders">
-				{{ t('sharelisting', 'Toggle subfolders listing') }}
-			</NcActionButton>
-		</SharedEntrySimple>
+	<section>
+		<div class="section-header">
+			<h4>{{ t('sharelisting', 'Shared subitems') }}</h4>
+			<NcPopover popup-role="dialog">
+				<template #trigger>
+					<NcButton class="hint-icon"
+						type="tertiary-no-background"
+						:aria-label="t('sharelisting', 'Shared subitems explanation')">
+						<template #icon>
+							<InfoIcon :size="20" />
+						</template>
+					</NcButton>
+				</template>
+				<p class="hint-body">
+					{{ t('sharelisting', 'Any other shares from subfolders') }}
+				</p>
+			</NcPopover>
+		</div>
+
+		<NcButton v-if="!showSubfolders" @click="loadSubfolders()">
+			{{ t('sharelisting', 'Load') }}
+		</NcButton>
+
+		<div v-if="showSubfolders && shares.length === 0">
+			{{ loading ? t('sharelisting', 'Loading …') : t('sharelisting', 'No shared subfolders found') }}
+		</div>
 
 		<!-- Shared subfolders list -->
 		<SharedEntrySimple v-for="share in shares"
 			:key="share.id"
-			class="sharing-entry__subfolder"
 			:title="share.name"
 			:subtitle="t('sharelisting', 'Shared by {initiator}', { initiator: share.initiator })">
 			<template #avatar>
-				<div :class="[share.is_directory ? 'icon-folder' : 'icon-file']" class="avatar-subfolder" />
+				<div :class="[share.is_directory ? 'icon-folder' : 'icon-file']"
+					class="avatar-subfolder" />
 			</template>
-			<NcActionLink icon="icon-confirm" :href="generateFileUrl(share.path, share.file_id)">
+			<NcActionLink icon="icon-confirm"
+				:href="generateFileUrl(share.path, share.file_id)">
 				{{ share.path }}
 			</NcActionLink>
 		</SharedEntrySimple>
-	</div>
+	</section>
 </template>
 
 <script>
 import axios from '@nextcloud/axios'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
+import NcButton from '@nextcloud/vue/components/NcButton'
+import NcActionLink from '@nextcloud/vue/components/NcActionLink'
+import NcPopover from '@nextcloud/vue/components/NcPopover'
 import SharedEntrySimple from '../components/SharingEntrySimple.vue'
+import InfoIcon from 'vue-material-design-icons/InformationOutline.vue'
 
 export default {
 	name: 'SharedSubfolders',
 
 	components: {
-		NcActionButton,
+		NcButton,
 		NcActionLink,
+		NcPopover,
+		InfoIcon,
 		SharedEntrySimple,
 	},
 
@@ -73,31 +94,14 @@ export default {
 
 	data() {
 		return {
-			loaded: false,
 			loading: false,
+			loaded: false,
 			showSubfolders: false,
 			shares: [],
 		}
 	},
 
 	computed: {
-		showSubfoldersIcon() {
-			if (this.loading) {
-				return 'icon-loading-small'
-			}
-			if (this.showSubfolders) {
-				return 'icon-triangle-n'
-			}
-			return 'icon-triangle-s'
-		},
-		mainTitle() {
-			return t('sharelisting', 'Shared subitems')
-		},
-		subTitle() {
-			return (this.showSubfolders && this.shares.length === 0)
-				? t('sharelisting', 'No shared subfolders found')
-				: ''
-		},
 		fullPath() {
 			const path = `${this.fileInfo.path}/${this.fileInfo.name}`
 			return path.replace('//', '/')
@@ -114,13 +118,9 @@ export default {
 		/**
 		 * Toggle the list view and fetch/reset the state
 		 */
-		toggleSubfolders() {
-			this.showSubfolders = !this.showSubfolders
-			if (this.showSubfolders) {
-				this.fetchSharedSubfolders()
-			} else {
-				this.resetState()
-			}
+		loadSubfolders() {
+			this.showSubfolders = true
+			this.fetchSharedSubfolders()
 		},
 
 		/**
@@ -145,7 +145,6 @@ export default {
 		 */
 		resetState() {
 			this.loaded = false
-			this.loading = false
 			this.showSubfolders = false
 			this.shares = []
 		},
@@ -158,33 +157,44 @@ export default {
 		 * @return {string}
 		 */
 		generateFileUrl(dir, fileid) {
-			return generateUrl('/apps/files?dir={dir}&fileid={fileid}', { dir, fileid })
+			return generateUrl('/apps/files?dir={dir}&fileid={fileid}', {
+				dir,
+				fileid,
+			})
 		},
 	},
 }
 </script>
 
 <style lang="scss" scoped>
-.sharing-entry__subfolders {
-	padding: 0 6px;
-	.avatar-subfolder {
-		width: 32px;
-		height: 32px;
-		line-height: 32px;
-		font-size: 18px;
-		border-radius: 50%;
-		flex-shrink: 0;
-		padding: 4px;
-		&--primary {
-			background-color: var(--color-primary-element);
-			background-image: url('../assets/share-folder.svg');
-			background-position: center;
-			background-repeat: no-repeat;
+section {
+	padding-bottom: 16px;
+	border-top: 2px solid var(--color-border);
+
+	.section-header {
+		margin-top: 6px;
+		margin-bottom: 2px;
+		display: flex;
+		align-items: center;
+		padding-bottom: 4px;
+
+		h4 {
+			margin: 0;
+			font-size: 16px;
 		}
-	}
 
-	.sharing-entry__subfolder {
-		padding-left: 36px;
+		.visually-hidden {
+			display: none;
+		}
+
+		.hint-icon {
+			color: var(--color-primary-element);
+		}
 	}
 }
+
+.hint-body {
+	max-width: 300px;
+	padding: var(--border-radius-element);
+}
 </style>