diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index a08c23d4fa03de9f4faf542d61ca4941eb0ad4a7..79ee355125d8f3989a6875eb12edc577feb3b2d6 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -670,7 +670,7 @@
 		 */
 		_createRow: function(fileData, options) {
 			var td, simpleSize, basename, extension, sizeColor,
-				icon = OC.Util.replaceSVGIcon(fileData.icon),
+				icon = OC.MimeType.getIconUrl(fileData.mimetype),
 				name = fileData.name,
 				type = fileData.type || 'file',
 				mtime = parseInt(fileData.mtime, 10),
@@ -710,14 +710,6 @@
 				path = this.getCurrentDirectory();
 			}
 
-			if (type === 'dir') {
-				// use default folder icon
-				icon = icon || OC.imagePath('core', 'filetypes/folder');
-			}
-			else {
-				icon = icon || OC.imagePath('core', 'filetypes/file');
-			}
-
 			// filename td
 			td = $('<td class="filename"></td>');