diff --git a/wp-admin/css/colors-classic.dev.css b/wp-admin/css/colors-classic.dev.css
index 502c61bb9a..771541bef5 100644
--- a/wp-admin/css/colors-classic.dev.css
+++ b/wp-admin/css/colors-classic.dev.css
@@ -1245,6 +1245,15 @@ table.widefat .spam a:hover,
 #adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image {
 	background: transparent url('../images/menu-vs.png') no-repeat scroll -241px -1px;
 }
+
+#adminmenu .menu-icon-site div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png') no-repeat scroll -361px -33px;
+}
+
+#adminmenu .menu-icon-site:hover div.wp-menu-image,
+#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu-vs.png') no-repeat scroll -361px -1px;
+}
 /* end menu */
 
 
@@ -1576,6 +1585,10 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background: transparent url(../images/icons32-vs.png) no-repeat -492px -5px;
 }
 
+#icon-ms-admin {
+	background: transparent url(../images/icons32-vs.png) no-repeat -659px -5px;
+}
+
 .view-switch #view-switch-list {
 	background: transparent url(../images/list-vs.png) no-repeat 0 0;
 }
diff --git a/wp-admin/css/colors-fresh.dev.css b/wp-admin/css/colors-fresh.dev.css
index 31ca01e56c..153261945e 100644
--- a/wp-admin/css/colors-fresh.dev.css
+++ b/wp-admin/css/colors-fresh.dev.css
@@ -1235,6 +1235,15 @@ table.widefat .spam a:hover,
 #adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image {
 	background: transparent url('../images/menu.png') no-repeat scroll -241px -1px;
 }
+
+#adminmenu .menu-icon-site div.wp-menu-image {
+	background: transparent url('../images/menu.png') no-repeat scroll -361px -33px;
+}
+
+#adminmenu .menu-icon-site:hover div.wp-menu-image,
+#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image {
+	background: transparent url('../images/menu.png') no-repeat scroll -361px -1px;
+}
 /* end menu */
 
 
@@ -1555,6 +1564,10 @@ fieldset.inline-edit-col-right .inline-edit-col {
 	background: transparent url(../images/icons32.png) no-repeat -492px -5px;
 }
 
+#icon-ms-admin {
+	background: transparent url(../images/icons32.png) no-repeat -659px -5px;
+}
+
 .view-switch #view-switch-list {
 	background: transparent url(../images/list.png) no-repeat 0 0;
 }
diff --git a/wp-admin/css/ms.dev.css b/wp-admin/css/ms.dev.css
index 69c80f9836..16fc947de9 100644
--- a/wp-admin/css/ms.dev.css
+++ b/wp-admin/css/ms.dev.css
@@ -1,12 +1,3 @@
-/* Site Admin Menu */
-#adminmenu .menu-icon-site div.wp-menu-image {
-	background: transparent url('../images/site-admin.png') no-repeat scroll 0px -33px;
-}
-
-#adminmenu .menu-icon-site:hover div.wp-menu-image {
-	background: transparent url('../images/site-admin.png') no-repeat scroll 0px -1px;
-}
-
 /* Dashboard: MS Specific Data */
 #dashboard_right_now p.musub {
 	margin-top: 12px;
diff --git a/wp-admin/images/icons32-vs.png b/wp-admin/images/icons32-vs.png
index 468317478d..d910bc1b49 100644
Binary files a/wp-admin/images/icons32-vs.png and b/wp-admin/images/icons32-vs.png differ
diff --git a/wp-admin/images/menu-vs.png b/wp-admin/images/menu-vs.png
index eb53fe8d1b..76372bc331 100644
Binary files a/wp-admin/images/menu-vs.png and b/wp-admin/images/menu-vs.png differ
diff --git a/wp-admin/images/site-admin.png b/wp-admin/images/site-admin.png
deleted file mode 100644
index 97cb30ba65..0000000000
Binary files a/wp-admin/images/site-admin.png and /dev/null differ
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index b547c49a4a..1aa0a0c950 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3803,10 +3803,6 @@ function screen_icon($screen = '') {
 		else
 			$name = $screen->base;
 
-		// @todo Remove this once we have a site admin icon
-		if ( 'ms-admin' == $screen->parent_base )
-			$name = 'tools';
-
 		if ( 'edit' == $name && isset($screen->post_type) && 'page' == $screen->post_type )
 			$name = 'edit-pages';
 	}
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 43c0f50b63..f85fda7171 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -441,7 +441,7 @@ function wp_default_styles( &$styles ) {
 	$no_suffix = array( 'farbtastic' );
 
 	// all colors stylesheets need to have the same query strings (cache manifest compat)
-	$colors_version = '20100403b';
+	$colors_version = '20100406';
 
 	$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100403c' );
 
@@ -457,7 +457,7 @@ function wp_default_styles( &$styles ) {
 	$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version );
 	$styles->add_data( 'colors-classic', 'rtl', true );
 
-	$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '2010040101' );
+	$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20100406' );
 	$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20100108' );
 	$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20091029' );
 	$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20091118' );