diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index d99044f4d1..1c1b13abf8 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -23,23 +23,23 @@ if ( ! empty($cat_ID) ) {
 <input type="hidden" name="action" value="<?php echo $action ?>" />
 <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
 <?php wp_nonce_field($nonce_action); ?>
-	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<table class="niceblue" width="100%">
 		<tr class="form-field form-required">
-			<th width="33%" scope="row" valign="top"><label for="cat_name"><?php _e('Category name:') ?></label></th>
-			<td width="67%"><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" /></td>
+			<th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
+			<td><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" /></td>
 		</tr>
 		<tr class="form-field">
-			<th scope="row" valign="top"><label for="category_nicename"><?php _e('Category slug:') ?></label></th>
+			<th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
 			<td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo attribute_escape($category->slug); ?>" size="40" /></td>
 		</tr>
 		<tr class="form-field">
-			<th scope="row" valign="top"><label for="category_parent"><?php _e('Category parent:') ?></label></th>
+			<th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
 			<td>
 	  			<?php wp_dropdown_categories('hide_empty=0&name=category_parent&orderby=name&selected=' . $category->parent . '&hierarchical=1&show_option_none=' . __('None')); ?>
 	  		</td>
 		</tr>
 		<tr class="form-field">
-			<th scope="row" valign="top"><label for="category_description"><?php _e('Description: (optional)') ?></label></th>
+			<th scope="row" valign="top"><label for="category_description"><?php _e('Description (optional)') ?></label></th>
 			<td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->description); ?></textarea></td>
 		</tr>
 	</table>
diff --git a/wp-admin/edit-link-category-form.php b/wp-admin/edit-link-category-form.php
index 6962dcc889..2f4344fc2f 100644
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -23,10 +23,10 @@ if ( ! empty($cat_ID) ) {
 <input type="hidden" name="action" value="<?php echo $action ?>" />
 <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
 <?php wp_nonce_field($nonce_action); ?>
-	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<table class="niceblue" width="100%">
 		<tr class="form-field form-required">
-			<th width="33%" scope="row" valign="top"><label for="name"><?php _e('Category name:') ?></label></th>
-			<td width="67%"><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" /></td>
+			<th scope="row" valign="top"><label for="name"><?php _e('Category name:') ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" /></td>
 		</tr>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="slug"><?php _e('Category slug:') ?></label></th>
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 1045cc8be9..ebdb326565 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -23,10 +23,10 @@ if ( ! empty($tag_ID) ) {
 <input type="hidden" name="action" value="<?php echo $action ?>" />
 <input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" />
 <?php wp_nonce_field($nonce_action); ?>
-	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<table class="niceblue" width="100%">
 		<tr class="form-field form-required">
-			<th width="33%" scope="row" valign="top"><label for="name"><?php _e('Tag name:') ?></label></th>
-			<td width="67%"><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" /></td>
+			<th scope="row" valign="top"><label for="name"><?php _e('Tag name:') ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" /></td>
 		</tr>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="slug"><?php _e('Tag slug:') ?></label></th>