diff --git a/wp-admin/images/media-button-gallery.gif b/wp-admin/images/media-button-gallery.gif
new file mode 100644
index 0000000000..119177845e
Binary files /dev/null and b/wp-admin/images/media-button-gallery.gif differ
diff --git a/wp-admin/images/media-button-image.gif b/wp-admin/images/media-button-image.gif
new file mode 100644
index 0000000000..11278c857b
Binary files /dev/null and b/wp-admin/images/media-button-image.gif differ
diff --git a/wp-admin/images/media-button-music.gif b/wp-admin/images/media-button-music.gif
new file mode 100644
index 0000000000..f85cd43463
Binary files /dev/null and b/wp-admin/images/media-button-music.gif differ
diff --git a/wp-admin/images/media-button-other.gif b/wp-admin/images/media-button-other.gif
new file mode 100644
index 0000000000..f3f2f8ae9e
Binary files /dev/null and b/wp-admin/images/media-button-other.gif differ
diff --git a/wp-admin/images/media-button-video.gif b/wp-admin/images/media-button-video.gif
new file mode 100644
index 0000000000..ceb2734134
Binary files /dev/null and b/wp-admin/images/media-button-video.gif differ
diff --git a/wp-admin/images/media-buttons.gif b/wp-admin/images/media-buttons.gif
index 9fdb895140..2266040268 100644
Binary files a/wp-admin/images/media-buttons.gif and b/wp-admin/images/media-buttons.gif differ
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index edfec90c9b..748bec4c1c 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -98,7 +98,7 @@ jQuery(document).ready(function(){
 </fieldset>
 <p>
 	<button name="image-add" id="image-add" class="button-ok" value="1"><?php _e('Add Image'); ?></button>
-	<a href="#" onclick="return top.tb_remove();" id="image-cancel" class="button-cancel"><?php _e('Cancel'); ?></a>
+	<a href="#" onClick="return top.tb_remove();" id="image-cancel" class="button-cancel"><?php _e('Cancel'); ?></a>
 </p>
 	<input type="hidden" name="post_id" value="<?php echo attribute_escape($post_id); ?>" />
 	<?php wp_nonce_field( 'inlineuploading' ); ?>
@@ -351,10 +351,14 @@ function media_buttons() { // just a placeholder for now
 	$multimedia_upload_iframe_src = wp_nonce_url("media-upload.php?type=multimedia&amp;post_id=$uploading_iframe_ID", 'inlineuploading');
 	$multimedia_upload_iframe_src = apply_filters('multimedia_upload_iframe_src', $multimedia_upload_iframe_src);
 	$out = <<<EOF
-<a href="{$multimedia_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox">Multimedia</a>
-<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=460" class="thickbox">
-<img src="./images/media-buttons.gif" alt="" />
-</a>
+
+<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=480" class="thickbox"><img src='images/media-button-image.gif' alt='' /></a>
+<a href="{$multimedia_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-gallery.gif' alt='' /></a>
+<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-video.gif' alt='' /></a>
+<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-music.gif' alt='' /></a>
+<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-other.gif' alt='' /></a>
+
+
 EOF;
 	echo $out;
 }
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 3f7b518a58..e88fb9aba0 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1091,6 +1091,10 @@ html, body {
 	margin-top: 5px;
 }
 
+#poststuff #media-buttons a {
+	margin-right: 8px;
+}
+
 #poststuff .togbox {
 	background-color:#b2b2b2;
 	background-image:url(images/toggle-arrow.gif);