Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php	(revision 7216)
+++ wp-includes/media.php	(working copy)
@@ -322,7 +322,7 @@
 		<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
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 7216)
+++ wp-admin/includes/media.php	(working copy)
@@ -836,7 +836,9 @@
 -->
 </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) ) : ?>
Index: wp-admin/edit-attachment-rows.php
===================================================================
--- wp-admin/edit-attachment-rows.php	(revision 7216)
+++ wp-admin/edit-attachment-rows.php	(working copy)
@@ -39,7 +39,7 @@
 
 	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;