diff --git a/apps-custom/nc_theming b/apps-custom/nc_theming
index 783eb50357432..8ff73c41d4b07 160000
--- a/apps-custom/nc_theming
+++ b/apps-custom/nc_theming
@@ -1 +1 @@
-Subproject commit 783eb503574329263500943c7b3cd5345d086b19
+Subproject commit 8ff73c41d4b07e5a429fb3a4684e23a4104174d1
diff --git a/apps-external/viewer b/apps-external/viewer
index a8c53b1a8239a..6b1ae9732973d 160000
--- a/apps-external/viewer
+++ b/apps-external/viewer
@@ -1 +1 @@
-Subproject commit a8c53b1a8239a14b07e49da8394d29b4e7c47a56
+Subproject commit 6b1ae9732973dcec71440cec1b1c22d5d6626e2d
diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js
index 3d827615a4030..b0a7d3efadc43 100644
--- a/apps/files/js/fileactionsmenu.js
+++ b/apps/files/js/fileactionsmenu.js
@@ -78,7 +78,7 @@
 			var defaultAction = fileActions.getCurrentDefaultFileAction();
 
 			var items = _.filter(actions, function(actionSpec) {
-				return !defaultAction || actionSpec.name !== defaultAction.name;
+				return !(defaultAction?.mime === 'dir' && (actionSpec.name === 'view' || actionSpec.name === defaultAction.name));
 			});
 			items = _.map(items, function(item) {
 				if (_.isFunction(item.displayName)) {
@@ -94,6 +94,9 @@
 					var fileName = self._context.$file.attr('data-file');
 					item = _.extend({}, item);
 					item.icon = item.icon(fileName, self._context);
+					if (item.icon.startsWith('<svg')) {
+						item.icon = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(item.icon)}`;
+					}
 				}
 				item.inline = item.type === OCA.Files.FileActions.TYPE_INLINE
 				return item;