diff --git a/inc/media.php b/inc/media.php
index 7999fd255837917227eb7a092604141d5d6b221e..bcc5e4400d8ac5fc034277a874c7a602d6db53d9 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1430,7 +1430,6 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
         echo '</a>';
     }
     echo '</dt>';
-    //echo '<input type=checkbox />';
     if (!$display_namespace) {
         $name = hsc($file);
     } else {
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index e25c0c9f4fc363804dd995331609661d53ae0d82..26f30fd3f05884518eb55b1ba3b5d8dc10a40eee 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -20,12 +20,17 @@
     margin-right: 0;
 }
 
-#mediamanager__page .panelContent {
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 0;
-    margin: 0;
-    position: relative;
+#mediamanager__page .namespaces {
+    width: 15%;
+    min-width: 125px;
+}
+#mediamanager__page .filelist {
+    width: 45%;
+    min-width: 375px;
+}
+#mediamanager__page .file {
+    width: 35%;
+    min-width: 290px;
 }
 
 #mediamanager__page .panelHeader {
@@ -37,19 +42,12 @@
     overflow: hidden;
 }
 
-#mediamanager__page .namespaces {
-    width: 15%;
-    min-width: 125px;
-}
-
-#mediamanager__page .filelist {
-    width: 45%;
-    min-width: 375px;
-}
-
-#mediamanager__page .file {
-    /* width: 35%; @todo: needed? */
-    min-width: 290px;
+#mediamanager__page .panelContent {
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 0;
+    margin: 0;
+    position: relative;
 }
 
 #mediamanager__page .ui-resizable-e {
@@ -58,7 +56,6 @@
     /* icon from Crystal Clear icon set (LGPL) */
     background: transparent url(images/resizecol.png) 0 25px no-repeat;
 }
-
 #mediamanager__page .ui-resizable-e:hover {
     width: 6px;
     right: -8px;
@@ -84,7 +81,6 @@
     margin-left: .2em;
     list-style: none;
 }
-
 #mediamanager__page .namespaces ul ul {
     margin-left: 1em;
 }
@@ -113,6 +109,10 @@
     margin: 0;
     padding: 0;
 }
+#mediamanager__page .panelHeader ul li {
+    color: __text__;
+    float: left;
+}
 
 #mediamanager__page .panelHeader form.options label span span {
     display: none; /* @todo: hide accessibly */
@@ -212,17 +212,6 @@
     white-space: normal;
 }
 
-#mediamanager__page .filelist .thumbs li input[type=checkbox] {
-    display: none;
-    float: left;
-    margin: 3px;
-}
-
-#mediamanager__page .filelist .thumbs li:hover input[type=checkbox],
-#mediamanager__page .filelist .thumbs li input[type=checkbox]:checked {
-    display: block;
-}
-
 /* rows */
 
 #mediamanager__page .filelist .rows li {
@@ -280,16 +269,12 @@
 
 #mediamanager__page .filelist .rows li .date {
     width: 20%;
-}
-
-#mediamanager__page .filelist .rows li .date {
     font-style: italic;
     white-space: normal;
 }
 
 #mediamanager__page .filelist .rows .icon {
-    max-width: 16px;
-    max-height: 16px;
+    margin-top: 12px;
 }
 
 #mediamanager__page .filelist .rows li .image span,
@@ -301,17 +286,6 @@
     height: 40px;
 }
 
-#mediamanager__page .filelist .rows li input[type=checkbox] {
-    display: none;
-    float: left;
-    margin: 3px;
-}
-
-#mediamanager__page .filelist .rows li:hover input[type=checkbox],
-#mediamanager__page .filelist .rows li input[type=checkbox]:checked {
-    display: block;
-}
-
 /*____________ Upload panel ____________*/
 
 #mediamanager__page div.upload {
@@ -330,6 +304,9 @@
     margin-bottom: 5px;
     list-style: none;
 }
+#mediamanager__page .file ul.actions li {
+    display: inline;
+}
 
 #mediamanager__page .file div.image {
     margin-bottom: 5px;
@@ -358,7 +335,7 @@
     margin-bottom: 5px;
 }
 
-#mediamanager__page form.meta label {
+#mediamanager__page form.meta label span {
     display: block;
 }
 
@@ -398,43 +375,38 @@
 /* File diff */
 
 #mediamanager__diff {
-    margin-top: 10px;
-}
-
-#mediamanager__diff_table {
-    padding: 0;
-    margin: 0;
-    margin-top: 10px;
 }
 
-#mediamanager__diff_table li {
+#mediamanager__diff td,
+#mediamanager__diff th {
     width: 48%;
-    display: inline-block;
-    margin: 0;
-    margin-bottom: 10px;
-    padding: 2px;
+    margin: 0 5px 10px 0;
+    padding: 0;
     vertical-align: top;
-    zoom: 1;
-    color: __text__;
+    text-align: left;
 }
 
-* html #mediamanager__diff_table li {
-    display: inline;
+/* For IE7 */
+*:first-child+html #mediamanager__diff td {
+    width: 45%;
 }
 
-*+html #mediamanager__diff_table li {
-    display: inline;
+#mediamanager__diff th {
+    font-weight: normal;
 }
-
-/* For IE7 */
-*:first-child+html #mediamanager__diff_table li {
-    width: 45%;
+#mediamanager__diff th a {
+    font-weight: bold;
+}
+#mediamanager__diff th span {
+    font-size: 90%;
 }
 
 /* Image diff */
 
-#mediamanager__page dl.img_tags dd.highlighted{
+#mediamanager__diff dl dd strong{
     background-color: __highlight__;
+    color: __text__;
+    font-weight: normal;
 }
 
 #mediamanager__form_diffview {