diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index bb1299faf7..39295791ec 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -12,8 +12,8 @@ include('admin-header.php');
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" /></p>
-<fieldset class="options">
-<legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend>
+<h3><?php _e('Usual settings for an article:') ?></h3>
+<small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
 <ul>
 <li>
 <label for="default_pingback_flag">
@@ -31,9 +31,8 @@ include('admin-header.php');
 <?php _e('Allow people to post comments on the article') ?></label>
 </li>
 </ul>
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('E-mail me whenever:') ?></legend>
+
+<h3><?php _e('E-mail me whenever:') ?></h3>
 <ul>
 <li>
 <label for="comments_notify">
@@ -46,9 +45,8 @@ include('admin-header.php');
 <?php _e('A comment is held for moderation') ?> </label>
 </li>
 </ul>
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('Before a comment appears:') ?></legend>
+
+<h3><?php _e('Before a comment appears:') ?></h3>
 <ul>
 <li>
 <label for="comment_moderation">
@@ -58,23 +56,21 @@ include('admin-header.php');
 <li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li>
 <li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li>
 </ul>
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('Comment Moderation') ?></legend>
+
+<h3><?php _e('Comment Moderation') ?></h3>
 <p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
 
 <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p>
 <textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
 </p>
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('Comment Blacklist') ?></legend>
+
+<h3><?php _e('Comment Blacklist') ?></h3>
 <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p>
 <textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea>
 </p>
-</fieldset>
+
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys" />
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index e8e93e8c50..b6eeb21580 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -13,8 +13,7 @@ include('admin-header.php');
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" /></p>
-<fieldset class="options">
-<legend><?php _e('Uploading'); ?></legend>
+<h3><?php _e('Uploading'); ?></h3>
 <table class="niceblue">
 <tr valign="top">
 <th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
@@ -40,7 +39,6 @@ include('admin-header.php');
 </td>
 </tr>
 </table>
-</fieldset>
 
 <p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_option('use_linksupdate')); ?> />
 <label for="use_linksupdate"><?php _e('Track Links&#8217; Update Times') ?></label></p>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 9d263dd7f0..82ca96e169 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -13,8 +13,7 @@ include('admin-header.php');
 <?php wp_nonce_field('update-options') ?>
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes &raquo;') ?>" /></p>
 <?php if ( get_pages() ): ?>
-<fieldset class="options">
-<legend><?php _e('Front Page') ?></legend>
+<h3><?php _e('Front Page') ?></h3>
 <table class="niceblue">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Front page displays:')?></th>
@@ -43,11 +42,9 @@ include('admin-header.php');
 </td>
 </tr>
 </table>
-</fieldset>
 <?php endif; ?>
 
-<fieldset class="options">
-<legend><?php _e('Blog Pages') ?></legend>
+<h3><?php _e('Blog Pages') ?></h3>
 <table class="niceblue">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Show at most:') ?></th>
@@ -58,8 +55,7 @@ include('admin-header.php');
 </table>
 </fieldset>
 
-<fieldset class="options">
-<legend><?php _e('Syndication Feeds') ?></legend>
+<h3><?php _e('Syndication Feeds') ?></h3>
 <table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Show the most recent:') ?></th>
@@ -73,10 +69,8 @@ include('admin-header.php');
 </td>
 </tr>
 </table>
-</fieldset>
 
-<fieldset class="options">
-<legend><?php _e('Avatars') ?></legend>
+<h3><?php _e('Avatars') ?></h3>
 <table class="niceblue">
 <tr valign="top">
 <th width="33%" scope="row"><?php _e('Show Avatars?') ?></th>
@@ -107,7 +101,6 @@ endforeach;
 </td>
 </tr>
 </table>
-</fieldset>
 
 <table class="niceblue">
 <tr valign="top">
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index a337e35e2f..a0091fe961 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -58,8 +58,7 @@ endforeach;
 </tr>
 </table>
 
-<fieldset class="options">
-<legend><?php _e('Post via e-mail') ?></legend>
+<h3><?php _e('Post via e-mail') ?></h3>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), wp_generate_password(), wp_generate_password(), wp_generate_password()) ?></p>
 
 <table class="niceblue">
@@ -95,10 +94,8 @@ endforeach;
 </select></td>
 </tr>
 </table>
-</fieldset>
 
-<fieldset class="options">
-<legend><?php _e('Update Services') ?></legend>
+<h3><?php _e('Update Services') ?></h3>
 
 <?php if ( get_option('blog_public') ) : ?>
 
@@ -112,8 +109,6 @@ endforeach;
 
 <?php endif; ?>
 
-</fieldset>
-
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags,default_link_category" />