Use the new core-admin/ icon collection

Author: fushar

src/wp-admin/menu-header.php

@@ -290,7 +290,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
 	echo '<li id="collapse-menu" class="hide-if-no-js">' .
 		'<button type="button" id="collapse-button" aria-label="' . esc_attr__( 'Collapse Main Menu' ) . '" aria-expanded="true">' .
-		'<span class="collapse-button-icon" aria-hidden="true">' . wp_get_icon( 'core/chevron-left' ) . '</span>' .
+		'<span class="collapse-button-icon" aria-hidden="true">' . wp_get_icon( 'core-admin/chevron-left' ) . '</span>' .
 		'<span class="collapse-button-label">' . __( 'Collapse Menu' ) . '</span>' .
 		'</button></li>';
 }

src/wp-admin/menu.php

@@ -26,7 +26,7 @@
  * @global array $menu
  */
 
-$menu[2] = array( __( 'Dashboard' ), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'core/dashboard' );
+$menu[2] = array( __( 'Dashboard' ), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'core-admin/dashboard' );
 
 $submenu['index.php'][0] = array( __( 'Home' ), 'read', 'index.php' );
 
@@ -70,7 +70,7 @@
 
 // $menu[5] = Posts.
 
-$menu[10] = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'core/media' );
+$menu[10] = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'core-admin/media' );
 
 	$submenu['upload.php'][5]  = array( _x( 'Library', 'media library menu item' ), 'upload_files', 'upload.php' );
 	$submenu['upload.php'][10] = array( __( 'Add Media File' ), 'upload_files', 'media-new.php' );
@@ -86,7 +86,7 @@
 
 	unset( $taxonomy, $submenu_index );
 
-$menu[15] = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'core/link' );
+$menu[15] = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'core-admin/link' );
 
 	$submenu['link-manager.php'][5]  = array( _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php' );
 	$submenu['link-manager.php'][10] = array( __( 'Add Link' ), 'manage_links', 'link-add.php' );
@@ -110,7 +110,7 @@
 		'',
 		'menu-top menu-icon-comments',
 		'menu-comments',
-		'core/comment',
+		'core-admin/comment',
 	);
 
 	unset( $awaiting_moderation );
@@ -142,7 +142,7 @@
 		: ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
 	$post_type_for_id        = sanitize_html_class( $post_type );
 
-	$menu_icon = 'core/pin';
+	$menu_icon = 'core-admin/pin';
 	if ( is_string( $post_type_obj->menu_icon ) ) {
 		// Special handling for an empty div.wp-menu-image, data:image/svg+xml, Dashicons, and registered icons.
 		if ( 'none' === $post_type_obj->menu_icon || 'div' === $post_type_obj->menu_icon
@@ -205,7 +205,7 @@
 
 $appearance_capability = current_user_can( 'switch_themes' ) ? 'switch_themes' : 'edit_theme_options';
 
-$menu[60] = array( __( 'Appearance' ), $appearance_capability, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'core/brush' );
+$menu[60] = array( __( 'Appearance' ), $appearance_capability, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'core-admin/brush' );
 
 $count = '';
 if ( ! is_multisite() && current_user_can( 'update_themes' ) ) {
@@ -319,7 +319,7 @@ function _add_plugin_file_editor_to_tools() {
 }
 
 /* translators: %s: Number of available plugin updates. */
-$menu[65] = array( sprintf( __( 'Plugins %s' ), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'core/plugins' );
+$menu[65] = array( sprintf( __( 'Plugins %s' ), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'core-admin/plugins' );
 
 $submenu['plugins.php'][5] = array( __( 'Installed Plugins' ), 'activate_plugins', 'plugins.php' );
 
@@ -336,9 +336,9 @@ function _add_plugin_file_editor_to_tools() {
 unset( $update_data );
 
 if ( current_user_can( 'list_users' ) ) {
-	$menu[70] = array( __( 'Users' ), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'core/people' );
+	$menu[70] = array( __( 'Users' ), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'core-admin/people' );
 } else {
-	$menu[70] = array( __( 'Profile' ), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'core/people' );
+	$menu[70] = array( __( 'Profile' ), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'core-admin/people' );
 }
 
 if ( current_user_can( 'list_users' ) ) {
@@ -386,7 +386,7 @@ function _add_plugin_file_editor_to_tools() {
 	);
 }
 
-$menu[75]                     = array( __( 'Tools' ), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'core/tool' );
+$menu[75]                     = array( __( 'Tools' ), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'core-admin/tool' );
 	$submenu['tools.php'][5]  = array( __( 'Available Tools' ), 'edit_posts', 'tools.php' );
 	$submenu['tools.php'][10] = array( __( 'Import' ), 'import', 'import.php' );
 	$submenu['tools.php'][15] = array( __( 'Export' ), 'export', 'export.php' );
@@ -401,7 +401,7 @@ function _add_plugin_file_editor_to_tools() {
 	$submenu['tools.php'][50] = array( __( 'Network Setup' ), 'setup_network', 'network.php' );
 }
 
-$menu[80]                               = array( __( 'Settings' ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'core/settings' );
+$menu[80]                               = array( __( 'Settings' ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'core-admin/settings' );
 	$submenu['options-general.php'][10] = array( _x( 'General', 'settings screen' ), 'manage_options', 'options-general.php' );
 	$submenu['options-general.php'][12] = array( __( 'Connectors' ), 'manage_options', 'options-connectors.php' );
 	$submenu['options-general.php'][15] = array( __( 'Writing' ), 'manage_options', 'options-writing.php' );

src/wp-admin/network/menu.php

@@ -13,7 +13,7 @@
 }
 
 /* translators: Network menu item. */
-$menu[2] = array( __( 'Dashboard' ), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'core/dashboard' );
+$menu[2] = array( __( 'Dashboard' ), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'core-admin/dashboard' );
 
 $submenu['index.php'][0] = array( __( 'Home' ), 'read', 'index.php' );
 
@@ -53,11 +53,11 @@
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
 /* translators: Sites menu item. */
-$menu[5]                  = array( __( 'Sites' ), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'core/sites' );
+$menu[5]                  = array( __( 'Sites' ), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'core-admin/sites' );
 $submenu['sites.php'][5]  = array( __( 'All Sites' ), 'manage_sites', 'sites.php' );
 $submenu['sites.php'][10] = array( __( 'Add Site' ), 'create_sites', 'site-new.php' );
 
-$menu[10]                 = array( __( 'Users' ), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'core/people' );
+$menu[10]                 = array( __( 'Users' ), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'core-admin/people' );
 $submenu['users.php'][5]  = array( __( 'All Users' ), 'manage_network_users', 'users.php' );
 $submenu['users.php'][10] = array( __( 'Add User' ), 'create_users', 'user-new.php' );
 
@@ -77,10 +77,10 @@
 		'',
 		'menu-top menu-icon-appearance',
 		'menu-appearance',
-		'core/brush',
+		'core-admin/brush',
 	);
 } else {
-	$menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'core/brush' );
+	$menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'core-admin/brush' );
 }
 $submenu['themes.php'][5]  = array( __( 'Installed Themes' ), 'manage_network_themes', 'themes.php' );
 $submenu['themes.php'][10] = array( __( 'Add Theme' ), 'install_themes', 'theme-install.php' );
@@ -102,16 +102,16 @@
 		'',
 		'menu-top menu-icon-plugins',
 		'menu-plugins',
-		'core/plugins',
+		'core-admin/plugins',
 	);
 } else {
-	$menu[20] = array( __( 'Plugins' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'core/plugins' );
+	$menu[20] = array( __( 'Plugins' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'core-admin/plugins' );
 }
 $submenu['plugins.php'][5]  = array( __( 'Installed Plugins' ), 'manage_network_plugins', 'plugins.php' );
 $submenu['plugins.php'][10] = array( __( 'Add Plugin' ), 'install_plugins', 'plugin-install.php' );
 $submenu['plugins.php'][15] = array( __( 'Plugin File Editor' ), 'edit_plugins', 'plugin-editor.php' );
 
-$menu[25] = array( __( 'Settings' ), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'core/settings' );
+$menu[25] = array( __( 'Settings' ), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'core-admin/settings' );
 if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
 	$submenu['settings.php'][5]  = array( __( 'Network Settings' ), 'manage_network_options', 'settings.php' );
 	$submenu['settings.php'][10] = array( __( 'Network Setup' ), 'setup_network', 'setup.php' );

src/wp-includes/admin-bar.php

@@ -121,7 +121,7 @@ function wp_admin_bar_render() {
  * @since 7.1.0
  * @access private
  *
- * @param string $icon_name Namespaced core icon name, e.g. 'core/wordpress'.
+ * @param string $icon_name Namespaced icon name, e.g. 'core-admin/wordpress'.
  * @return string Admin bar icon markup.
  */
 function _wp_admin_bar_icon( $icon_name ) {
@@ -150,7 +150,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 
 	$wp_logo_menu_args = array(
 		'id'    => 'wp-logo',
-		'title' => _wp_admin_bar_icon( 'core/wordpress' ) . '<span class="screen-reader-text">' .
+		'title' => _wp_admin_bar_icon( 'core-admin/wordpress' ) . '<span class="screen-reader-text">' .
 				/* translators: Hidden accessibility text. */
 				__( 'About WordPress' ) .
 			'</span>',
@@ -256,7 +256,7 @@ function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
 		$wp_admin_bar->add_node(
 			array(
 				'id'    => 'menu-toggle',
-				'title' => _wp_admin_bar_icon( 'core/menu' ) . '<span class="screen-reader-text">' .
+				'title' => _wp_admin_bar_icon( 'core-admin/menu' ) . '<span class="screen-reader-text">' .
 						/* translators: Hidden accessibility text. */
 						__( 'Menu' ) .
 					'</span>',
@@ -295,7 +295,7 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
 		array(
 			'id'     => 'my-account',
 			'parent' => 'top-secondary',
-			'title'  => $howdy . ( empty( $avatar ) ? _wp_admin_bar_icon( 'core/people' ) : $avatar ),
+			'title'  => $howdy . ( empty( $avatar ) ? _wp_admin_bar_icon( 'core-admin/people' ) : $avatar ),
 			'href'   => $profile_url,
 			'meta'   => array(
 				'class'      => empty( $avatar ) ? '' : 'with-avatar',
@@ -425,7 +425,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	}
 
 	if ( ! $has_site_icon ) {
-		$title = _wp_admin_bar_icon( ( is_admin() || ! current_user_can( 'read' ) ) ? 'core/home' : 'core/dashboard' ) . $title;
+		$title = _wp_admin_bar_icon( ( is_admin() || ! current_user_can( 'read' ) ) ? 'core-admin/home' : 'core-admin/dashboard' ) . $title;
 	}
 
 	$wp_admin_bar->add_node(
@@ -515,7 +515,7 @@ function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
 	$wp_admin_bar->add_node(
 		array(
 			'id'    => 'site-editor',
-			'title' => _wp_admin_bar_icon( 'core/brush' ) . __( 'Edit Site' ),
+			'title' => _wp_admin_bar_icon( 'core-admin/brush' ) . __( 'Edit Site' ),
 			'href'  => add_query_arg(
 				array(
 					'postType' => 'wp_template',
@@ -570,7 +570,7 @@ function wp_admin_bar_customize_menu( $wp_admin_bar ) {
 	$wp_admin_bar->add_node(
 		array(
 			'id'    => 'customize',
-			'title' => _wp_admin_bar_icon( 'core/brush' ) . __( 'Customize' ),
+			'title' => _wp_admin_bar_icon( 'core-admin/brush' ) . __( 'Customize' ),
 			'href'  => $customize_url,
 			'meta'  => array(
 				'class' => 'hide-if-no-customize',
@@ -607,7 +607,7 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 	$wp_admin_bar->add_node(
 		array(
 			'id'    => 'my-sites',
-			'title' => _wp_admin_bar_icon( 'core/sites' ) . __( 'My Sites' ),
+			'title' => _wp_admin_bar_icon( 'core-admin/sites' ) . __( 'My Sites' ),
 			'href'  => $my_sites_url,
 		)
 	);
@@ -728,7 +728,7 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 				( wp_lazy_loading_enabled( 'img', 'site_icon_in_toolbar' ) ? ' loading="lazy"' : '' )
 			);
 		} else {
-			$blavatar = '<div class="blavatar">' . wp_get_icon( 'core/wordpress', array( 'size' => 16 ) ) . '</div>';
+			$blavatar = '<div class="blavatar">' . wp_get_icon( 'core-admin/wordpress', array( 'size' => 16 ) ) . '</div>';
 		}
 
 		$blogname = $blog->blogname;
@@ -942,7 +942,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 				$wp_admin_bar->add_node(
 					array(
 						'id'    => 'edit',
-						'title' => _wp_admin_bar_icon( 'core/pencil' ) . $post_type_object->labels->edit_item,
+						'title' => _wp_admin_bar_icon( 'core-admin/pencil' ) . $post_type_object->labels->edit_item,
 						'href'  => $edit_post_link,
 					)
 				);
@@ -954,7 +954,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 				$wp_admin_bar->add_node(
 					array(
 						'id'    => 'edit',
-						'title' => _wp_admin_bar_icon( 'core/pencil' ) . $tax->labels->edit_item,
+						'title' => _wp_admin_bar_icon( 'core-admin/pencil' ) . $tax->labels->edit_item,
 						'href'  => $edit_term_link,
 					)
 				);
@@ -965,7 +965,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 				$wp_admin_bar->add_node(
 					array(
 						'id'    => 'edit',
-						'title' => _wp_admin_bar_icon( 'core/pencil' ) . __( 'Edit User' ),
+						'title' => _wp_admin_bar_icon( 'core-admin/pencil' ) . __( 'Edit User' ),
 						'href'  => $edit_user_link,
 					)
 				);
@@ -996,7 +996,7 @@ function wp_admin_bar_command_palette_menu( WP_Admin_Bar $wp_admin_bar ): void {
 	$apple_pattern   = 'Macintosh|Mac OS X|Mac_PowerPC';
 	$is_apple_os     = (bool) preg_match( "/{$apple_pattern}/i", $_SERVER['HTTP_USER_AGENT'] ?? '' );
 	$shortcut_label  = $is_apple_os ? $shortcut_labels['appleOS'] : $shortcut_labels['default'];
-	$title           = _wp_admin_bar_icon( 'core/search' ) . sprintf(
+	$title           = _wp_admin_bar_icon( 'core-admin/search' ) . sprintf(
 		'<span class="ab-label"><kbd>%s</kbd><span class="screen-reader-text"> %s</span></span>',
 		$shortcut_label,
 		/* translators: Hidden accessibility text. */
@@ -1094,7 +1094,7 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
 		return;
 	}
 
-	$title = _wp_admin_bar_icon( 'core/plus' ) . '<span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
+	$title = _wp_admin_bar_icon( 'core-admin/plus' ) . '<span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
 
 	$wp_admin_bar->add_node(
 		array(
@@ -1152,7 +1152,7 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) {
 		number_format_i18n( $awaiting_mod )
 	);
 
-	$icon   = _wp_admin_bar_icon( 'core/comment' );
+	$icon   = _wp_admin_bar_icon( 'core-admin/comment' );
 	$title  = '<span class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '" aria-hidden="true">' . number_format_i18n( $awaiting_mod ) . '</span>';
 	$title .= '<span class="screen-reader-text comments-in-moderation-text">' . $awaiting_text . '</span>';
 
@@ -1267,7 +1267,7 @@ function wp_admin_bar_updates_menu( $wp_admin_bar ) {
 		number_format_i18n( $update_data['counts']['total'] )
 	);
 
-	$icon   = _wp_admin_bar_icon( 'core/update' );
+	$icon   = _wp_admin_bar_icon( 'core-admin/update' );
 	$title  = '<span class="ab-label" aria-hidden="true">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
 	$title .= '<span class="screen-reader-text updates-available-text">' . $updates_text . '</span>';
 
@@ -1293,7 +1293,7 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) {
 	}
 
 	$form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
-	$form .= _wp_admin_bar_icon( 'core/search' );
+	$form .= _wp_admin_bar_icon( 'core-admin/search' );
 	$form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
 	$form .= '<label for="adminbar-search" class="screen-reader-text">' .
 			/* translators: Hidden accessibility text. */

src/wp-includes/post.php

@@ -32,7 +32,7 @@ function create_initial_post_types() {
 			'capability_type'       => 'post',
 			'map_meta_cap'          => true,
 			'menu_position'         => 5,
-			'menu_icon'             => 'core/pin',
+			'menu_icon'             => 'core-admin/pin',
 			'hierarchical'          => false,
 			'rewrite'               => false,
 			'query_var'             => false,
@@ -68,7 +68,7 @@ function create_initial_post_types() {
 			'capability_type'       => 'page',
 			'map_meta_cap'          => true,
 			'menu_position'         => 20,
-			'menu_icon'             => 'core/page',
+			'menu_icon'             => 'core-admin/page',
 			'hierarchical'          => true,
 			'rewrite'               => false,
 			'query_var'             => false,
@@ -110,7 +110,7 @@ function create_initial_post_types() {
 				'create_posts' => 'upload_files',
 			),
 			'map_meta_cap'          => true,
-			'menu_icon'             => 'core/media',
+			'menu_icon'             => 'core-admin/media',
 			'hierarchical'          => false,
 			'rewrite'               => false,
 			'query_var'             => false,

tests/phpunit/tests/post/types.php

@@ -301,9 +301,9 @@ public function test_get_post_type_object_casting() {
 	 * @ticket 38844
 	 */
 	public function test_get_post_type_object_includes_menu_icon_for_builtin_post_types() {
-		$this->assertSame( 'core/pin', get_post_type_object( 'post' )->menu_icon );
-		$this->assertSame( 'core/page', get_post_type_object( 'page' )->menu_icon );
-		$this->assertSame( 'core/media', get_post_type_object( 'attachment' )->menu_icon );
+		$this->assertSame( 'core-admin/pin', get_post_type_object( 'post' )->menu_icon );
+		$this->assertSame( 'core-admin/page', get_post_type_object( 'page' )->menu_icon );
+		$this->assertSame( 'core-admin/media', get_post_type_object( 'attachment' )->menu_icon );
 	}
 
 	/**

tests/qunit/fixtures/wp-api-generated.js

@@ -13981,7 +13981,7 @@ mockedApiResponse.TypesCollection = {
         "has_archive": false,
         "name": "Posts",
         "slug": "post",
-        "icon": "core/pin",
+        "icon": "core-admin/pin",
         "taxonomies": [
             "category",
             "post_tag"
@@ -14016,7 +14016,7 @@ mockedApiResponse.TypesCollection = {
         "has_archive": false,
         "name": "Pages",
         "slug": "page",
-        "icon": "core/page",
+        "icon": "core-admin/page",
         "taxonomies": [],
         "rest_base": "pages",
         "rest_namespace": "wp/v2",
@@ -14048,7 +14048,7 @@ mockedApiResponse.TypesCollection = {
         "has_archive": false,
         "name": "Media",
         "slug": "attachment",
-        "icon": "core/media",
+        "icon": "core-admin/media",
         "taxonomies": [],
         "rest_base": "media",
         "rest_namespace": "wp/v2",
@@ -14342,7 +14342,7 @@ mockedApiResponse.TypeModel = {
     "has_archive": false,
     "name": "Posts",
     "slug": "post",
-    "icon": "core/pin",
+    "icon": "core-admin/pin",
     "taxonomies": [
         "category",
         "post_tag"