diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/application-pdf.png
similarity index 100%
rename from core/img/filetypes/pdf.png
rename to core/img/filetypes/application-pdf.png
diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/application-rss+xml.png
similarity index 100%
rename from core/img/filetypes/rss.png
rename to core/img/filetypes/application-rss+xml.png
diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/image-svg+xml.png
similarity index 100%
rename from core/img/filetypes/svg.png
rename to core/img/filetypes/image-svg+xml.png
diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png
deleted file mode 100644
index 813f712f72..0000000000
Binary files a/core/img/filetypes/msword.png and /dev/null differ
diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/text-calendar.png
similarity index 100%
rename from core/img/filetypes/ical.png
rename to core/img/filetypes/text-calendar.png
diff --git a/core/img/filetypes/css.png b/core/img/filetypes/text-css.png
similarity index 100%
rename from core/img/filetypes/css.png
rename to core/img/filetypes/text-css.png
diff --git a/core/img/filetypes/html.png b/core/img/filetypes/text-html.png
similarity index 100%
rename from core/img/filetypes/html.png
rename to core/img/filetypes/text-html.png
diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/text-x-c++.png
similarity index 100%
rename from core/img/filetypes/cplusplus.png
rename to core/img/filetypes/text-x-c++.png
diff --git a/core/img/filetypes/c.png b/core/img/filetypes/text-x-c.png
similarity index 100%
rename from core/img/filetypes/c.png
rename to core/img/filetypes/text-x-c.png
diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/text-x-csharp.png
similarity index 100%
rename from core/img/filetypes/csharp.png
rename to core/img/filetypes/text-x-csharp.png
diff --git a/core/img/filetypes/h.png b/core/img/filetypes/text-x-h.png
similarity index 100%
rename from core/img/filetypes/h.png
rename to core/img/filetypes/text-x-h.png
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 6609222079..84762bb561 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -3,7 +3,7 @@ FileList={
 		$('#fileList').empty().html(fileListHtml);
 	},
 	addFile:function(name,size,lastModified,loading){
-		var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file');
+		var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
 		var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">';
 		if(name.indexOf('.')!=-1){
 			var basename=name.substr(0,name.lastIndexOf('.'));
diff --git a/lib/helper.php b/lib/helper.php
index 9c2b5fc33c..c2a81ba330 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -101,20 +101,20 @@ class OC_Helper {
 
 		// Is it a dir?
 		if( $mimetype == "dir" ){
-			return OC::$WEBROOT."/core/img/places/folder.svg";
+			return OC::$WEBROOT."/core/img/filetypes/folder.png";
 		}
 
 		// Icon exists?
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
-			return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
 		//try only the first part of the filetype
 		$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
-			return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
 		else{
-			return OC::$WEBROOT."/core/img/filetypes/file.svg";
+			return OC::$WEBROOT."/core/img/filetypes/file.png";
 		}
 	}