Index: wp-includes/shortcodes.php
===================================================================
--- wp-includes/shortcodes.php	(revision 7128)
+++ wp-includes/shortcodes.php	(working copy)
@@ -167,7 +167,8 @@
 ";
 
 	if ( !empty($attachments) ) foreach ( $attachments as $id => $attachment ) {
-		$src = wp_get_attachment_thumb_url($id);
+		$src = get_attachment_icon_src($id);
+        $src = $src[0];
 		$href = get_attachment_link($id);
 		$output .= "
 			<div>
@@ -179,7 +180,7 @@
 	}
 
 	$output .= "
-			<br style='clear: both;' >
+			<br style='clear: both;' />
 		</div>
 ";