66 files changed, 3 insertions, 3 deletions

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 128fd5389..cab7384b2 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -369,7 +369,7 @@ function css_filetypes(){
 
     // default style
     echo '.mediafile {';
-    echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/16x16/file.png) 0px 1px no-repeat;';
+    echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/file.png) 0px 1px no-repeat;';
     echo ' padding-left: 18px;';
     echo ' padding-bottom: 1px;';
     echo '}';
@@ -377,7 +377,7 @@ function css_filetypes(){
     // additional styles when icon available
     // scan directory for all icons
     $exts = array();
-    if($dh = opendir(DOKU_INC.'lib/images/fileicons/16x16')){
+    if($dh = opendir(DOKU_INC.'lib/images/fileicons')){
         while(false !== ($file = readdir($dh))){
             if(preg_match('/([_\-a-z0-9]+(?:\.[_\-a-z0-9]+)*?)\.(png|gif)/i',$file,$match)){
                 $ext = strtolower($match[1]);
@@ -392,7 +392,7 @@ function css_filetypes(){
     foreach($exts as $ext=>$type){
         $class = preg_replace('/[^_\-a-z0-9]+/','_',$ext);
         echo ".mf_$class {";
-        echo '  background-image: url('.DOKU_BASE.'lib/images/fileicons/16x16/'.$ext.$type.')';
+        echo '  background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.$type.')';
         echo '}';
     }
 }
diff --git a/lib/images/fileicons/16x16/7z.png b/lib/images/fileicons/7z.png
index 037cd73a0..037cd73a0 100644
--- a/lib/images/fileicons/16x16/7z.png
+++ b/lib/images/fileicons/7z.png
diff --git a/lib/images/fileicons/16x16/asm.png b/lib/images/fileicons/asm.png
index a88d01665..a88d01665 100644
--- a/lib/images/fileicons/16x16/asm.png
+++ b/lib/images/fileicons/asm.png
diff --git a/lib/images/fileicons/16x16/bash.png b/lib/images/fileicons/bash.png
index 047be8c6a..047be8c6a 100644
--- a/lib/images/fileicons/16x16/bash.png
+++ b/lib/images/fileicons/bash.png
diff --git a/lib/images/fileicons/16x16/bz2.png b/lib/images/fileicons/bz2.png
index a4bcc70a1..a4bcc70a1 100644
--- a/lib/images/fileicons/16x16/bz2.png
+++ b/lib/images/fileicons/bz2.png
diff --git a/lib/images/fileicons/16x16/c.png b/lib/images/fileicons/c.png
index 5e91b8473..5e91b8473 100644
--- a/lib/images/fileicons/16x16/c.png
+++ b/lib/images/fileicons/c.png
diff --git a/lib/images/fileicons/16x16/cc.png b/lib/images/fileicons/cc.png
index 432c95901..432c95901 100644
--- a/lib/images/fileicons/16x16/cc.png
+++ b/lib/images/fileicons/cc.png
diff --git a/lib/images/fileicons/16x16/conf.png b/lib/images/fileicons/conf.png
index 94ace02cf..94ace02cf 100644
--- a/lib/images/fileicons/16x16/conf.png
+++ b/lib/images/fileicons/conf.png
diff --git a/lib/images/fileicons/16x16/cpp.png b/lib/images/fileicons/cpp.png
index 6c6be4263..6c6be4263 100644
--- a/lib/images/fileicons/16x16/cpp.png
+++ b/lib/images/fileicons/cpp.png
diff --git a/lib/images/fileicons/16x16/csh.png b/lib/images/fileicons/csh.png
index 14e01b2a7..14e01b2a7 100644
--- a/lib/images/fileicons/16x16/csh.png
+++ b/lib/images/fileicons/csh.png
diff --git a/lib/images/fileicons/16x16/css.png b/lib/images/fileicons/css.png
index 5638f1879..5638f1879 100644
--- a/lib/images/fileicons/16x16/css.png
+++ b/lib/images/fileicons/css.png
diff --git a/lib/images/fileicons/16x16/csv.png b/lib/images/fileicons/csv.png
index af37ba577..af37ba577 100644
--- a/lib/images/fileicons/16x16/csv.png
+++ b/lib/images/fileicons/csv.png
diff --git a/lib/images/fileicons/16x16/deb.png b/lib/images/fileicons/deb.png
index 9eb29019b..9eb29019b 100644
--- a/lib/images/fileicons/16x16/deb.png
+++ b/lib/images/fileicons/deb.png
diff --git a/lib/images/fileicons/16x16/diff.png b/lib/images/fileicons/diff.png
index c81c4ff2c..c81c4ff2c 100644
--- a/lib/images/fileicons/16x16/diff.png
+++ b/lib/images/fileicons/diff.png
diff --git a/lib/images/fileicons/16x16/doc.png b/lib/images/fileicons/doc.png
index 9324f20b3..9324f20b3 100644
--- a/lib/images/fileicons/16x16/doc.png
+++ b/lib/images/fileicons/doc.png
diff --git a/lib/images/fileicons/16x16/docx.png b/lib/images/fileicons/docx.png
index e3986295d..e3986295d 100644
--- a/lib/images/fileicons/16x16/docx.png
+++ b/lib/images/fileicons/docx.png
diff --git a/lib/images/fileicons/16x16/file.png b/lib/images/fileicons/file.png
index 8f31d38ac..8f31d38ac 100644
--- a/lib/images/fileicons/16x16/file.png
+++ b/lib/images/fileicons/file.png
diff --git a/lib/images/fileicons/16x16/gif.png b/lib/images/fileicons/gif.png
index bcbb8366b..bcbb8366b 100644
--- a/lib/images/fileicons/16x16/gif.png
+++ b/lib/images/fileicons/gif.png
diff --git a/lib/images/fileicons/16x16/gz.png b/lib/images/fileicons/gz.png
index 0a0a4b94f..0a0a4b94f 100644
--- a/lib/images/fileicons/16x16/gz.png
+++ b/lib/images/fileicons/gz.png
diff --git a/lib/images/fileicons/16x16/h.png b/lib/images/fileicons/h.png
index a208d3159..a208d3159 100644
--- a/lib/images/fileicons/16x16/h.png
+++ b/lib/images/fileicons/h.png
diff --git a/lib/images/fileicons/16x16/hpp.png b/lib/images/fileicons/hpp.png
index decd78b7e..decd78b7e 100644
--- a/lib/images/fileicons/16x16/hpp.png
+++ b/lib/images/fileicons/hpp.png
diff --git a/lib/images/fileicons/16x16/htm.png b/lib/images/fileicons/htm.png
index e0ead2bff..e0ead2bff 100644
--- a/lib/images/fileicons/16x16/htm.png
+++ b/lib/images/fileicons/htm.png
diff --git a/lib/images/fileicons/16x16/html.png b/lib/images/fileicons/html.png
index e0ead2bff..e0ead2bff 100644
--- a/lib/images/fileicons/16x16/html.png
+++ b/lib/images/fileicons/html.png
diff --git a/lib/images/fileicons/16x16/ico.png b/lib/images/fileicons/ico.png
index 93343717c..93343717c 100644
--- a/lib/images/fileicons/16x16/ico.png
+++ b/lib/images/fileicons/ico.png
diff --git a/lib/images/fileicons/16x16/java.png b/lib/images/fileicons/java.png
index 6adebc02b..6adebc02b 100644
--- a/lib/images/fileicons/16x16/java.png
+++ b/lib/images/fileicons/java.png
diff --git a/lib/images/fileicons/16x16/jpeg.png b/lib/images/fileicons/jpeg.png
index 29dea5761..29dea5761 100644
--- a/lib/images/fileicons/16x16/jpeg.png
+++ b/lib/images/fileicons/jpeg.png
diff --git a/lib/images/fileicons/16x16/jpg.png b/lib/images/fileicons/jpg.png
index 29dea5761..29dea5761 100644
--- a/lib/images/fileicons/16x16/jpg.png
+++ b/lib/images/fileicons/jpg.png
diff --git a/lib/images/fileicons/16x16/js.png b/lib/images/fileicons/js.png
index 37d3a7958..37d3a7958 100644
--- a/lib/images/fileicons/16x16/js.png
+++ b/lib/images/fileicons/js.png
diff --git a/lib/images/fileicons/16x16/json.png b/lib/images/fileicons/json.png
index 0f32375e6..0f32375e6 100644
--- a/lib/images/fileicons/16x16/json.png
+++ b/lib/images/fileicons/json.png
diff --git a/lib/images/fileicons/16x16/mp3.png b/lib/images/fileicons/mp3.png
index 7c6d37184..7c6d37184 100644
--- a/lib/images/fileicons/16x16/mp3.png
+++ b/lib/images/fileicons/mp3.png
diff --git a/lib/images/fileicons/16x16/mp4.png b/lib/images/fileicons/mp4.png
index ee5b91150..ee5b91150 100644
--- a/lib/images/fileicons/16x16/mp4.png
+++ b/lib/images/fileicons/mp4.png
diff --git a/lib/images/fileicons/16x16/odc.png b/lib/images/fileicons/odc.png
index b2a879a84..b2a879a84 100644
--- a/lib/images/fileicons/16x16/odc.png
+++ b/lib/images/fileicons/odc.png
diff --git a/lib/images/fileicons/16x16/odf.png b/lib/images/fileicons/odf.png
index 65db17827..65db17827 100644
--- a/lib/images/fileicons/16x16/odf.png
+++ b/lib/images/fileicons/odf.png
diff --git a/lib/images/fileicons/16x16/odg.png b/lib/images/fileicons/odg.png
index bab8fe1a7..bab8fe1a7 100644
--- a/lib/images/fileicons/16x16/odg.png
+++ b/lib/images/fileicons/odg.png
diff --git a/lib/images/fileicons/16x16/odi.png b/lib/images/fileicons/odi.png
index f0df8e582..f0df8e582 100644
--- a/lib/images/fileicons/16x16/odi.png
+++ b/lib/images/fileicons/odi.png
diff --git a/lib/images/fileicons/16x16/odp.png b/lib/images/fileicons/odp.png
index 4008c4e54..4008c4e54 100644
--- a/lib/images/fileicons/16x16/odp.png
+++ b/lib/images/fileicons/odp.png
diff --git a/lib/images/fileicons/16x16/ods.png b/lib/images/fileicons/ods.png
index c7d5e263c..c7d5e263c 100644
--- a/lib/images/fileicons/16x16/ods.png
+++ b/lib/images/fileicons/ods.png
diff --git a/lib/images/fileicons/16x16/odt.png b/lib/images/fileicons/odt.png
index 8fd5fd35c..8fd5fd35c 100644
--- a/lib/images/fileicons/16x16/odt.png
+++ b/lib/images/fileicons/odt.png
diff --git a/lib/images/fileicons/16x16/ogg.png b/lib/images/fileicons/ogg.png
index 38f615c99..38f615c99 100644
--- a/lib/images/fileicons/16x16/ogg.png
+++ b/lib/images/fileicons/ogg.png
diff --git a/lib/images/fileicons/16x16/ogv.png b/lib/images/fileicons/ogv.png
index a937dfc4c..a937dfc4c 100644
--- a/lib/images/fileicons/16x16/ogv.png
+++ b/lib/images/fileicons/ogv.png
diff --git a/lib/images/fileicons/16x16/pas.png b/lib/images/fileicons/pas.png
index 0a91eff4a..0a91eff4a 100644
--- a/lib/images/fileicons/16x16/pas.png
+++ b/lib/images/fileicons/pas.png
diff --git a/lib/images/fileicons/16x16/pdf.png b/lib/images/fileicons/pdf.png
index 1bc154641..1bc154641 100644
--- a/lib/images/fileicons/16x16/pdf.png
+++ b/lib/images/fileicons/pdf.png
diff --git a/lib/images/fileicons/16x16/pl.png b/lib/images/fileicons/pl.png
index 7f43f6399..7f43f6399 100644
--- a/lib/images/fileicons/16x16/pl.png
+++ b/lib/images/fileicons/pl.png
diff --git a/lib/images/fileicons/16x16/png.png b/lib/images/fileicons/png.png
index 007270532..007270532 100644
--- a/lib/images/fileicons/16x16/png.png
+++ b/lib/images/fileicons/png.png
diff --git a/lib/images/fileicons/16x16/ppt.png b/lib/images/fileicons/ppt.png
index e097ceb90..e097ceb90 100644
--- a/lib/images/fileicons/16x16/ppt.png
+++ b/lib/images/fileicons/ppt.png
diff --git a/lib/images/fileicons/16x16/pptx.png b/lib/images/fileicons/pptx.png
index 9dda61a12..9dda61a12 100644
--- a/lib/images/fileicons/16x16/pptx.png
+++ b/lib/images/fileicons/pptx.png
diff --git a/lib/images/fileicons/16x16/ps.png b/lib/images/fileicons/ps.png
index e61d1aa7e..e61d1aa7e 100644
--- a/lib/images/fileicons/16x16/ps.png
+++ b/lib/images/fileicons/ps.png
diff --git a/lib/images/fileicons/16x16/py.png b/lib/images/fileicons/py.png
index 4745cb972..4745cb972 100644
--- a/lib/images/fileicons/16x16/py.png
+++ b/lib/images/fileicons/py.png
diff --git a/lib/images/fileicons/16x16/rar.png b/lib/images/fileicons/rar.png
index f15d4ce5b..f15d4ce5b 100644
--- a/lib/images/fileicons/16x16/rar.png
+++ b/lib/images/fileicons/rar.png
diff --git a/lib/images/fileicons/16x16/rpm.png b/lib/images/fileicons/rpm.png
index 831424ff5..831424ff5 100644
--- a/lib/images/fileicons/16x16/rpm.png
+++ b/lib/images/fileicons/rpm.png
diff --git a/lib/images/fileicons/16x16/rtf.png b/lib/images/fileicons/rtf.png
index 4486932ed..4486932ed 100644
--- a/lib/images/fileicons/16x16/rtf.png
+++ b/lib/images/fileicons/rtf.png
diff --git a/lib/images/fileicons/16x16/sh.png b/lib/images/fileicons/sh.png
index 60266bf3c..60266bf3c 100644
--- a/lib/images/fileicons/16x16/sh.png
+++ b/lib/images/fileicons/sh.png
diff --git a/lib/images/fileicons/16x16/swf.png b/lib/images/fileicons/swf.png
index b45a72cc9..b45a72cc9 100644
--- a/lib/images/fileicons/16x16/swf.png
+++ b/lib/images/fileicons/swf.png
diff --git a/lib/images/fileicons/16x16/sxc.png b/lib/images/fileicons/sxc.png
index 6084d49b7..6084d49b7 100644
--- a/lib/images/fileicons/16x16/sxc.png
+++ b/lib/images/fileicons/sxc.png
diff --git a/lib/images/fileicons/16x16/sxd.png b/lib/images/fileicons/sxd.png
index aecd863a0..aecd863a0 100644
--- a/lib/images/fileicons/16x16/sxd.png
+++ b/lib/images/fileicons/sxd.png
diff --git a/lib/images/fileicons/16x16/sxi.png b/lib/images/fileicons/sxi.png
index b34b33ca3..b34b33ca3 100644
--- a/lib/images/fileicons/16x16/sxi.png
+++ b/lib/images/fileicons/sxi.png
diff --git a/lib/images/fileicons/16x16/sxw.png b/lib/images/fileicons/sxw.png
index a30869d9d..a30869d9d 100644
--- a/lib/images/fileicons/16x16/sxw.png
+++ b/lib/images/fileicons/sxw.png
diff --git a/lib/images/fileicons/16x16/tar.png b/lib/images/fileicons/tar.png
index e57029adc..e57029adc 100644
--- a/lib/images/fileicons/16x16/tar.png
+++ b/lib/images/fileicons/tar.png
diff --git a/lib/images/fileicons/16x16/tgz.png b/lib/images/fileicons/tgz.png
index 25ef9e15a..25ef9e15a 100644
--- a/lib/images/fileicons/16x16/tgz.png
+++ b/lib/images/fileicons/tgz.png
diff --git a/lib/images/fileicons/16x16/txt.png b/lib/images/fileicons/txt.png
index 4fd921655..4fd921655 100644
--- a/lib/images/fileicons/16x16/txt.png
+++ b/lib/images/fileicons/txt.png
diff --git a/lib/images/fileicons/16x16/wav.png b/lib/images/fileicons/wav.png
index c8880c62e..c8880c62e 100644
--- a/lib/images/fileicons/16x16/wav.png
+++ b/lib/images/fileicons/wav.png
diff --git a/lib/images/fileicons/16x16/webm.png b/lib/images/fileicons/webm.png
index 55db61914..55db61914 100644
--- a/lib/images/fileicons/16x16/webm.png
+++ b/lib/images/fileicons/webm.png
diff --git a/lib/images/fileicons/16x16/xls.png b/lib/images/fileicons/xls.png
index 12a32a295..12a32a295 100644
--- a/lib/images/fileicons/16x16/xls.png
+++ b/lib/images/fileicons/xls.png
diff --git a/lib/images/fileicons/16x16/xlsx.png b/lib/images/fileicons/xlsx.png
index b2e85489d..b2e85489d 100644
--- a/lib/images/fileicons/16x16/xlsx.png
+++ b/lib/images/fileicons/xlsx.png
diff --git a/lib/images/fileicons/16x16/xml.png b/lib/images/fileicons/xml.png
index 4480a6385..4480a6385 100644
--- a/lib/images/fileicons/16x16/xml.png
+++ b/lib/images/fileicons/xml.png
diff --git a/lib/images/fileicons/16x16/zip.png b/lib/images/fileicons/zip.png
index 4a36a35ff..4a36a35ff 100644
--- a/lib/images/fileicons/16x16/zip.png
+++ b/lib/images/fileicons/zip.png