Ticket #12374: newicon.patch

wp-admin/css/ms.dev.css

@@ -1 +1 @@
 /* Site Admin Menu */
 #adminmenu .menu-icon-site div.wp-menu-image {
-        background: transparent url('../images/site-admin.png') no-repeat scroll 0px -33px;
+        background: transparent url('../images/menu.png') no-repeat scroll -361px -33px;
 }
 
-#adminmenu .menu-icon-site:hover div.wp-menu-image {
-        background: transparent url('../images/site-admin.png') no-repeat scroll 0px -1px;
+#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;
 }
 
+/* Screen icon */
+#icon-ms-admin {
+        background: transparent url(../images/icons32.png) no-repeat -659px -5px;
+}
+
 /* Dashboard: MS Specific Data */
 #dashboard_right_now p.musub {
         margin-top: 12px;

wp-admin/includes/template.php

@@ -3802 +3802 @@
                 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';
         }