diff --git a/wp-admin/css/login.css b/wp-admin/css/login.css
new file mode 100644
index 0000000000..7b4d1c6df7
--- /dev/null
+++ b/wp-admin/css/login.css
@@ -0,0 +1,66 @@
+* { margin: 0; padding: 0; }
+
+body {
+	background-color: #fff;
+	color: #333;
+	border-top: 30px solid #464646;
+	font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+}
+
+form {
+	background-color: #eaf3fa;
+	margin-left: 8px;
+	-moz-border-radius: 3px;
+	padding: 16px;
+	font-weight: bold;
+}
+
+form .forgetmenot { font-weight: normal; float: left; }
+
+form .submit { float: right; }
+
+form .submit input { padding: 2px; }
+
+form input { color: #246; }
+
+form p { margin-bottom: 24px; }
+
+h1 a {
+	background: #fff url(../images/logo-login.gif) no-repeat;
+	width: 292px;
+	height: 66px;
+	text-indent: -9999px;
+	overflow: hidden;
+	padding-bottom: 15px;
+	display: block;
+}
+
+#backtoblog a {
+	position: absolute;
+	color: #ccc;
+	top: 7px;
+	left: 15px;
+	text-decoration: none;
+}
+
+#backtoblog a:hover { color: #fff; }
+
+#login { width: 292px; margin: 7em auto; }
+
+#login_error, .message {
+	margin: 0 0 16px 8px;
+	background-color: #fffbcc;
+	border: 1px solid #e6db55;
+	padding: 12px;
+}
+
+#nav { margin: 0 0 0 8px; padding: 16px; }
+
+#nav a { color: #777; }
+
+#user_pass, #user_login, #user_email {
+	font-size: 20px;
+	width: 97%;
+	padding: 3px;
+	margin-right: 6px;
+}
diff --git a/wp-admin/images/box-bg-left.gif b/wp-admin/images/box-bg-left.gif
deleted file mode 100644
index c3c7e35950..0000000000
Binary files a/wp-admin/images/box-bg-left.gif and /dev/null differ
diff --git a/wp-admin/images/box-bg-right.gif b/wp-admin/images/box-bg-right.gif
deleted file mode 100644
index 12a0d1af05..0000000000
Binary files a/wp-admin/images/box-bg-right.gif and /dev/null differ
diff --git a/wp-admin/images/box-bg.gif b/wp-admin/images/box-bg.gif
deleted file mode 100644
index 2eb7f58240..0000000000
Binary files a/wp-admin/images/box-bg.gif and /dev/null differ
diff --git a/wp-admin/images/box-butt-left.gif b/wp-admin/images/box-butt-left.gif
deleted file mode 100644
index 590c2efe5e..0000000000
Binary files a/wp-admin/images/box-butt-left.gif and /dev/null differ
diff --git a/wp-admin/images/box-butt-right.gif b/wp-admin/images/box-butt-right.gif
deleted file mode 100644
index 487ebb3617..0000000000
Binary files a/wp-admin/images/box-butt-right.gif and /dev/null differ
diff --git a/wp-admin/images/box-butt.gif b/wp-admin/images/box-butt.gif
deleted file mode 100644
index 514a165e25..0000000000
Binary files a/wp-admin/images/box-butt.gif and /dev/null differ
diff --git a/wp-admin/images/box-head-left.gif b/wp-admin/images/box-head-left.gif
deleted file mode 100644
index b03e075ef0..0000000000
Binary files a/wp-admin/images/box-head-left.gif and /dev/null differ
diff --git a/wp-admin/images/box-head-right.gif b/wp-admin/images/box-head-right.gif
deleted file mode 100644
index 897b03aca6..0000000000
Binary files a/wp-admin/images/box-head-right.gif and /dev/null differ
diff --git a/wp-admin/images/box-head.gif b/wp-admin/images/box-head.gif
deleted file mode 100644
index 5c09a9ae08..0000000000
Binary files a/wp-admin/images/box-head.gif and /dev/null differ
diff --git a/wp-admin/images/heading-bg.gif b/wp-admin/images/heading-bg.gif
deleted file mode 100644
index bea18ca5ea..0000000000
Binary files a/wp-admin/images/heading-bg.gif and /dev/null differ
diff --git a/wp-admin/images/login-bkg-bottom.gif b/wp-admin/images/login-bkg-bottom.gif
deleted file mode 100644
index a78656eb84..0000000000
Binary files a/wp-admin/images/login-bkg-bottom.gif and /dev/null differ
diff --git a/wp-admin/images/login-bkg-tile.gif b/wp-admin/images/login-bkg-tile.gif
deleted file mode 100644
index 1015a9eccd..0000000000
Binary files a/wp-admin/images/login-bkg-tile.gif and /dev/null differ
diff --git a/wp-admin/images/logo-login.gif b/wp-admin/images/logo-login.gif
new file mode 100644
index 0000000000..993b97be08
Binary files /dev/null and b/wp-admin/images/logo-login.gif differ
diff --git a/wp-admin/images/notice.gif b/wp-admin/images/notice.gif
deleted file mode 100644
index ba6eab02de..0000000000
Binary files a/wp-admin/images/notice.gif and /dev/null differ
diff --git a/wp-admin/images/toggle.gif b/wp-admin/images/toggle.gif
deleted file mode 100644
index 72e8b4499a..0000000000
Binary files a/wp-admin/images/toggle.gif and /dev/null differ
diff --git a/wp-login.php b/wp-login.php
index bf4c802361..27124b78b1 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -35,8 +35,7 @@ function login_header($title = 'Login', $message = '') {
 <head>
 	<title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title>
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-	<?php wp_admin_css(); ?>
-	<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login #login_error { margin-bottom: 10px; }</style><![endif]--><!-- Curse you, IE! -->
+	<link rel='stylesheet' href='wp-admin/css/login.css' type='text/css' />
 	<script type="text/javascript">
 		function focusit() {
 			document.getElementById('user_login').focus();
@@ -138,28 +137,30 @@ case 'retrievepassword' :
 
 <form name="lostpasswordform" id="lostpasswordform" action="wp-login.php?action=lostpassword" method="post">
 	<p>
-		<label><?php _e('Username:') ?><br />
+		<label><?php _e('Username') ?><br />
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo attribute_escape(stripslashes($_POST['user_login'])); ?>" size="20" tabindex="10" /></label>
 	</p>
 	<p>
-		<label><?php _e('E-mail:') ?><br />
+		<label><?php _e('E-mail') ?><br />
 		<input type="text" name="user_email" id="user_email" class="input" value="<?php echo attribute_escape(stripslashes($_POST['user_email'])); ?>" size="25" tabindex="20" /></label>
 	</p>
 <?php do_action('lostpassword_form'); ?>
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Get New Password &raquo;'); ?>" tabindex="100" /></p>
+    <div><br clear="all" /></div>
 </form>
+
+<p id="nav">
+<?php if (get_option('users_can_register')) : ?>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a> | 
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a>
+<?php else : ?>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a>
+<?php endif; ?>
+</p>
+
 </div>
 
-<ul>
-<?php if (get_option('users_can_register')) : ?>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display' )); ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
-<?php else : ?>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display' )); ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a></li>
-<?php endif; ?>
-</ul>
+<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
 </body>
 </html>
@@ -258,24 +259,27 @@ case 'register' :
 
 <form name="registerform" id="registerform" action="wp-login.php?action=register" method="post">
 	<p>
-		<label><?php _e('Username:') ?><br />
+		<label><?php _e('Username') ?><br />
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" size="20" tabindex="10" /></label>
 	</p>
 	<p>
-		<label><?php _e('E-mail:') ?><br />
+		<label><?php _e('E-mail') ?><br />
 		<input type="text" name="user_email" id="user_email" class="input" value="<?php echo attribute_escape(stripslashes($user_email)); ?>" size="25" tabindex="20" /></label>
 	</p>
 <?php do_action('register_form'); ?>
 	<p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Register &raquo;'); ?>" tabindex="100" /></p>
+    <div><br clear="all" /></div>
 </form>
+
+<p id="nav">
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a> | 
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
+</p>
+
 </div>
 
-<ul>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display')); ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Log in') ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
-</ul>
+<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
 </body>
 </html>
@@ -352,38 +356,38 @@ default:
 <form name="loginform" id="loginform" action="wp-login.php" method="post">
 <?php if ( !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
 	<p>
-		<label><?php _e('Username:') ?><br />
+		<label><?php _e('Username') ?><br />
 		<input type="text" name="log" id="user_login" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" size="20" tabindex="10" /></label>
 	</p>
 	<p>
-		<label><?php _e('Password:') ?><br />
+		<label><?php _e('Password') ?><br />
 		<input type="password" name="pwd" id="user_pass" class="input" value="" size="20" tabindex="20" /></label>
 	</p>
 <?php do_action('login_form'); ?>
-	<p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember me'); ?></label></p>
+	<p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember Me'); ?></label></p>
 	<p class="submit">
 		<input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Log in'); ?> &raquo;" tabindex="100" />
 		<input type="hidden" name="redirect_to" value="<?php echo attribute_escape($redirect_to); ?>" />
+  <div><br clear="all" /></div>
 	</p>
 <?php else : ?>
 	<p>&nbsp;</p>
 <?php endif; ?>
 </form>
+
+<p id="nav">
+<?php if ( in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
+<?php elseif (get_option('users_can_register')) : ?>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a> |
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
+<?php else : ?>
+<a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
+<?php endif; ?>
+</p>
+
 </div>
 
-<ul>
-<?php if ( in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display')); ?></a></li>
-<?php elseif (get_option('users_can_register')) : ?>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display')); ?></a></li>
-<?php else : ?>
-	<li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title', 'display')); ?></a></li>
-	<li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
-<?php endif; ?>
-</ul>
-
+<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&laquo; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
 
 </body>
 </html>
@@ -391,4 +395,4 @@ default:
 
 break;
 } // end action switch
-?>
+?>
\ No newline at end of file