diff --git a/wp-admin/b2edit.form.php b/wp-admin/b2edit.form.php
index 2d84ea78e7..fe4ded0d9b 100644
--- a/wp-admin/b2edit.form.php
+++ b/wp-admin/b2edit.form.php
@@ -63,19 +63,18 @@ function focusit() {
 }
 window.onload = focusit;
 </script>
-<table>
-	<tr> 
-	<td width="210">
+
+<div id="titlediv">
 		<label for="title"><a href="http://wordpress.org/docs/reference/post/#title" title="Help on titles">Title</a>:</label>		
 		<br />
 		<input type="text" name="post_title" size="25" tabindex="1" style="width: 190px;" value="<?php echo $edited_post_title; ?>" id="title" /> 
-		</td>
-	<td>
+		</div>
+	<div id="categorydiv">
 		<label for="category"><a href="http://wordpress.org/docs/reference/post/#category" title="Help on categories">Category</a>:</label>
 		<br /> 
 		<?php dropdown_categories($blog_ID, $default_post_cat); ?>
-	</td>
-	<td>
+	</div>
+	<div id="poststatusdiv">
 		<label for="post_status"><a href="http://wordpress.org/docs/reference/post/#post_status" title="Help on post status">Post
 		Status</a>:</label>
 		<br />          
@@ -84,31 +83,30 @@ window.onload = focusit;
 			<option value="draft"<?php selected($post_status, 'draft'); ?>>Draft</option>
 			<option value="private"<?php selected($post_status, 'private'); ?>>Private</option>
 		</select>
-	</td>
-	<td>
+	</div>
+	<div id="commentstatusdiv">
 		<label for="comment_status"><a href="http://wordpress.org/docs/reference/post/#comments" title="Help on comment status">Comments</a>:</label>
 		<br />
 		<select name="comment_status" id="comment_status">
 			<option value="open"<?php selected($comment_status, 'open'); ?>>Open</option>
 			<option value="closed"<?php selected($comment_status, 'closed'); ?>>Closed</option>
 		</select>
-	</td>
-	<td>
+	</div>
+	<div id="pingstatusdiv">
 		<label for="ping_status"><a href="http://wordpress.org/docs/reference/post/#pings" title="Help on ping status">Pings</a>:</label>		
 		<br />	
 		<select name="ping_status" id="ping_status">
 			<option value="open"<?php selected($ping_status, 'open'); ?>>Open</option>
 			<option value="closed"<?php selected($ping_status, 'closed'); ?>>Closed</option>
 		</select>
-	</td>
-	<td>
+	</div>
+	<div id="postpassworddiv">
 		<label for="post_password"><a href="http://wordpress.org/docs/reference/post/#post_password" title="Help on post password">Post
 		Password</a>:</label>		
 		<br />
 		<input name="post_password" type="text" id="post_password" value="<?php echo $post_password ?>" />
-	</td>
-	</tr>
-</table>
+	</div>
+<br clear="all" />
 <?php
 
 } else {
diff --git a/wp-admin/b2header.php b/wp-admin/b2header.php
index 7c12f69d32..5b8ec8b4e8 100644
--- a/wp-admin/b2header.php
+++ b/wp-admin/b2header.php
@@ -56,7 +56,7 @@ if ($standalone == 0) {
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>WordPress > <?php bloginfo('name') ?> > <?php echo $title; ?></title>
-<link rel="stylesheet" href="b2.css" type="text/css" />
+<link rel="stylesheet" href="wp-admin.css" type="text/css" />
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $admin_area_charset ?>" />
 <?php
 if ($redirect==1) {
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
new file mode 100644
index 0000000000..a1f383fdc9
--- /dev/null
+++ b/wp-admin/wp-admin.css
@@ -0,0 +1,222 @@
+a {
+	color: #00019b;
+	font-weight: bold;
+}
+
+a:visited {
+	color: #006;
+}
+
+a:hover {
+	color: #069;
+}
+
+body	{
+	background-color: #fff;
+	margin: 0px;
+}
+
+body, td {
+	color: #000;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 10pt;
+}
+
+form {
+	margin: 0;
+	padding: 0; /* thanks #mozilla */
+}
+
+h2 {
+	border-bottom: 2px solid #666;
+	color: #333;
+	margin: 2px 5px;
+	font: normal 22px/22px normal;
+}
+
+label {
+	font-weight: bold;
+}
+
+li {
+	margin-bottom: 6px;
+}
+
+p {
+	line-height: 130%;
+}
+
+textarea, input, select {
+	background-color: #f0f0f0;
+	border-color: #ccc;
+	border-style: solid;
+	border-width: 1px;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	margin: 1px;
+	padding: 2px;
+}
+
+.alternate {
+	background-color: #eee;
+}
+
+.checkbox {
+	background-color: #fff;
+	border-width: 0px;
+	margin: 0px;
+	padding: 0px;
+}
+
+.quicktags, .search {
+	background-color: #ccc;
+	color: #000;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 12px;
+}
+
+.wrap {
+	border: 1px solid #ccc;
+	margin: 20px auto 10px auto;
+	padding: 10px;
+	width: 85%;
+}
+
+.helptext {
+}
+#titlediv, #categorydiv, #poststatusdiv, #commentstatusdiv, #pingstatusdiv, #postpassworddiv {
+	float: left;
+	margin-right: 5px;
+}
+
+#metainfo {
+	clear: both;
+}
+#adminmenu {
+	list-style: none outside;
+	margin: 5px 0 0 0;
+	margin-left: 40px;
+	padding: 0;
+}
+
+#adminmenu #last {
+	border-right: none;
+}
+
+#adminmenu a {
+	border: 1px solid #fff;
+	color: #333;
+	padding: 3px 5px 3px 4px;
+	text-decoration: none;
+}
+
+#adminmenu a:hover, #current {
+	background-color: #e9e9e9;
+	border: 1px solid #808080;
+	color: #333;
+}
+
+#adminmenu li {
+	border-right: 1px solid #ccc;
+	display: block;
+	float: left;
+	padding: 2px;
+	text-align: center;
+}
+
+#adminmenu2 {
+	list-style: none outside;
+	margin: 5px 0 0 0;
+    margin-left: 40px;
+	padding: 0;
+}
+
+#adminmenu2 li {
+	border-right: 1px solid #ccc;
+	display: block;
+	float: left;
+    padding: 4px;
+	text-align: center;
+}
+
+#adminmenu2 a {
+	border: 1px solid #fff;
+	color: #333;
+    padding: 3px 8px 3px 7px;
+	text-decoration: none;
+}
+
+#adminmenu2 a:hover, #current2 {
+	background-color: #e9e9e9;
+	border: 1px solid #808080;
+	color: #333;
+}
+
+#adminmenu2 #last2 {
+	border-right: none;
+}
+
+
+
+
+#login {
+	background: url(http://wordpress.org/images/wp-small.png) #fff no-repeat top center;
+	border: 2px solid #333;
+	color: #333;
+	height: 170px;
+	left: 50%;
+	margin-left: -120px; /* half of width and height */
+	margin-top: -85px;
+	padding: 40px 5px 5px 5px;
+	position: absolute;
+	text-align: right;
+	top: 45%;
+	width: 240px;
+}
+
+#login textarea, #login input, #login select {
+	background-color: #f0f0f0;
+	border-color: #ccc;
+	border-style: solid;
+	border-width: 1px;
+	margin: 1px;
+	padding: 2px;
+}
+
+#profile {
+	margin: 10px;
+}
+
+#profile .left {
+	border-right: 1px dashed #ccc;
+	float: left;
+	margin-right: 5px;
+	padding-right: 5px;
+}
+
+#profile label {
+	float: left;
+	padding-right: 3px;
+	text-align: right;
+	width: 85px;
+}
+
+#profile p {
+	margin: 0 0 4px 0;
+}
+
+#wphead {
+	background-image: url(../b2-img/wp-small.png);
+	background-repeat: no-repeat;
+	border-bottom: 4px solid #333;
+	height: 42px;
+	margin: 5px;
+}
+
+#wphead a {
+	display: block;
+	height: 30px;
+}
+
+#wphead a span {
+	display: none;
+}
