diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index c3d4fba9ef..015635c2e1 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -665,11 +665,11 @@
 	OCA.Files.FileActions.updateFileActionSpinner = function($downloadButtonElement, showIt) {
 		var $icon = $downloadButtonElement.find('.icon');
 		if (showIt) {
-			var $loadingIcon = $('<span class="icon loading"></span>');
+			var $loadingIcon = $('<span class="icon icon-loading-small"></span>');
 			$icon.after($loadingIcon);
 			$icon.addClass('hidden');
 		} else {
-			$downloadButtonElement.find('.loading').remove();
+			$downloadButtonElement.find('.icon-loading-small').remove();
 			$downloadButtonElement.find('.icon').removeClass('hidden');
 		}
 	};
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index 3f46a27d1f..75a1871369 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -666,13 +666,13 @@ describe('OCA.Files.FileActions tests', function() {
 
 		it('replaces download icon with spinner', function() {
 			FileActions.updateFileActionSpinner($el, true);
-			expect($el.find('.icon.loading').length).toEqual(1);
+			expect($el.find('.icon.icon-loading-small').length).toEqual(1);
 			expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(true);
 		});
 		it('replaces spinner back with download icon with spinner', function() {
 			FileActions.updateFileActionSpinner($el, true);
 			FileActions.updateFileActionSpinner($el, false);
-			expect($el.find('.icon.loading').length).toEqual(0);
+			expect($el.find('.icon.icon-loading-small').length).toEqual(0);
 			expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(false);
 		});
 	});