diff --git a/inc/media.php b/inc/media.php
index 3e640237a2a50557af2048a1821a8eb60ab32c79..7da1f08990e519936e72828545ac8c718550bea8 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1355,6 +1355,20 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
     echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
         'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
 
+    // mediamanager button
+    $link = wl('',array('do'=>'media','image'=>$item['id']));
+    echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/mediamanager.png" '.
+        'alt="'.$lang['btn_media'].'" title="'.$lang['btn_media'].'" class="btn" /></a>';
+
+    // delete button
+    if($item['writable'] && $auth >= AUTH_DELETE){
+        $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
+            '&amp;sectok='.getSecurityToken();
+        echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$item['id'].'">'.
+            '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
+            'title="'.$lang['btn_delete'].'" class="btn" /></a>';
+    }
+
     echo '<div class="example" id="ex_'.str_replace(':','_',$item['id']).'">';
     echo $lang['mediausage'].' <code>{{:'.$item['id'].'}}</code>';
     echo '</div>';
diff --git a/lib/images/mediamanager.png b/lib/images/mediamanager.png
new file mode 100644
index 0000000000000000000000000000000000000000..822b8458aad4d10125fa0c5201913b59d6a6b07b
Binary files /dev/null and b/lib/images/mediamanager.png differ