diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 19edd9eed..06a60e4b0 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -112,7 +112,7 @@ if ( function_exists('mb_strlen') ) {
 do_action('admin_notices');
 
 screen_meta($hook_suffix);
-unset($hook_suffix);
+//unset($hook_suffix);
 
 if ( $parent_file == 'options-general.php' ) {
 	require(ABSPATH . 'wp-admin/options-head.php');
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 8a4275d27..2deb866fb 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -130,6 +130,7 @@ $messages[5] = __('Category not updated.');
 ?>
 
 <div class="wrap nosubsub">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <?php
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index fc8f70664..4ed935ffc 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -1520,3 +1520,52 @@ form p.submit a.cancel:hover {
 	background-color: transparent;
 	text-shadow: rgba(255,255,255,0.7) 0 1px 0;
 }
+
+#icon-edit,
+#icon-post {
+	background: transparent url(../images/icons32.png) no-repeat -552px -5px;
+}
+
+#icon-index {
+	background: transparent url(../images/icons32.png) no-repeat -137px -5px;
+}
+
+#icon-upload {
+	background: transparent url(../images/icons32.png) no-repeat -251px -5px;
+}
+
+#icon-link-manager,
+#icon-link {
+	background: transparent url(../images/icons32.png) no-repeat -190px -5px;
+}
+
+#icon-edit-pages,
+#icon-page {
+	background: transparent url(../images/icons32.png) no-repeat -312px -5px;
+}
+
+#icon-edit-comments {
+	background: transparent url(../images/icons32.png) no-repeat -72px -5px;
+}
+
+#icon-themes {
+	background: transparent url(../images/icons32.png) no-repeat -11px -5px;
+}
+
+#icon-plugins {
+	background: transparent url(../images/icons32.png) no-repeat -370px -5px;
+}
+
+#icon-users
+#icon-user-edit {
+	background: transparent url(../images/icons32.png) no-repeat -600px -5px;
+}
+
+#icon-import,
+#icon-admin {
+	background: transparent url(../images/icons32.png) no-repeat -432px -5px;
+}
+
+#icon-options-general {
+	background: transparent url(../images/icons32.png) no-repeat -492px -5px;
+}
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 5059631a0..3c569562f 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -85,6 +85,7 @@ $search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
 $search = attribute_escape( $search_dirty ); ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
 <?php
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index fca41086a..7cf931d7d 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -507,6 +507,7 @@ require_once('admin-header.php');
 <?php endif; ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 7ceb5c16a..6483504c0 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -60,6 +60,7 @@ $messages[5] = __('Category not updated.');
 $messages[6] = __('Categories deleted.'); ?>
 
 <div class="wrap nosubsub">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index d62aae3d1..a9745bb8c 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -341,6 +341,7 @@ require_once ('admin-header.php');
 
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <?php if ( isset( $_GET['added'] ) ) : ?>
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index ef21bbbeb..3dbe078d6 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -391,6 +391,7 @@ require_once('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
 <form name="post" action="page.php" method="post" id="post">
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 7c97f4841..e11a9b152 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -99,6 +99,7 @@ if ( is_singular() ) {
 require_once('admin-header.php'); ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) ) { ?>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 7e87a0a51..30314b44d 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -129,6 +129,7 @@ $messages[5] = __('Tag not updated.');
 $messages[6] = __('Tags deleted.'); ?>
 
 <div class="wrap nosubsub">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 2c6994308..a7f444cb4 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -91,6 +91,7 @@ else
 	$mode = attribute_escape($_GET['mode']); ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
 <?php
diff --git a/wp-admin/export.php b/wp-admin/export.php
index 8b54a37ae..20d526b9c 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -23,6 +23,7 @@ require_once ('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $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/wp-admin/images/icons32.png b/wp-admin/images/icons32.png
new file mode 100644
index 000000000..6677d1ce0
Binary files /dev/null and b/wp-admin/images/icons32.png differ
diff --git a/wp-admin/import.php b/wp-admin/import.php
index 2b2691bd1..a2f37c328 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -13,6 +13,7 @@ require_once ('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 <p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
 
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php
index 59627e8dd..894ad7e88 100644
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
@@ -54,7 +54,10 @@ class Blogger_Import {
 		$auth = __('Authorize');
 
 		echo "
-		<div class='wrap'><h2>$title</h2><p>$welcome</p><p>$prereqs</p><p>$stepone</p>
+		<div class='wrap'>
+		".screen_icon()."
+		<h2>$title</h2>
+		<p>$welcome</p><p>$prereqs</p><p>$stepone</p>
 			<form action='$auth_url' method='get'>
 				<p class='submit' style='text-align:left;'>
 					<input type='submit' class='button' value='$auth' />
@@ -68,7 +71,9 @@ class Blogger_Import {
 	}
 
 	function uh_oh($title, $message, $info) {
-		echo "<div class='wrap'><h2>$title</h2><p>$message</p><pre>$info</pre></div>";
+		echo "<div class='wrap'>";
+		screen_icon();
+		echo "<h2>$title</h2><p>$message</p><pre>$info</pre></div>";
 	}
 
 	function auth() {
diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php
index 2f96262ea..1adcc1d5d 100644
--- a/wp-admin/import/blogware.php
+++ b/wp-admin/import/blogware.php
@@ -21,6 +21,7 @@ class BW_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import Blogware').'</h2>';
 	}
 
diff --git a/wp-admin/import/btt.php b/wp-admin/import/btt.php
index 450d4cdb0..c528c2251 100644
--- a/wp-admin/import/btt.php
+++ b/wp-admin/import/btt.php
@@ -18,6 +18,7 @@ class BunnyTags_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import Bunny&#8217;s Technorati Tags').'</h2>';
 		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
 	}
diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php
index 808a4f3dd..500d0d9a5 100644
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -198,6 +198,7 @@ class Dotclear_Import {
 	function header()
 	{
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import DotClear').'</h2>';
 		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>';
 	}
diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php
index d39e307da..8651a691c 100644
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -20,6 +20,7 @@ class GM_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import GreyMatter').'</h2>';
 	}
 
diff --git a/wp-admin/import/jkw.php b/wp-admin/import/jkw.php
index 265936a6f..ba479528b 100644
--- a/wp-admin/import/jkw.php
+++ b/wp-admin/import/jkw.php
@@ -17,6 +17,7 @@ class JeromesKeyword_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import Jerome&#8217;s Keywords').'</h2>';
 		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
 	}
diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php
index c70fbd21a..6b352e88f 100644
--- a/wp-admin/import/livejournal.php
+++ b/wp-admin/import/livejournal.php
@@ -19,6 +19,7 @@ class LJ_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import LiveJournal').'</h2>';
 	}
 
diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php
index 903f77802..bb6868cdd 100644
--- a/wp-admin/import/mt.php
+++ b/wp-admin/import/mt.php
@@ -24,6 +24,7 @@ class MT_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import Movable Type or TypePad').'</h2>';
 	}
 
@@ -191,6 +192,7 @@ class MT_Import {
 	function mt_authors_form() {
 ?>
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php _e('Assign Authors'); ?></h2>
 <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as admin\'s entries.'); ?></p>
 <p><?php _e('Below, you can see the names of the authors of the MovableType posts in <em>italics</em>. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?></p>
diff --git a/wp-admin/import/rss.php b/wp-admin/import/rss.php
index 11fc2efe5..d672b064c 100644
--- a/wp-admin/import/rss.php
+++ b/wp-admin/import/rss.php
@@ -22,6 +22,7 @@ class RSS_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import RSS').'</h2>';
 	}
 
diff --git a/wp-admin/import/stp.php b/wp-admin/import/stp.php
index 4a5b61f47..54c501f81 100644
--- a/wp-admin/import/stp.php
+++ b/wp-admin/import/stp.php
@@ -16,6 +16,7 @@
 class STP_Import {
 	function header()  {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import Simple Tagging').'</h2>';
 		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
 	}
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index 1362bd27a..413f0331e 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -52,6 +52,7 @@ class Textpattern_Import {
 	function header()
 	{
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import Textpattern').'</h2>';
 		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>';
 	}
diff --git a/wp-admin/import/utw.php b/wp-admin/import/utw.php
index 2b6575652..7478fe46f 100644
--- a/wp-admin/import/utw.php
+++ b/wp-admin/import/utw.php
@@ -17,6 +17,7 @@ class UTW_Import {
 
 	function header()  {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import Ultimate Tag Warrior').'</h2>';
 		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
 	}
diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php
index 4a2424bc5..fe14491a6 100644
--- a/wp-admin/import/wordpress.php
+++ b/wp-admin/import/wordpress.php
@@ -34,6 +34,7 @@ class WP_Import {
 
 	function header() {
 		echo '<div class="wrap">';
+		screen_icon();
 		echo '<h2>'.__('Import WordPress').'</h2>';
 	}
 
@@ -197,6 +198,7 @@ class WP_Import {
 
 	function wp_authors_form() {
 ?>
+<?php screen_icon(); ?>
 <h2><?php _e('Assign Authors'); ?></h2>
 <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
 <?php
@@ -220,6 +222,7 @@ class WP_Import {
 		if ( $this->allow_fetch_attachments() ) {
 ?>
 </ol>
+<?php screen_icon(); ?>
 <h2><?php _e('Import Attachments'); ?></h2>
 <p>
 	<input type="checkbox" value="1" name="attachments" id="import-attachments" />
diff --git a/wp-admin/import/wp-cat2tag.php b/wp-admin/import/wp-cat2tag.php
index fdfa5a775..90098ee2f 100644
--- a/wp-admin/import/wp-cat2tag.php
+++ b/wp-admin/import/wp-cat2tag.php
@@ -64,6 +64,7 @@ class WP_Categories_to_Tags {
 		echo '<br class="clear" />';
 
 		if ( $cat_num > 0 ) {
+			screen_icon();
 			echo '<h2>' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '</h2>';
 			echo '<div class="narrow">';
 			echo '<p>' . __('Hey there. Here you can selectively convert existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
@@ -139,6 +140,7 @@ function check_all_rows() {
 		echo '<br class="clear" />';
 
 		if ( $tags_num > 0 ) {
+			screen_icon();
 			echo '<h2>' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '</h2>';
 			echo '<div class="narrow">';
 			echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index b176ba69c..98212b91d 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3327,4 +3327,18 @@ function add_contextual_help($screen, $help) {
 	$_wp_contextual_help[$screen] = $help;
 }
 
+function screen_icon() {
+	global $parent_file, $hook_suffix;
+
+	if ( isset($parent_file) && !empty($parent_file) )
+		$name = substr($parent_file, 0, -4);
+	else
+		$name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix);
+
+	unset($hook_suffix);
+?>
+	<div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
+<?php
+}
+
 ?>
diff --git a/wp-admin/index.php b/wp-admin/index.php
index b4921ce53..e3e1d5772 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -29,6 +29,7 @@ $today = current_time('mysql', 1);
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
 <div id="dashboard-widgets-wrap">
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index f6b8c54bd..ce3dcaeff 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -70,6 +70,7 @@ switch ($order_by) {
 } ?>
 
 <div class="wrap nosubsub">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <?php
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 85ee30512..fd3a649fa 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -56,6 +56,7 @@ if ( isset($_GET['inline']) ) {
 	$parent_file = 'edit.php';
 	require_once('admin-header.php'); ?>
 	<div class="wrap">
+	<?php screen_icon(); ?>
 	<h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 	<form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&amp;upload-page-form=" class="media-upload-form type-form validate" id="file-form">
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 14605b1a7..7edeea4a4 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -16,6 +16,7 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 12b6d1909..1f03e29f9 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -49,6 +49,7 @@ include('./admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index efdd7d811..f2e898ed4 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -17,6 +17,7 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form action="options.php" method="post">
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index b436361cb..15d61fcc6 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -17,6 +17,7 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 6ef09db73..7d8f5fe85 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -123,6 +123,7 @@ else
 <?php endif; ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form name="form" action="options-permalink.php" method="post">
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index 950cd6b6c..f4ac853f8 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -16,6 +16,7 @@ include('./admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 7bb8af0c2..f4b497bc3 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -16,6 +16,7 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form name="form1" method="post" action="options.php">
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index fa0705bcb..63fda90e6 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -16,6 +16,7 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index b43f52e38..221396b7f 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -96,7 +96,8 @@ default:
 </div>
 <?php endif; ?>
 <div class="wrap">
-	<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <div class="tablenav">
 <div class="alignleft">
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index 43f1e8ca9..e71c2ce91 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -52,6 +52,7 @@ do_action('install_plugins_pre_' . $tab); //Used to override the general interfa
 include('admin-header.php');
 ?>
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 	<ul class="subsubsub">
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 81304bac6..3c7edb4c7 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -201,6 +201,7 @@ if ( !empty($invalid) )
 <?php endif; ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 	<h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <p><?php _e('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.'); ?></p>
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index c28b72354..887eb4c06 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -99,6 +99,7 @@ $description = get_file_description($file);
 $desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "%s";
 ?>
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 <div class="bordertitle">
 	<form id="themeselector" action="theme-editor.php" method="post">
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index f1949cf95..3adba2442 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -100,6 +100,7 @@ function theme_update_available( $theme ) {
 ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <h3><?php _e('Current Theme'); ?></h3>
diff --git a/wp-admin/turbo.php b/wp-admin/turbo.php
index f48fa4df8..1f4885178 100644
--- a/wp-admin/turbo.php
+++ b/wp-admin/turbo.php
@@ -17,6 +17,7 @@ require_once('admin-header.php');
 if ( ! $is_opera ) {
 ?>
 	<div id="gears-info-box" class="wrap">
+	<?php screen_icon(); ?>
 	<h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 	<img src="images/gear.png" title="Gear" alt="" class="gears-img" />
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 9c20c92d7..37c964cbb 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -88,10 +88,11 @@ function dismissed_updates() {
  */
 function core_upgrade_preamble() {
 	$updates = get_core_updates();
-	
-	echo '<div class="wrap">';
-	echo '<h2>' . __('Upgrade WordPress') . '</h2>';
-
+?>
+	<div class="wrap">
+	<?php screen_icon(); ?>
+	<h2><?php _e('Upgrade WordPress'); ?></h2>
+<?php
 	if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
 		echo '<h3>';
 		_e('You have the latest version of WordPress. You do not need to upgrade');
@@ -146,9 +147,11 @@ function do_core_upgrade() {
 		request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
 		return;
 	}
-
-	echo '<div class="wrap">';
-	echo '<h2>' . __('Upgrade WordPress') . '</h2>';
+?>
+	<div class="wrap">
+	<?php screen_icon(); ?>
+	<h2><?php _e('Upgrade WordPress'); ?></h2>
+<?php
 	if ( $wp_filesystem->errors->get_error_code() ) {
 		foreach ( $wp_filesystem->errors->get_error_messages() as $message )
 			show_message($message);
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 5d312b879..21db41523 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -163,6 +163,7 @@ if ( isset($_GET['message']) && (int) $_GET['message'] ) {
 <?php do_action('restrict_manage_posts'); ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <?php
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index fcecf6f15..064c4f40f 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -176,7 +176,8 @@ include ('admin-header.php');
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
-	<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form id="your-profile" action="" method="post">
 <?php wp_nonce_field('update-user_' . $user_id) ?>
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 5fc5f6032..343c54604 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -42,6 +42,7 @@ require_once ('admin-header.php');
 
 ?>
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
 
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 612668bcd..e711a87e2 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -237,6 +237,7 @@ if ( ! empty($messages) ) {
 } ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <div class="filter">
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index 641f16cf6..7f4685a38 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -233,6 +233,7 @@ require_once( 'admin-header.php' ); ?>
 <?php endif; ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 	<form id="widgets-filter" action="" method="get">
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 8b2ce2f27..e58bf5c68 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1214,6 +1214,7 @@ strong .post-com-count {
 	margin-top: 0.5em;
 	width: 100%;
 	margin-bottom: -8px;
+	clear: both;
 }
 
 .form-table td,
@@ -3111,3 +3112,9 @@ table.fixed {
 	text-shadow: rgba(255,255,255,0.8) 0 1px 0;
 }
 
+.icon32 {
+	float: left;
+	height: 36px;
+	margin: 8px 6px 0 0;
+	width: 36px;
+}