diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index 2286477750cbdb5184e488785f0b700ca899dca7..747a7245a56b35127a76ecbdeea16b369bbbd7da 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -103,17 +103,17 @@
 					return t('files', 'Add to favorites');
 				},
 				mime: 'all',
-				order: -23,
+				order: -100,
 				permissions: OC.PERMISSION_READ,
 				iconClass: function(fileName, context) {
 					var $file = context.$file;
 					var isFavorite = $file.data('favorite') === true;
 
 					if (isFavorite) {
-						return 'icon-starred';
+						return 'icon-star-dark';
 					}
 
-					return 'icon-star';
+					return 'icon-starred';
 				},
 				actionHandler: function(fileName, context) {
 					var $favoriteMarkEl = context.$file.find('.favorite-mark');
diff --git a/core/css/icons.scss b/core/css/icons.scss
index 6d855381fae997fd611cbeb6dd9cbc685f46be73..c8f61c1422e092d501c1d19e935d63ab3a0f8aeb 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -348,6 +348,10 @@ img, object, video, button, textarea, input, select {
 	background-image: url('../img/actions/star.svg?v=1');
 }
 
+.icon-star-dark {
+	background-image: url('../img/actions/star-dark.svg?v=1');
+}
+
 .icon-starred {
 	&:hover, &:focus {
 		background-image: url('../img/actions/star.svg?v=1');