diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 19a5286048..742e05db97 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -10,7 +10,7 @@ if (!isset($_GET["page"])) require_once('admin.php'); ?>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
 
 <?php if ( get_option('rich_editing') ) :?>
-<script type="text/javascript" src="tinymce/tiny_mce_gzip.php"></script>
+<script type="text/javascript" src="tinymce/tiny_mce_src.js"></script>
 <script type="text/javascript">
 tinyMCE.init({
 	mode : "specific_textareas",
@@ -115,6 +115,9 @@ window.onload = blurry;
 <h1><?php echo wptexturize(get_settings(('blogname'))); ?> <span>(<a href="<?php echo get_settings('home') . '/'; ?>"><?php _e('View site') ?> &raquo;</a>)</span></h1>
 </div>
 
+<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_settings('siteurl')
+	 ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Account'); ?></a>] </p></div>
+
 <?php
 require(ABSPATH . '/wp-admin/menu-header.php');
 
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index c7ec58152b..db4ac133a5 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -20,8 +20,6 @@ foreach ($menu as $item) {
 }
 
 ?>
-	<li class="last"><a href="<?php echo get_settings('siteurl')
-	 ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php printf(__('Logout (%s)'), $user_identity) ?></a></li>
 </ul>
 
 <?php
diff --git a/wp-admin/tinymce/tiny_mce_src.js b/wp-admin/tinymce/tiny_mce_src.js
index be9eba5dbf..3cf566b5d0 100644
--- a/wp-admin/tinymce/tiny_mce_src.js
+++ b/wp-admin/tinymce/tiny_mce_src.js
@@ -531,7 +531,7 @@ TinyMCE.prototype._createIFrame = function(replace_element) {
 	iframe.setAttribute("leftMargin", "0");
 	iframe.setAttribute("topMargin", "0");
 	iframe.setAttribute("width", tinyMCE.settings['area_width']);
-	iframe.setAttribute("height", "98%");
+	iframe.setAttribute("height", tinyMCE.settings['area_height']);
 	iframe.setAttribute("allowtransparency", "true");
 
 	if (tinyMCE.settings["auto_resize"])
@@ -541,7 +541,7 @@ TinyMCE.prototype._createIFrame = function(replace_element) {
 	if (tinyMCE.isMSIE)
 		iframe.setAttribute("src", this.settings['default_document']);
 
-	iframe.style.width = tinyMCE.settings['area_width'];
+	iframe.style.width = "98%";
 	iframe.style.height = tinyMCE.settings['area_height'];
 
 	// MSIE 5.0 issue
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index c046960ec1..ef1a020321 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -108,9 +108,9 @@ form, label input {
 }
 
 h2 {
-	border-bottom: 2px solid #69c;
+	border-bottom: .5em solid #f0f8ff;
 	color: #333;
-	font: normal 22px/18px serif;
+	font: normal 30px/5px serif;
 	margin: 5px 10px;
 }
 
@@ -266,14 +266,14 @@ textarea, input, select {
 }
 
 .wrap h2 {
-	margin: 6px 0;
+	margin: .5em 0;
 }
 
 #adminmenu {
-	background: #fff;
-	border-bottom: 2px solid #707070;
+	background: #6da6d1;
+	border-top: 3px solid #448abd;
 	margin: 0;
-	padding: .2em;
+	padding: .2em .2em .2em 2em;
 }
 
 #adminmenu .current, #adminmenu2 .current {
@@ -281,9 +281,8 @@ textarea, input, select {
 }
 
 #adminmenu a {
-	border: 1px solid #fff;
-	color: #333;
-	font-size: 16px;
+	color: #000;
+	font-size: 14px;
 	font-weight: normal;
 	margin: 0;
 	padding: 3px 5px;
@@ -291,9 +290,8 @@ textarea, input, select {
 }
 
 #adminmenu a:hover, .current {
-	background: #ccc;
-	border: 1px solid #9d9d9d;
-	color: #171717;
+	background: #ddeaf4;
+	color: #333;
 }
 
 #adminmenu li, #adminmenu2 li {
@@ -304,16 +302,16 @@ textarea, input, select {
 }
 
 #adminmenu2 {
-	background: #a3a3a3;
+	background: #0d324f;;
 	border-bottom: none;
 	margin: 0;
-	padding: 3px 2em 0;
+	padding: 3px 2em 0 3em;
 }
 
 #adminmenu2 .current {
-	background: #f2f2f2;
-	border-top: 1px solid #9a9a9a;
-	border-right: 2px solid #4f4f4f;
+	background: #ddeaf4;
+	border-top: 1px solid #045290;
+	border-right: 2px solid #045290;
 	color: #000;
 }
 
@@ -325,7 +323,7 @@ textarea, input, select {
 }
 
 #adminmenu2 a:hover {
-	background: #f0f0f0;
+	background: #ddeaf4;
 	color: #393939;
 }
 
@@ -496,9 +494,26 @@ textarea, input, select {
 	padding: 0;
 }
 
+#user_info {
+	position: absolute;
+	right: 1em;
+	top: 0;
+	color: #fff;
+	font-size: .9em;
+}
+
+#user_info a {
+	color: #fff;
+}
+
 #wphead {
-	background: url(../wp-images/header-shadow.png) #f2f2f2 repeat-x bottom;
-	padding: 1px 5px 11px;
+	background: #14568a;
+	padding: .8em 19em .8em 2em;
+	color: #c3def1;
+}
+
+#wphead a {
+	color: #fff;
 }
 
 #wphead h1 {
diff --git a/wp-images/header-shadow.png b/wp-images/header-shadow.png
deleted file mode 100644
index 5b6a644dcc..0000000000
Binary files a/wp-images/header-shadow.png and /dev/null differ