diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index bc0e244ada..382d533038 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -1090,8 +1090,10 @@ div.wp-menu-image {
 .icon16.icon-settings,
 .menu-icon-settings div.wp-menu-image,
 .icon16.icon-site,
-.menu-icon-site div.wp-menu-image {
-	background-image: url('../images/menu-vs.png?ver=20120201');
+.menu-icon-site div.wp-menu-image,
+.icon16.icon-generic,
+.menu-icon-generic div.wp-menu-image {
+	background-image: url(../images/menu-vs.png?ver=20121105);
 }
 
 .icon16.icon-dashboard,
@@ -1225,6 +1227,17 @@ div.wp-menu-image {
 #adminmenu .menu-icon-site.current div.wp-menu-image {
 	background-position: -359px -1px;
 }
+
+.icon16.icon-generic,
+#adminmenu .menu-icon-generic div.wp-menu-image {
+	background-position: -330px -34px;
+}
+
+#adminmenu .menu-icon-generic:hover div.wp-menu-image,
+#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-generic.current div.wp-menu-image {
+	background-position: -330px -2px;
+}
 /* end menu and screen icons */
 
 /* Screen Icons */
@@ -1258,8 +1271,10 @@ div.wp-menu-image {
 .icon32.icon-settings,
 #icon-options-general,
 .icon32.icon-site,
-#icon-ms-admin {
-	background-image: url(../images/icons32-vs.png?ver=20111206);
+#icon-ms-admin,
+.icon32.icon-generic,
+#icon-generic {
+	background-image: url(../images/icons32-vs.png?ver=20121105);
 }
 
 .icon32.icon-post,
@@ -1329,6 +1344,11 @@ div.wp-menu-image {
 	background-position: -659px -5px;
 }
 
+.icon32.icon-generic,
+#icon-generic {
+	background-position: -708px -5px;
+}
+
 /* end screen icons */
 
 /* Diff */
@@ -2077,9 +2097,11 @@ div.widgets-sortables,
 	.icon32.icon-settings,
 	#icon-options-general,
 	.icon32.icon-site,
-	#icon-ms-admin {
-		background-image: url("../images/icons32-vs-2x.png?ver=20120916");
-		background-size: 708px 45px;
+	#icon-ms-admin,
+	.icon32.icon-generic,
+	#icon-generic {
+		background-image: url(../images/icons32-vs-2x.png?ver=20121105);
+		background-size: 756px 45px;
 	}
 
 	.icon16.icon-dashboard,
@@ -2105,8 +2127,10 @@ div.widgets-sortables,
 	.icon16.icon-settings,
 	.menu-icon-settings div.wp-menu-image,
 	.icon16.icon-site,
-	.menu-icon-site div.wp-menu-image {
-		background-image: url("../images/menu-2x.png?ver=20120916"); // @todo needs menu-vs-2x.png
+	.menu-icon-site div.wp-menu-image,
+	.icon16.icon-generic,
+	.menu-icon-generic div.wp-menu-image {
+		background-image: url(../images/menu-vs-2x.png?ver=20121105);
 		background-size: 390px 64px;
 	}
 
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 0da5ac7796..245315eed7 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -1046,8 +1046,10 @@ div.wp-menu-image {
 .icon16.icon-settings,
 .menu-icon-settings div.wp-menu-image,
 .icon16.icon-site,
-.menu-icon-site div.wp-menu-image {
-	background-image: url('../images/menu.png?ver=20120201');
+.menu-icon-site div.wp-menu-image,
+.icon16.icon-generic,
+.menu-icon-generic div.wp-menu-image {
+	background-image: url(../images/menu.png?ver=20121105);
 }
 
 .icon16.icon-dashboard,
@@ -1181,6 +1183,18 @@ div.wp-menu-image {
 #adminmenu .menu-icon-site.current div.wp-menu-image {
 	background-position: -359px -1px;
 }
+
+.icon16.icon-generic,
+#adminmenu .menu-icon-generic div.wp-menu-image {
+	background-position: -330px -34px;
+}
+
+#adminmenu .menu-icon-generic:hover div.wp-menu-image,
+#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-generic.current div.wp-menu-image {
+	background-position: -330px -2px;
+}
+
 /* end menu and screen icons */
 
 /* Screen Icons */
@@ -1214,8 +1228,10 @@ div.wp-menu-image {
 .icon32.icon-settings,
 #icon-options-general,
 .icon32.icon-site,
-#icon-ms-admin {
-	background-image: url(../images/icons32.png?ver=20111206);
+#icon-ms-admin,
+.icon32.icon-generic,
+#icon-generic {
+	background-image: url(../images/icons32.png?ver=20121105);
 }
 
 .icon32.icon-post,
@@ -1285,6 +1301,11 @@ div.wp-menu-image {
 	background-position: -659px -5px;
 }
 
+.icon32.icon-generic,
+#icon-generic {
+	background-position: -708px -5px;
+}
+
 /* end screen icons */
 
 /* Diff */
@@ -1955,9 +1976,11 @@ div.widgets-sortables,
 	.icon32.icon-settings,
 	#icon-options-general,
 	.icon32.icon-site,
-	#icon-ms-admin {
-		background-image: url("../images/icons32-2x.png?ver=20120916");
-		background-size: 708px 45px;
+	#icon-ms-admin,
+	.icon32.icon-generic,
+	#icon-generic {
+		background-image: url(../images/icons32-2x.png?ver=20121105);
+		background-size: 756px 45px;
 	}
 
 	.icon16.icon-dashboard,
@@ -1983,8 +2006,10 @@ div.widgets-sortables,
 	.icon16.icon-settings,
 	.menu-icon-settings div.wp-menu-image,
 	.icon16.icon-site,
-	.menu-icon-site div.wp-menu-image {
-		background-image: url("../images/menu-2x.png?ver=20120916");
+	.menu-icon-site div.wp-menu-image,
+	.icon16.icon-generic,
+	.menu-icon-generic div.wp-menu-image {
+		background-image: url(../images/menu-2x.png?ver=20121105);
 		background-size: 390px 64px;
 	}
 
diff --git a/wp-admin/images/icons32-2x.png b/wp-admin/images/icons32-2x.png
index 6fecc9be5d..593fc70b08 100644
Binary files a/wp-admin/images/icons32-2x.png and b/wp-admin/images/icons32-2x.png differ
diff --git a/wp-admin/images/icons32-vs-2x.png b/wp-admin/images/icons32-vs-2x.png
index 0d2d9b93ef..369ff91b93 100644
Binary files a/wp-admin/images/icons32-vs-2x.png and b/wp-admin/images/icons32-vs-2x.png differ
diff --git a/wp-admin/images/icons32-vs.png b/wp-admin/images/icons32-vs.png
index b9f0dfb1f3..ea0e10e4a5 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/icons32.png b/wp-admin/images/icons32.png
index 44a07f1c2a..521a66a185 100644
Binary files a/wp-admin/images/icons32.png and b/wp-admin/images/icons32.png differ
diff --git a/wp-admin/images/menu-vs.png b/wp-admin/images/menu-vs.png
index 5def9ed63a..bde772119d 100644
Binary files a/wp-admin/images/menu-vs.png and b/wp-admin/images/menu-vs.png differ
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index c1c3cf50a6..f305ef9bc6 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -902,12 +902,15 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
 	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
 		add_action( $hookname, $function );
 
-	if ( empty($icon_url) )
-		$icon_url = esc_url( admin_url( 'images/generic.png' ) );
-	else
+	if ( empty($icon_url) ) {
+		$icon_url = 'none';
+		$icon_class = 'menu-icon-generic ';
+	} else {
 		$icon_url = set_url_scheme( $icon_url );
+		$icon_class = '';
+	}
 
-	$new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+	$new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
 
 	if ( null === $position )
 		$menu[] = $new_menu;