diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 4a8bd5bb30f1980c074b46f8954a29f40773b8eb..cbdfc672c8753ae16e7db827f1a9a17232a3c02b 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -393,6 +393,15 @@ table td.filename .uploadtext {
 	font-size: 11px;
 }
 
+
+/* force show the loading icon, not only on hover */
+#fileList .icon-loading-small {
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter:alpha(opacity=100);
+	opacity: 1 !important;
+	display: inline !important;
+}
+
 #fileList img.move2trash { display:inline; margin:-8px 0; padding:16px 8px 16px 8px !important; float:right; }
 #fileList a.action.delete {
 	position: absolute;
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 4aefd61a19a005c3265c1bf16cf7b4759e9e17f5..8ae0d8f1b2ec58b32909b3d46a995dee4bd82838 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -304,7 +304,7 @@
 				if (img.call) {
 					img = img(file);
 				}
-				html = '<a href="#" original-title="' + escapeHTML(deleteTitle) + '" class="action delete delete-icon" />';
+				html = '<a href="#" original-title="' + escapeHTML(deleteTitle) + '" class="action delete icon-delete" />';
 				var element = $(html);
 				element.data('action', actions['Delete']);
 				element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 1aabfb91f1f16959e7bd659f0d32dc87fb4f842b..86cba29e76c96d1a5bf02e6d9a36f7f1cae9fcb9 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1427,7 +1427,7 @@
 			if (files) {
 				for (var i=0; i<files.length; i++) {
 					var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
-					deleteAction.removeClass('delete-icon').addClass('progress-icon');
+					deleteAction.removeClass('icon-delete').addClass('icon-loading-small');
 				}
 			}
 			// Finish any existing actions
@@ -1445,7 +1445,7 @@
 				// no files passed, delete all in current dir
 				params.allfiles = true;
 				// show spinner for all files
-				this.$fileList.find('tr>td.date .action.delete').removeClass('delete-icon').addClass('progress-icon');
+				this.$fileList.find('tr>td.date .action.delete').removeClass('icon-delete').addClass('icon-loading-small');
 			}
 
 			$.post(OC.filePath('files', 'ajax', 'delete.php'),
@@ -1489,7 +1489,7 @@
 							else {
 								$.each(files,function(index,file) {
 									var deleteAction = self.findFileEl(file).find('.action.delete');
-									deleteAction.removeClass('progress-icon').addClass('delete-icon');
+									deleteAction.removeClass('icon-loading-small').addClass('icon-delete');
 								});
 							}
 						}
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 65a89ef85cd0f5ac7d4c7c346d00a4396fc62f09..94b52b395e56e116f30ce137186308fa57f9bbc9 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -421,15 +421,15 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.setFiles(testFiles);
 			doDelete();
 
-			expect(fileList.findFileEl('One.txt').find('.progress-icon:not(.delete-icon)').length).toEqual(1);
-			expect(fileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1);
+			expect(fileList.findFileEl('One.txt').find('.icon-loading-small:not(.icon-delete)').length).toEqual(1);
+			expect(fileList.findFileEl('Three.pdf').find('.icon-delete:not(.icon-loading-small)').length).toEqual(1);
 		});
 		it('shows spinner on all files when deleting all', function() {
 			fileList.setFiles(testFiles);
 
 			fileList.do_delete();
 
-			expect(fileList.$fileList.find('tr .progress-icon:not(.delete-icon)').length).toEqual(4);
+			expect(fileList.$fileList.find('tr .icon-loading-small:not(.icon-delete)').length).toEqual(4);
 		});
 		it('updates summary when deleting last file', function() {
 			var $summary;
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index c59a132b8c4475ea4b466441ce6d7eb188229007..376ee7b01ca578bf1444007b2609fcc655252d66 100644
Binary files a/apps/files_trashbin/js/app.js and b/apps/files_trashbin/js/app.js differ
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 826c1bd64d51a633ec34c4fa10cbb8a3682af3fa..b8688d8976563fcfa4ebf987a18265291d136fb3 100644
Binary files a/apps/files_trashbin/js/filelist.js and b/apps/files_trashbin/js/filelist.js differ
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 5aba741b64b50e07fe78966ef4800f02bad38f60..0f1584c623fcbc1ba25f06ff6fb3e3ab286824bc 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -15,8 +15,8 @@ select {
     font-family: Frutiger, Calibri, 'Myriad Pro', Myriad, Arial, sans-serif;
 }
 
-.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
-.lte8 .delete-icon:hover, .delete-icon:focus {
+.lte8 .icon-delete { background-image: url('../img/actions/delete.png'); }
+.lte8 .icon-delete:hover, .icon-delete:focus {
 	background-image: url('../img/actions/delete-hover.png');
 }
 
diff --git a/tests/acceptance/tests/pages/files.page.js b/tests/acceptance/tests/pages/files.page.js
index 8efe33ee99a7079a7931dff0f0dbf9ed5b2b4f77..e5445309b266a8305c25ca1e078bbb83068955ea 100644
--- a/tests/acceptance/tests/pages/files.page.js
+++ b/tests/acceptance/tests/pages/files.page.js
@@ -78,7 +78,7 @@
   };
 
   FilesPage.prototype.deleteButtonId = function(fileName) {
-    return by.css("tr[data-file='" + fileName +  "'] .action.delete.delete-icon");
+    return by.css("tr[data-file='" + fileName +  "'] .action.delete.icon-delete");
   };
 
 //================ SHARED ===============================================//