diff --git a/inc/html.php b/inc/html.php
index 5dbfcd92157fb54b3c49561988273e1d62fd41c0..66648ae0eefc61372cd2b7e8f1af573fd4669a1b 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1047,7 +1047,8 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
 
    <div class="toolbar">
       <div id="draft__status"><?php if($INFO['draft']) echo $lang['draftdate'].' '.date($conf['dformat']);?></div>
-      <div id="tool__bar"></div>
+      <div id="tool__bar"><a href="<?php echo DOKU_BASE?>/lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
+      target="_blank"><?php echo $lang['mediaselect'] ?></a></div>
 
       <?php if($wr){?>
       <script type="text/javascript" charset="utf-8">
diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fad9098a27c51a756ecdca684e7f1e39cb9d35da
Binary files /dev/null and b/lib/images/fileicons/bz2.png differ
diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png
index 2ac2cf0cc7989f360e23be6fe208913355e78d8c..64b0b23c60df45b3ac813c3033d3c8001bb40322 100644
Binary files a/lib/images/fileicons/conf.png and b/lib/images/fileicons/conf.png differ
diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png
index 53a4c0f0c93d4e0a6ddad2d099745d8023e9257b..4ab359e9bbdda85aaa9ffebf423c20faf2df7d88 100644
Binary files a/lib/images/fileicons/deb.png and b/lib/images/fileicons/deb.png differ
diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png
index 6448319511802f025dca762d7ba2cbb7d6857e3d..ff12b7306002211213f9d4a7daabc79670b71c09 100644
Binary files a/lib/images/fileicons/file.png and b/lib/images/fileicons/file.png differ
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 48464017e4b540769bfeff67f96220db793d71cb..ada70194d1bfe27ed71cd7dbc3a0b09c4c0aa51d 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -128,6 +128,9 @@ function initToolbar(tbid,edid,tb){
     var toolbar = $(tbid);
     if(!toolbar) return;
 
+    //empty the toolbar area:
+    toolbar.innerHTML='';
+
     var cnt = tb.length;
     for(var i=0; i<cnt; i++){
         // create new button