diff --git a/apps/files_external/css/settings.scss b/apps/files_external/css/settings.scss
index ce30aa556c726..7485faa4c92de 100644
--- a/apps/files_external/css/settings.scss
+++ b/apps/files_external/css/settings.scss
@@ -16,6 +16,10 @@
 	}
 }
 
+#externalStorage .popovermenu li > .menuitem {
+    width: fit-content !important;
+}
+
 #externalStorage td.status {
 	/* overwrite conflicting core styles */
 	display: table-cell;
diff --git a/core/css/apps.scss b/core/css/apps.scss
index b52a5a3779382..29382687402e3 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -1208,28 +1208,6 @@ $outter-margin: math.div($popoveritem-height - $popovericon-size, 2);
 	}
 }
 
-/* "app-*" descendants use border-box sizing, so the height of the icon must be
- * set to the height of the item (as well as its width to make it squared). */
-#content[class*='app-'] {
-	.bubble,
-	.app-navigation-entry-menu,
-	.popovermenu {
-		li {
-			> button,
-			> a,
-			> .menuitem {
-				width: fit-content;
-				/* DEPRECATED! old img in popover fallback
-				* TODO: to remove */
-				> img {
-					width: $popoveritem-height;
-					height: $popoveritem-height;
-				}
-			}
-		}
-	}
-}
-
 /* CONTENT LIST ------------------------------------------------------------ */
 .app-content-list {
 	position: -webkit-sticky;