diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php
index c2d57f08d9..d4d37ee21d 100644
--- a/src/wp-admin/comment.php
+++ b/src/wp-admin/comment.php
@@ -115,7 +115,6 @@ case 'spam'    :
 
 <div class="narrow">
 
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <?php
diff --git a/src/wp-admin/custom-background.php b/src/wp-admin/custom-background.php
index ba74dfc48d..690638c8c5 100644
--- a/src/wp-admin/custom-background.php
+++ b/src/wp-admin/custom-background.php
@@ -179,7 +179,6 @@ class Custom_Background {
 	function admin_page() {
 ?>
 <div class="wrap" id="custom-background">
-<?php screen_icon(); ?>
 <h2><?php _e('Custom Background'); ?></h2>
 <?php if ( !empty($this->updated) ) { ?>
 <div id="message" class="updated">
diff --git a/src/wp-admin/custom-header.php b/src/wp-admin/custom-header.php
index 7b1a4b30a5..7f222f7cb7 100644
--- a/src/wp-admin/custom-header.php
+++ b/src/wp-admin/custom-header.php
@@ -450,7 +450,6 @@ class Custom_Image_Header {
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php _e('Custom Header'); ?></h2>
 
 <?php if ( ! empty( $this->updated ) ) { ?>
@@ -724,7 +723,6 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php _e( 'Crop Header Image' ); ?></h2>
 
 <form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php
index f084ab5fc5..b12264a02c 100644
--- a/src/wp-admin/edit-comments.php
+++ b/src/wp-admin/edit-comments.php
@@ -140,7 +140,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php
 if ( $post_id )
 	echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php
index 219ceceac3..7970b8c5af 100644
--- a/src/wp-admin/edit-form-advanced.php
+++ b/src/wp-admin/edit-form-advanced.php
@@ -359,7 +359,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php
 echo esc_html( $title );
 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index 6537169d0e..55f8df635b 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -13,7 +13,6 @@ if ( !defined('ABSPATH') )
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php _e('Edit Comment'); ?></h2>
 
 <div id="poststuff">
diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php
index a44944bbe2..d4a38cab56 100644
--- a/src/wp-admin/edit-link-form.php
+++ b/src/wp-admin/edit-link-form.php
@@ -70,7 +70,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h2>
 
 <?php if ( isset( $_GET['added'] ) ) : ?>
diff --git a/src/wp-admin/edit-tag-form.php b/src/wp-admin/edit-tag-form.php
index 5e1ca0eeef..f021b2a3a8 100644
--- a/src/wp-admin/edit-tag-form.php
+++ b/src/wp-admin/edit-tag-form.php
@@ -27,7 +27,6 @@ if ( 'category' == $taxonomy ) {
 do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo $tax->labels->edit_item; ?></h2>
 <div id="ajax-response"></div>
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"<?php do_action( $taxonomy . '_term_edit_form_tag' ); ?>>
diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php
index a253d92f97..56fa11a1c2 100644
--- a/src/wp-admin/edit-tags.php
+++ b/src/wp-admin/edit-tags.php
@@ -301,7 +301,6 @@ if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
 ?>
 
 <div class="wrap nosubsub">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
 if ( !empty($_REQUEST['s']) )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php
index 8d32036117..e98da90ff1 100644
--- a/src/wp-admin/edit.php
+++ b/src/wp-admin/edit.php
@@ -265,7 +265,6 @@ $bulk_counts = array_filter( $bulk_counts );
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php
 echo esc_html( $post_type_object->labels->name );
 if ( current_user_can( $post_type_object->cap->create_posts ) )
diff --git a/src/wp-admin/export.php b/src/wp-admin/export.php
index 4f67c08520..e0811c324d 100644
--- a/src/wp-admin/export.php
+++ b/src/wp-admin/export.php
@@ -144,7 +144,6 @@ function export_date_options( $post_type = 'post' ) {
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
diff --git a/src/wp-admin/import.php b/src/wp-admin/import.php
index 076f0d1f3d..e85bf7012b 100644
--- a/src/wp-admin/import.php
+++ b/src/wp-admin/import.php
@@ -52,7 +52,6 @@ $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
 	<div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div>
diff --git a/src/wp-admin/includes/class-wp-upgrader-skins.php b/src/wp-admin/includes/class-wp-upgrader-skins.php
index 31c5dbb4f5..71a1293e8b 100644
--- a/src/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/src/wp-admin/includes/class-wp-upgrader-skins.php
@@ -51,7 +51,6 @@ class WP_Upgrader_Skin {
 			return;
 		$this->done_header = true;
 		echo '<div class="wrap">';
-		screen_icon();
 		echo '<h2>' . $this->options['title'] . '</h2>';
 	}
 	function footer() {
diff --git a/src/wp-admin/includes/deprecated.php b/src/wp-admin/includes/deprecated.php
index e6d42abde8..ff87729a98 100644
--- a/src/wp-admin/includes/deprecated.php
+++ b/src/wp-admin/includes/deprecated.php
@@ -1134,3 +1134,54 @@ function wp_update_theme($theme, $feedback = '') {
 function the_attachment_links( $id = false ) {
 	_deprecated_function( __FUNCTION__, '3.7' );
 }
+
+/**
+ * Displays a screen icon.
+ *
+ * @uses get_screen_icon()
+ * @since 2.7.0
+ * @deprecated 3.8.0
+ *
+ * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object)
+ * 	which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID.
+ */
+function screen_icon( $screen = '' ) {
+	_deprecated_function( __FUNCTION__, '3.8' );
+	echo get_screen_icon( $screen );
+}
+
+/**
+ * Gets a screen icon.
+ *
+ * @since 3.2.0
+ * @deprecated 3.8.0
+ *
+ * @global $post_ID
+ * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object)
+ * 	which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID.
+ * @return string HTML for the screen icon.
+ */
+function get_screen_icon( $screen = '' ) {
+	_deprecated_function( __FUNCTION__, '3.8' );
+	if ( empty( $screen ) )
+		$screen = get_current_screen();
+	elseif ( is_string( $screen ) )
+		$icon_id = $screen;
+
+	$class = 'icon32';
+
+	if ( empty( $icon_id ) ) {
+		if ( ! empty( $screen->parent_base ) )
+			$icon_id = $screen->parent_base;
+		else
+			$icon_id = $screen->base;
+
+		if ( 'page' == $screen->post_type )
+			$icon_id = 'edit-pages';
+
+		if ( $screen->post_type )
+			$class .= ' ' . sanitize_html_class( 'icon32-posts-' . $screen->post_type );
+	}
+
+	return '<div id="icon-' . esc_attr( $icon_id ) . '" class="' . $class . '"><br /></div>';
+}
\ No newline at end of file
diff --git a/src/wp-admin/includes/screen.php b/src/wp-admin/includes/screen.php
index 33f91fea63..85ab71248f 100644
--- a/src/wp-admin/includes/screen.php
+++ b/src/wp-admin/includes/screen.php
@@ -124,53 +124,6 @@ function add_screen_option( $option, $args = array() ) {
 	$current_screen->add_option( $option, $args );
 }
 
-/**
- * Displays a screen icon.
- *
- * @uses get_screen_icon()
- * @since 2.7.0
- *
- * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object)
- * 	which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID.
- */
-function screen_icon( $screen = '' ) {
-	echo get_screen_icon( $screen );
-}
-
-/**
- * Gets a screen icon.
- *
- * @since 3.2.0
- *
- * @global $post_ID
- * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object)
- * 	which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID.
- * @return string HTML for the screen icon.
- */
-function get_screen_icon( $screen = '' ) {
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$icon_id = $screen;
-
-	$class = 'icon32';
-
-	if ( empty( $icon_id ) ) {
-		if ( ! empty( $screen->parent_base ) )
-			$icon_id = $screen->parent_base;
-		else
-			$icon_id = $screen->base;
-
-		if ( 'page' == $screen->post_type )
-			$icon_id = 'edit-pages';
-
-		if ( $screen->post_type )
-			$class .= ' ' . sanitize_html_class( 'icon32-posts-' . $screen->post_type );
-	}
-
-	return '<div id="icon-' . esc_attr( $icon_id ) . '" class="' . $class . '"><br /></div>';
-}
-
 /**
  * Get the current screen object
  *
diff --git a/src/wp-admin/index.php b/src/wp-admin/index.php
index 87cfd709d7..88b1587fd1 100644
--- a/src/wp-admin/index.php
+++ b/src/wp-admin/index.php
@@ -93,7 +93,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-	<?php screen_icon(); ?>
 	<h2><?php echo esc_html( $title ); ?></h2>
 
 <?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
diff --git a/src/wp-admin/link-manager.php b/src/wp-admin/link-manager.php
index cbcf689be7..9dde73c969 100644
--- a/src/wp-admin/link-manager.php
+++ b/src/wp-admin/link-manager.php
@@ -69,7 +69,6 @@ if ( ! current_user_can('manage_links') )
 ?>
 
 <div class="wrap nosubsub">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
 if ( !empty($_REQUEST['s']) )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
diff --git a/src/wp-admin/media-new.php b/src/wp-admin/media-new.php
index d8f8b63347..75f49f1008 100644
--- a/src/wp-admin/media-new.php
+++ b/src/wp-admin/media-new.php
@@ -65,7 +65,6 @@ if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
 	$form_class .= ' html-uploader';
 ?>
 <div class="wrap">
-	<?php screen_icon(); ?>
 	<h2><?php echo esc_html( $title ); ?></h2>
 
 	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
diff --git a/src/wp-admin/media.php b/src/wp-admin/media.php
index c9f0348359..1462f7d42a 100644
--- a/src/wp-admin/media.php
+++ b/src/wp-admin/media.php
@@ -103,7 +103,6 @@ case 'edit' :
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2>
 <?php
 echo esc_html( $title );
diff --git a/src/wp-admin/ms-delete-site.php b/src/wp-admin/ms-delete-site.php
index b9112c061d..c94089def8 100644
--- a/src/wp-admin/ms-delete-site.php
+++ b/src/wp-admin/ms-delete-site.php
@@ -32,7 +32,6 @@ $parent_file = 'tools.php';
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 echo '<div class="wrap">';
-screen_icon();
 echo '<h2>' . esc_html( $title ) . '</h2>';
 
 if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
diff --git a/src/wp-admin/my-sites.php b/src/wp-admin/my-sites.php
index 468d1103c6..f882964afc 100644
--- a/src/wp-admin/my-sites.php
+++ b/src/wp-admin/my-sites.php
@@ -56,7 +56,6 @@ if ( $updated ) { ?>
 <?php } ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 <?php
 if ( empty( $blogs ) ) :
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index a53513116a..a9d2ecc90b 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -533,7 +533,6 @@ get_current_screen()->set_help_sidebar(
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-	<?php screen_icon(); ?>
 	<h2 class="nav-tab-wrapper">
 		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?php if ( $num_locations && $menu_count ) : ?>
diff --git a/src/wp-admin/network.php b/src/wp-admin/network.php
index d04f2cc966..fe7effe001 100644
--- a/src/wp-admin/network.php
+++ b/src/wp-admin/network.php
@@ -136,7 +136,6 @@ get_current_screen()->set_help_sidebar(
 include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-<?php screen_icon('tools'); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <?php
diff --git a/src/wp-admin/network/index.php b/src/wp-admin/network/index.php
index d1f29523d9..dbf71f702b 100644
--- a/src/wp-admin/network/index.php
+++ b/src/wp-admin/network/index.php
@@ -65,7 +65,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <div id="dashboard-widgets-wrap">
diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
index e8d72592c9..8b1f4b2119 100644
--- a/src/wp-admin/network/settings.php
+++ b/src/wp-admin/network/settings.php
@@ -84,7 +84,6 @@ if ( isset( $_GET['updated'] ) ) {
 ?>
 
 <div class="wrap">
-	<?php screen_icon('options-general'); ?>
 	<h2><?php echo esc_html( $title ); ?></h2>
 	<form method="post" action="settings.php">
 		<?php wp_nonce_field( 'siteoptions' ); ?>
diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php
index 6a952b646f..6607b8fe1c 100644
--- a/src/wp-admin/network/site-info.php
+++ b/src/wp-admin/network/site-info.php
@@ -96,7 +96,6 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
 <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
 <h3 class="nav-tab-wrapper">
 <?php
diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php
index 1a31b6a9e6..672d7e869e 100644
--- a/src/wp-admin/network/site-new.php
+++ b/src/wp-admin/network/site-new.php
@@ -111,7 +111,6 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
 <h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
 <?php
 if ( ! empty( $messages ) ) {
diff --git a/src/wp-admin/network/site-settings.php b/src/wp-admin/network/site-settings.php
index 76d0d2c56d..2a411d6a65 100644
--- a/src/wp-admin/network/site-settings.php
+++ b/src/wp-admin/network/site-settings.php
@@ -87,7 +87,6 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
 <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
 <h3 class="nav-tab-wrapper">
 <?php
diff --git a/src/wp-admin/network/site-themes.php b/src/wp-admin/network/site-themes.php
index ec8fc7d457..646eb08a28 100644
--- a/src/wp-admin/network/site-themes.php
+++ b/src/wp-admin/network/site-themes.php
@@ -135,7 +135,6 @@ $submenu_file = 'sites.php';
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
 <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
 <h3 class="nav-tab-wrapper">
 <?php
diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php
index 9501112c21..8847606806 100644
--- a/src/wp-admin/network/site-users.php
+++ b/src/wp-admin/network/site-users.php
@@ -184,7 +184,6 @@ var current_site_id = <?php echo $id; ?>;
 
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
 <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
 <h3 class="nav-tab-wrapper">
 <?php
diff --git a/src/wp-admin/network/sites.php b/src/wp-admin/network/sites.php
index 9d1d7ce64a..5eae37eb9c 100644
--- a/src/wp-admin/network/sites.php
+++ b/src/wp-admin/network/sites.php
@@ -231,7 +231,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon( 'ms-admin' ); ?>
 <h2><?php _e( 'Sites' ) ?>
 
 <?php if ( current_user_can( 'create_sites') ) : ?>
diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php
index 264f90ed83..135c1e4138 100644
--- a/src/wp-admin/network/themes.php
+++ b/src/wp-admin/network/themes.php
@@ -90,7 +90,6 @@ if ( $action ) {
 			require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 			echo '<div class="wrap">';
-			screen_icon();
 			echo '<h2>' . esc_html( $title ) . '</h2>';
 
 			$url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
@@ -137,7 +136,6 @@ if ( $action ) {
 			<div class="wrap">
 				<?php
 					$themes_to_delete = count( $themes );
-					screen_icon();
 					echo '<h2>' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '</h2>';
 				?>
 				<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo _n( 'This theme may be active on other sites in the network.', 'These themes may be active on other sites in the network.', $themes_to_delete ); ?></p></div>
@@ -227,7 +225,6 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<?php screen_icon('themes'); ?>
 <h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
 if ( $s )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
diff --git a/src/wp-admin/network/upgrade.php b/src/wp-admin/network/upgrade.php
index 96137b34de..8fdcf37e9f 100644
--- a/src/wp-admin/network/upgrade.php
+++ b/src/wp-admin/network/upgrade.php
@@ -39,7 +39,6 @@ if ( ! current_user_can( 'manage_network' ) )
 	wp_die( __( 'You do not have permission to access this page.' ) );
 
 echo '<div class="wrap">';
-screen_icon('tools');
 echo '<h2>' . __( 'Upgrade Network' ) . '</h2>';
 
 $action = isset($_GET['action']) ? $_GET['action'] : 'show';
diff --git a/src/wp-admin/network/user-new.php b/src/wp-admin/network/user-new.php
index 0f3ad1f68f..04ef34a0a4 100644
--- a/src/wp-admin/network/user-new.php
+++ b/src/wp-admin/network/user-new.php
@@ -69,7 +69,6 @@ $parent_file = 'users.php';
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
 <?php
 if ( ! empty( $messages ) ) {
diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php
index eb4a4de625..fd50b21823 100644
--- a/src/wp-admin/network/users.php
+++ b/src/wp-admin/network/users.php
@@ -20,8 +20,6 @@ function confirm_delete_users( $users ) {
 	$current_user = wp_get_current_user();
 	if ( !is_array( $users ) )
 		return false;
-
-	screen_icon();
 	?>
 	<h2><?php esc_html_e( 'Users' ); ?></h2>
 	<p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
@@ -275,7 +273,6 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 }
 	?>
 <div class="wrap">
-	<?php screen_icon(); ?>
 	<h2><?php esc_html_e( 'Users' );
 	if ( current_user_can( 'create_users') ) : ?>
 		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index 76f6b3226e..0c3764660a 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -31,7 +31,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form method="post" action="options.php">
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index 5f2bf21ce8..65353325f0 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -84,7 +84,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form method="post" action="options.php">
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index 4eccbf6a27..e0c06ca30d 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -40,7 +40,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form action="options.php" method="post">
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 738a0c3f8f..63ddc551df 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -170,7 +170,6 @@ if ( ! is_multisite() ) {
 <?php endif; ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form name="form" action="options-permalink.php" method="post">
diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php
index e928b2e3d8..72dfc8fdea 100644
--- a/src/wp-admin/options-reading.php
+++ b/src/wp-admin/options-reading.php
@@ -76,7 +76,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form method="post" action="options.php">
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index b3f9f68192..d6ba5d3239 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -62,7 +62,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form method="post" action="options.php">
diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php
index 00fb3c0fe5..8b84811476 100644
--- a/src/wp-admin/options.php
+++ b/src/wp-admin/options.php
@@ -200,7 +200,6 @@ if ( 'update' == $action ) {
 include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
   <h2><?php esc_html_e('All Settings'); ?></h2>
   <form name="form" action="options.php" method="post" id="all-options">
   <?php wp_nonce_field('options-options') ?>
diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php
index 94925b4897..ff962b8b55 100644
--- a/src/wp-admin/plugin-editor.php
+++ b/src/wp-admin/plugin-editor.php
@@ -167,7 +167,6 @@ default:
 </div>
 <?php endif; ?>
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <div class="fileedit-sub">
diff --git a/src/wp-admin/plugin-install.php b/src/wp-admin/plugin-install.php
index 2e89a0e697..8d0dde3269 100644
--- a/src/wp-admin/plugin-install.php
+++ b/src/wp-admin/plugin-install.php
@@ -73,7 +73,6 @@ get_current_screen()->set_help_sidebar(
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<?php screen_icon( 'plugins' ); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <?php $wp_list_table->views(); ?>
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index 6ae3b25267..776a2b54a7 100644
--- a/src/wp-admin/plugins.php
+++ b/src/wp-admin/plugins.php
@@ -116,7 +116,6 @@ if ( $action ) {
 			require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 			echo '<div class="wrap">';
-			screen_icon();
 			echo '<h2>' . esc_html( $title ) . '</h2>';
 
 			$url = self_admin_url('update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) ));
@@ -259,7 +258,6 @@ if ( $action ) {
 							}
 						}
 					}
-					screen_icon();
 					$plugins_to_delete = count( $plugin_info );
 					echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>';
 				?>
@@ -408,7 +406,6 @@ if ( !empty($invalid) )
 <?php endif; ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title );
 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
  <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
diff --git a/src/wp-admin/revision.php b/src/wp-admin/revision.php
index 7d1ce8121e..818d13c2ff 100644
--- a/src/wp-admin/revision.php
+++ b/src/wp-admin/revision.php
@@ -124,7 +124,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-	<?php screen_icon(); ?>
 	<h2 class="long-header"><?php echo $h2; ?></h2>
 </div>
 
diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php
index 7d1c61897d..8d1775d4d6 100644
--- a/src/wp-admin/theme-editor.php
+++ b/src/wp-admin/theme-editor.php
@@ -133,7 +133,6 @@ if ( $description != $file_show )
 	$description .= ' <span>(' . $file_show . ')</span>';
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <div class="fileedit-sub">
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 4756445bfe..55d6de99c4 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -75,9 +75,6 @@ get_current_screen()->set_help_sidebar(
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<?php
-screen_icon();
-?>
 <h2><?php echo esc_html( $title ); ?></h2>
 <?php
 
diff --git a/src/wp-admin/tools.php b/src/wp-admin/tools.php
index 0c7e04096d..b55328a763 100644
--- a/src/wp-admin/tools.php
+++ b/src/wp-admin/tools.php
@@ -33,7 +33,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <?php if ( current_user_can('edit_posts') ) : ?>
diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php
index e16fbdf636..6cdffc683d 100644
--- a/src/wp-admin/update-core.php
+++ b/src/wp-admin/update-core.php
@@ -376,7 +376,6 @@ function do_core_upgrade( $reinstall = false ) {
 
 ?>
 	<div class="wrap">
-	<?php screen_icon('tools'); ?>
 	<h2><?php _e('Update WordPress'); ?></h2>
 <?php
 
@@ -490,7 +489,6 @@ if ( 'upgrade-core' == $action ) {
 	require_once(ABSPATH . 'wp-admin/admin-header.php');
 	?>
 	<div class="wrap">
-	<?php screen_icon('tools'); ?>
 	<h2><?php _e('WordPress Updates'); ?></h2>
 	<?php
 	if ( $upgrade_error ) {
@@ -569,7 +567,6 @@ if ( 'upgrade-core' == $action ) {
 
 	require_once(ABSPATH . 'wp-admin/admin-header.php');
 	echo '<div class="wrap">';
-	screen_icon('plugins');
 	echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
 	echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
 	echo '</div>';
@@ -598,7 +595,6 @@ if ( 'upgrade-core' == $action ) {
 
 	require_once(ABSPATH . 'wp-admin/admin-header.php');
 	echo '<div class="wrap">';
-	screen_icon('themes');
 	echo '<h2>' . esc_html__('Update Themes') . '</h2>';
 	echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
 	echo '</div>';
diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php
index 64d0f84676..df998098d0 100644
--- a/src/wp-admin/upload.php
+++ b/src/wp-admin/upload.php
@@ -177,7 +177,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2>
 <?php
 echo esc_html( $title );
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index fbb1827e50..ca1993649e 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -210,7 +210,6 @@ include (ABSPATH . 'wp-admin/admin-header.php');
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
-<?php screen_icon(); ?>
 <h2>
 <?php
 echo esc_html( $title );
diff --git a/src/wp-admin/user-new.php b/src/wp-admin/user-new.php
index b7c41b1cc7..6b18ad53c7 100644
--- a/src/wp-admin/user-new.php
+++ b/src/wp-admin/user-new.php
@@ -233,7 +233,6 @@ if ( isset($_GET['update']) ) {
 }
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2 id="add-new-user"> <?php
 if ( current_user_can( 'create_users' ) ) {
 	echo _x( 'Add New User', 'user' );
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
index 1f4fc5e7e9..2a28f74b57 100644
--- a/src/wp-admin/users.php
+++ b/src/wp-admin/users.php
@@ -218,7 +218,6 @@ case 'delete':
 <?php echo $referer; ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php _e('Delete Users'); ?></h2>
 <?php if ( isset( $_REQUEST['error'] ) ) : ?>
 <div class="error">
@@ -323,7 +322,6 @@ case 'remove':
 <?php echo $referer; ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php _e('Remove Users from Site'); ?></h2>
 <p><?php _e('You have specified these users for removal:'); ?></p>
 <ul>
@@ -425,7 +423,6 @@ if ( ! empty($messages) ) {
 } ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2>
 <?php
 echo esc_html( $title );
diff --git a/src/wp-admin/widgets.php b/src/wp-admin/widgets.php
index c8b46fe24f..8dc99bd365 100644
--- a/src/wp-admin/widgets.php
+++ b/src/wp-admin/widgets.php
@@ -229,7 +229,6 @@ if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
 
 	require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 	<div class="wrap">
-	<?php screen_icon(); ?>
 	<h2><?php echo esc_html( $title ); ?></h2>
 	<div class="editwidget"<?php echo $width; ?>>
 	<h3><?php printf( __( 'Widget %s' ), $name ); ?></h3>
@@ -310,7 +309,6 @@ $errors = array(
 require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>