diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 579ae87c11..7e70e2e6d2 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -158,24 +158,23 @@ include ('admin-header.php');
 <td>
 <?php
 foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
-<p><label>
-<input name="admin_color" type="radio" value="<?php echo $color ?>" class="tog" <?php checked($color, get_user_option('admin_color')); ?> />
-<?php echo $color_info->name ?>
-</label></p>
-<table>
-<tr>
-<?php
-foreach ( $color_info->colors as $color ): ?>
-<td style="background-color: <?php echo $color ?>" title="<?php echo $color ?>"></td>
-<?php endforeach; ?>
-</tr>
-</table>
+<label class="color-option"><input name="admin_color" type="radio" value="<?php echo $color ?>" class="tog" <?php checked($color, get_user_option('admin_color')); ?> />
+	<table class="color-palette">
+	<tr>
+	<?php
+	foreach ( $color_info->colors as $color ): ?>
+	<td style="background-color: <?php echo $color ?>" title="<?php echo $color ?>"></td>
+	<?php endforeach; ?>
+	</tr>
+	</table>
+	
+	<?php echo $color_info->name ?>
+</label>
 <?php endforeach; ?>
 </td>
 </tr>
 </table>
 
-
 <?php
 	if ( $is_profile_page ) {
 		do_action('profile_personal_options');
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 87b7cc07b0..9c0fc78cd8 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -812,13 +812,30 @@ html, body {
 	border-style: solid;
 }
 
-#profile-page .form-table input {
-	width: 200px;
+.form-table label.color-option {
+	display: block;
+	clear: both;
+}
+
+.form-table input.tog {
+	margin-top: 2px;
+	margin-right: 2px;
+	float: left;
+}
+
+.form-table table.color-palette {
+	vertical-align: bottom;
+	float: left;
+	margin: -3px 3px 8px;
+}
+
+.form-table .color-palette td {
+	border-bottom: none;
+	border: 1px solid #fff;
 }
 
 #profile-page .form-table textarea {
 	width: 500px;
-	height: 150px;
 	margin-bottom: 6px;
 }