diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index 3f6eb52f..fe2181c8 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -15,7 +15,7 @@
                 <div class="form_check">
                     <input id="multidelete_image{$file.id}" name="serendipity[multiDelete][]" type="checkbox" value="{$file.id}"><label for="multidelete_image{$file.id}" class="visuallyhidden">Select for multidelete</label> {* i18n *}
                 </div>
-                <h3>{$file.realname|truncate:30:"&hellip;"}{if $file.orderkey != ''}: {$file.orderkey|@escape}{/if}</h3>
+                <h3 title="{$file.realname}">{$file.realname|truncate:30:"&hellip;"}{if $file.orderkey != ''}: {$file.orderkey|@escape}{/if}</h3>
                 {if $file.authorid != 0}<span class="author block_level">{$file.authorname}</span>{/if}
             </header>
 
@@ -33,9 +33,9 @@
                         <li><b>{$CONST.ORIGINAL_SHORT}:</b> {$file.dimensions_width}x{$file.dimensions_height}</li>
                         <li><b>{$CONST.THUMBNAIL_SHORT}:</b> {$file.dim.0}x{$file.dim.1}</li>
                     {/if}
-                        <li><b>{$CONST.SIZE_SHORT}:</b> {$file.nice_size} KB</li>
+                        <li><b>{$CONST.IMAGE_SIZE}:</b> {$file.nice_size} KB</li>
                     {if $file.realname != $file.diskname}
-                        <li>{$file.diskname}</li>
+                        <li title="{$file.diskname}">{$file.diskname|truncate:30:"&hellip;"}</li>
                     {/if}
                 {/if}
                     </ul>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index bf067a8a..6c7028c5 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -974,15 +974,11 @@ summary {
 #serendipity_comments_list h4,
 .comment_data dt,
 .comment_data dd,
+.template_info,
 .template_info dt,
 .template_info dd,
 #entries_list .form_check,
-.template_info { float: left; }
-
-.media_file_preview {
-    float: left;
-    margin: 0 1em 0 0;
-}
+.media_file footer { float: left; }
 
 #mediaPropertyForm .media_file_preview {
     float: none;
@@ -1186,9 +1182,13 @@ form > .button_link:first-of-type { margin-top: 0; }
 .media_file,
 .media_file_preview img { border: 1px solid #aaa; }
 
-#template_select .preview_image {
+#template_select .preview_image,
+.media_file_preview {
     float: left;
     margin: 0 1em 1em 0;
+}
+
+#template_select .preview_image {
     /* TESTING */
     overflow: hidden;
     height: 100px;