diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 7dbd116ac3..5e490f32b8 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -156,6 +156,7 @@ if ( is_string($content_func) )
 function media_buttons() {
 	global $post_ID, $temp_ID;
 	$uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
+	$context = apply_filters('media_buttons_context', __('Add media: %s'));
 	$media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID";
 	$media_title = __('Add Media');
 	$image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&type=image");
@@ -172,7 +173,7 @@ function media_buttons() {
 	<a href="{$media_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox" title='$media_title'><img src='images/media-button-other.gif' alt='$media_title' /></a>
 
 EOF;
-	echo $out;
+	printf($context, $out);
 }
 add_action( 'media_buttons', 'media_buttons' );
 
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 45945fbaac..39195439f2 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -563,6 +563,15 @@ p.pagenav {
 	padding-top: 6px;
 }
 
+td.media-icon {
+	vertical-align: middle;
+}
+
+td.media-icon img {
+	max-width: 60px;
+	max-height: 40px;
+}
+
 #update-nag, .plugin-update {
 	border-bottom: 1px solid #ccc;
 	border-top: 1px solid #ccc;