diff --git a/apps-external/viewer b/apps-external/viewer
index 07ac1d3d52aed..7ed9d5793d089 160000
--- a/apps-external/viewer
+++ b/apps-external/viewer
@@ -1 +1 @@
-Subproject commit 07ac1d3d52aed21c97d7d76ed1759053be691d35
+Subproject commit 7ed9d5793d089fdff13efe7809dace262de59c20
diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js
index 3d827615a4030..81c7ba9d5e024 100644
--- a/apps/files/js/fileactionsmenu.js
+++ b/apps/files/js/fileactionsmenu.js
@@ -80,6 +80,14 @@
 			var items = _.filter(actions, function(actionSpec) {
 				return !defaultAction || actionSpec.name !== defaultAction.name;
 			});
+
+			// don't show view action for folders
+			items = _.filter(items, function(actionSpec) {
+				const isDirectory = self._context.$file.attr('data-type') === 'dir';
+				const isViewAction = actionSpec.name === 'view';
+				return !(isDirectory && isViewAction);
+			});
+
 			items = _.map(items, function(item) {
 				if (_.isFunction(item.displayName)) {
 					item = _.extend({}, item);
diff --git a/core/src/icons.js b/core/src/icons.js
index 7f4accf104eea..49d3fa9a29a9b 100644
--- a/core/src/icons.js
+++ b/core/src/icons.js
@@ -141,6 +141,7 @@ icons.more = path.join(__dirname, customIconPath, 'dots-horizontal.svg')
 icons.public = path.join(__dirname, customIconPath, 'link.svg')
 icons.comment = path.join(__dirname, customIconPath, 'comment.svg')
 icons.home = path.join(__dirname, customIconPath, 'home.svg')
+icons.viewer = path.join(__dirname, customIconPath, 'eye.svg')
 icons['triangle-s'] = path.join(__dirname, customIconPath, 'chevron-down.svg')
 icons['triangle-n'] = path.join(__dirname, customIconPath, 'chevron-up.svg')
 icons['triangle-e'] = path.join(__dirname, customIconPath, 'chevron-right.svg')