diff --git a/filemanager/inc/class.uifilemanager.inc.php b/filemanager/inc/class.uifilemanager.inc.php
index e2675be076..73b6f114fc 100755
--- a/filemanager/inc/class.uifilemanager.inc.php
+++ b/filemanager/inc/class.uifilemanager.inc.php
@@ -1985,11 +1985,11 @@
 			{
 				$mime_type='unknown';
 			}
+			$mime_type=	strtolower(str_replace	('/','_',$mime_type));
+			list($mime_part) = explode('_',$mime_type);
 
-			$mime_type=	str_replace	('/','_',$mime_type);
-
-			$img=$GLOBALS['egw']->common->image('filemanager',$icon='mime'.$size.'_'.strtolower($mime_type));
-			if(!$img)
+			if (!($img=$GLOBALS['egw']->common->image('filemanager',$icon='mime'.$size.'_'.$mime_type)) &&
+				!($img=$GLOBALS['egw']->common->image('filemanager',$icon='mime'.$size.'_'.$mime_part)))
 			{
 				$img = $GLOBALS['egw']->common->image('filemanager',$icon='mime'.$size.'_unknown');
 			}
diff --git a/filemanager/templates/default/images/mime16_application_msexcel.gif b/filemanager/templates/default/images/mime16_application_msexcel.gif
new file mode 100644
index 0000000000..347c0c36cd
Binary files /dev/null and b/filemanager/templates/default/images/mime16_application_msexcel.gif differ
diff --git a/filemanager/templates/default/images/mime16_application_mspowerpoint.gif b/filemanager/templates/default/images/mime16_application_mspowerpoint.gif
new file mode 100644
index 0000000000..f37bb09efe
Binary files /dev/null and b/filemanager/templates/default/images/mime16_application_mspowerpoint.gif differ
diff --git a/filemanager/templates/default/images/mime16_application_msword.gif b/filemanager/templates/default/images/mime16_application_msword.gif
new file mode 100644
index 0000000000..a343a3ca7e
Binary files /dev/null and b/filemanager/templates/default/images/mime16_application_msword.gif differ
diff --git a/filemanager/templates/default/images/mime16_application_octet-stream.gif b/filemanager/templates/default/images/mime16_application_octet-stream.gif
new file mode 100644
index 0000000000..947c219b7d
Binary files /dev/null and b/filemanager/templates/default/images/mime16_application_octet-stream.gif differ
diff --git a/filemanager/templates/default/images/mime16_application_pdf.gif b/filemanager/templates/default/images/mime16_application_pdf.gif
new file mode 100644
index 0000000000..f192df51fa
Binary files /dev/null and b/filemanager/templates/default/images/mime16_application_pdf.gif differ
diff --git a/filemanager/templates/default/images/mime16_application_rtf.png b/filemanager/templates/default/images/mime16_application_rtf.png
new file mode 100644
index 0000000000..d2bed0b59e
Binary files /dev/null and b/filemanager/templates/default/images/mime16_application_rtf.png differ
diff --git a/filemanager/templates/default/images/mime16_application_zip.gif b/filemanager/templates/default/images/mime16_application_zip.gif
new file mode 100644
index 0000000000..95bf122cba
Binary files /dev/null and b/filemanager/templates/default/images/mime16_application_zip.gif differ
diff --git a/filemanager/templates/default/images/mime16_audio.gif b/filemanager/templates/default/images/mime16_audio.gif
new file mode 100644
index 0000000000..063356c08b
Binary files /dev/null and b/filemanager/templates/default/images/mime16_audio.gif differ
diff --git a/filemanager/templates/default/images/mime16_image.png b/filemanager/templates/default/images/mime16_image.png
new file mode 100644
index 0000000000..fdf537038f
Binary files /dev/null and b/filemanager/templates/default/images/mime16_image.png differ
diff --git a/filemanager/templates/default/images/mime16_image_gif.gif b/filemanager/templates/default/images/mime16_image_gif.gif
new file mode 100644
index 0000000000..837747334e
Binary files /dev/null and b/filemanager/templates/default/images/mime16_image_gif.gif differ
diff --git a/filemanager/templates/default/images/mime16_image_jpeg.gif b/filemanager/templates/default/images/mime16_image_jpeg.gif
new file mode 100644
index 0000000000..a6a4e78b22
Binary files /dev/null and b/filemanager/templates/default/images/mime16_image_jpeg.gif differ
diff --git a/filemanager/templates/default/images/mime16_image_png.gif b/filemanager/templates/default/images/mime16_image_png.gif
new file mode 100644
index 0000000000..f2684ace7a
Binary files /dev/null and b/filemanager/templates/default/images/mime16_image_png.gif differ
diff --git a/filemanager/templates/default/images/mime16_text_plain.png b/filemanager/templates/default/images/mime16_text.png
similarity index 100%
rename from filemanager/templates/default/images/mime16_text_plain.png
rename to filemanager/templates/default/images/mime16_text.png
diff --git a/filemanager/templates/default/images/mime16_text_html.png b/filemanager/templates/default/images/mime16_text_html.png
new file mode 100644
index 0000000000..9e5bc52cf2
Binary files /dev/null and b/filemanager/templates/default/images/mime16_text_html.png differ
diff --git a/filemanager/templates/default/images/mime16_video.gif b/filemanager/templates/default/images/mime16_video.gif
new file mode 100644
index 0000000000..956ef89db0
Binary files /dev/null and b/filemanager/templates/default/images/mime16_video.gif differ