diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 2aa3dcb2d..f13a99470 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3747,7 +3747,12 @@ function screen_icon($screen = '') {
 			$name = $screen->parent_base;
 		else
 			$name = $screen->base;
+
+		// @todo Remove this once we have a site admin icon
+		if ( 'ms-admin' == $screen->parent_base )
+			$name = 'tools';
 	}
+
 ?>
 	<div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
 <?php
diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php
index f6520aad3..b62105704 100644
--- a/wp-admin/ms-admin.php
+++ b/wp-admin/ms-admin.php
@@ -29,6 +29,7 @@ $title = __( 'Site Admin' );
 ?>
 
 <div class="wrap">
+	<?php screen_icon(); ?>
 	<h2><?php echo esc_html( $title ); ?></h2>
 
 	<ul class="subsubsub">
diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php
index 5ebc1ed8f..5e4c49a5e 100644
--- a/wp-admin/ms-options.php
+++ b/wp-admin/ms-options.php
@@ -20,6 +20,7 @@ if (isset($_GET['updated'])) {
 ?>
 
 <div class="wrap">
+	<?php screen_icon(); ?>
 	<h2><?php _e('Site Options') ?></h2>
 	<form method="post" action="ms-edit.php?action=siteoptions">
 		<?php wp_nonce_field( "siteoptions" ); ?>
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index b5f6d8d93..279049836 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -79,6 +79,7 @@ switch ( $_GET['action'] ) {
 		$editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
 		?>
 		<div class="wrap">
+		<?php screen_icon(); ?>
 		<h2><?php _e('Edit Blog'); ?> - <a href='http://<?php echo $details['domain'].$details['path']; ?>'>http://<?php echo $details['domain'].$details['path']; ?></a></h2>
 		<form method="post" action="ms-edit.php?action=updateblog">
 			<?php wp_nonce_field('editblog'); ?>
@@ -369,6 +370,7 @@ switch ( $_GET['action'] ) {
 		?>
 
 		<div class="wrap" style="position:relative;">
+		<?php screen_icon(); ?>
 		<h2><?php _e('Blogs') ?></h2>
 
 		<form action="ms-sites.php" method="get" id="ms-search">
@@ -579,6 +581,7 @@ switch ( $_GET['action'] ) {
 
 		<div class="wrap">
 			<a name="form-add-blog"></a>
+			<?php screen_icon(); ?>
 			<h2><?php _e('Add Blog') ?></h2>
 			<form method="post" action="ms-edit.php?action=addblog">
 				<?php wp_nonce_field('add-blog') ?>
diff --git a/wp-admin/ms-themes.php b/wp-admin/ms-themes.php
index 49059e4c4..cb8f2003f 100644
--- a/wp-admin/ms-themes.php
+++ b/wp-admin/ms-themes.php
@@ -20,6 +20,7 @@ $allowed_themes = get_site_allowed_themes();
 ?>
 <div class="wrap">
 	<form action='ms-edit.php?action=updatethemes' method='post'>
+		<?php screen_icon(); ?>
 		<h2><?php _e('Site Themes') ?></h2>
 		<p><?php _e('Disable themes site-wide. You can enable themes on a site by site basis.') ?></p>
 		<table class="widefat">
diff --git a/wp-admin/ms-upgrade-site.php b/wp-admin/ms-upgrade-site.php
index 4a0e6666a..2d341c0a6 100644
--- a/wp-admin/ms-upgrade-site.php
+++ b/wp-admin/ms-upgrade-site.php
@@ -14,6 +14,7 @@ if ( !is_super_admin() )
 	wp_die( __('You do not have permission to access this page.') );
 
 echo '<div class="wrap">';
+screen_icon();
 echo '<h2>'.__('Upgrade Site').'</h2>';
 switch( $_GET['action'] ) {
 	case "upgrade":
diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php
index 46e8753b0..b1e46eab3 100644
--- a/wp-admin/ms-users.php
+++ b/wp-admin/ms-users.php
@@ -54,29 +54,26 @@ if ( $_GET['updated'] == 'true' ) {
 		$query .= " WHERE user_login LIKE '$search' OR user_email LIKE '$search'";
 	}
 
-	if ( !isset($_GET['sortby']) ) {
+	if ( !isset($_GET['sortby']) )
 		$_GET['sortby'] = 'id';
-	}
 
-	if ( $_GET['sortby'] == 'email' ) {
+	if ( $_GET['sortby'] == 'email' )
 		$query .= ' ORDER BY user_email ';
-	} elseif ( $_GET['sortby'] == 'id' ) {
+	elseif ( $_GET['sortby'] == 'id' )
 		$query .= ' ORDER BY ID ';
-	} elseif ( $_GET['sortby'] == 'login' ) {
+	elseif ( $_GET['sortby'] == 'login' )
 		$query .= ' ORDER BY user_login ';
-	} elseif ( $_GET['sortby'] == 'name' ) {
+	elseif ( $_GET['sortby'] == 'name' )
 		$query .= ' ORDER BY display_name ';
-	} elseif ( $_GET['sortby'] == 'registered' ) {
+	elseif ( $_GET['sortby'] == 'registered' )
 		$query .= ' ORDER BY user_registered ';
-	}
 
 	$query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
 
-	if ( !empty( $s )) {
+	if ( !empty( $s ) )
 		$total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(ID)', $query) );
-	} else {
+	else
 		$total = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users}");
-	}
 
 	$query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num );
 
@@ -101,7 +98,8 @@ if ( $_GET['updated'] == 'true' ) {
 
 	?>
 	<div class="wrap">
-	<h2><?php _e( $current_site->site_name ); ?> <?php _e("Users"); ?></h2>
+	<?php screen_icon(); ?>
+	<h2><?php esc_html_e("Users"); ?></h2>
 	<form action="ms-users.php" method="get" class="search-form">
 		<p class="search-box">
 		<input type="text" name="s" value="<?php if ( isset($_GET['s']) ) esc_attr( stripslashes( $s ) ); ?>" class="search-input" id="user-search-input" />