diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
index 0694380092..09ff821299 100644
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -39,7 +39,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'icon':
 		?>
-		<td class="media-icon"><?php echo get_the_attachment_link($post->ID, 'thumbnail', array(48,48)); ?></td>
+		<td class="media-icon"><?php echo get_the_attachment_link($post->ID, false, array(48,48)); ?></td>
 		<?php
 		// TODO
 		break;
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 182fc9c2fe..2956b998e7 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -836,7 +836,9 @@ jQuery(function($){
 -->
 </script>
 <div id="media-items">
+<input type="submit" class="button savebutton" name="save" value="<?php _e('Save'); ?>" />
 <?php echo get_media_items( $id, $errors ); ?>
+<input type="submit" class="button savebutton" name="save" value="<?php _e('Save'); ?>" />
 </div>
 
 <?php elseif ( is_callable($callback) ) : ?>
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 8cc799cb42..89e99c41af 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -322,7 +322,7 @@ function gallery_shortcode($attr) {
 		<div class='gallery'>");
 
 	foreach ( $attachments as $id => $attachment ) {
-		$link = get_the_attachment_link($id, false, array(128, 96), true);
+		$link = get_the_attachment_link($id, true, array(128, 96), true);
 		$output .= "
 			<div>
 				$link