diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl
index b6fd5986..ce7abdcc 100644
--- a/templates/2k11/admin/category.inc.tpl
+++ b/templates/2k11/admin/category.inc.tpl
@@ -80,7 +80,7 @@
                 </div>
 
                 <fieldset class="clearfix inputs">
-                    <legend><span>{$CONST.CATEGORY_HIDE_SUB} <a class="toggle_info button_link" href="#hide_subcats_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></a></span></legend>
+                    <span class="wrap_legend"><legend>{$CONST.CATEGORY_HIDE_SUB} <a class="toggle_info button_link" href="#hide_subcats_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></a></legend></span>
 
                     <div class="clearfix grouped">
                         <div class="form_radio">
diff --git a/templates/2k11/admin/config_template.tpl b/templates/2k11/admin/config_template.tpl
index 8fcf58ef..8b8dff31 100644
--- a/templates/2k11/admin/config_template.tpl
+++ b/templates/2k11/admin/config_template.tpl
@@ -27,7 +27,7 @@
             {if $item.guessedInput}
                 {if $item.type == 'bool'}
                 <fieldset class="clearfix {$zebra_class}">
-                    <legend><span>{$item.title}{if $item.description != ''} <button class="toggle_info button_link" type="button" data-href="#{$item.var}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></button>{/if}</span></legend> {* i18n *}
+                    <span class="wrap_legend"><legend>{$item.title}{if $item.description != ''} <button class="toggle_info button_link" type="button" data-href="#{$item.var}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></button>{/if}</legend></span> {* i18n *}
                     <div class="clearfix grouped">
                     {$item.guessedInput}
                     </div>
diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl
index 2fa94809..ead3e67e 100644
--- a/templates/2k11/admin/entries.tpl
+++ b/templates/2k11/admin/entries.tpl
@@ -61,7 +61,7 @@
     </div>
 
     <fieldset id="edit_entry_metadata" class="clearfix">
-        <legend><button id="toggle_metadata" class="button_link" type="button"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button><span>Entry metadata</span></legend> {* i18n *}
+        <span class="wrap_legend"><legend><button id="toggle_metadata" class="button_link" type="button"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button> Entry metadata</legend></span> {* i18n *}
 
         <div id="meta_data" class="additional_info">
         {if $entry_vars.allowDateManipulation}
@@ -84,7 +84,7 @@
 
             <div id="edit_entry_status_comments">
                 <fieldset>
-                    <legend><span>{$CONST.COMMENTS}</span></legend>
+                    <span class="wrap_legend"><legend>{$CONST.COMMENTS}</legend></span>
 
                     <div class="form_check">
                         <input id="checkbox_allow_comments" name="serendipity[allow_comments]" type="checkbox" value="true"{if $entry_vars.allow_comments} checked="checked"{/if}><label for="checkbox_allow_comments">{$CONST.COMMENTS_ENABLE}</label>
@@ -98,7 +98,7 @@
 
             <div id="edit_entry_category" class="clearfix mfp-hide">
                 <fieldset>
-                    <legend><span>{$CONST.CATEGORY}</span></legend>
+                    <span class="wrap_legend"><legend>{$CONST.CATEGORY}</legend></span>
                 {foreach from=$entry_vars.category_options item="entry_cat"}
                     <div class="form_check">
                         {$entry_cat.depth_pad}
@@ -115,7 +115,7 @@
     {capture name='advanced_options'}{$entry_vars.entry|@serendipity_refhookPlugin:'backend_display'}{/capture}
     {if ! empty($smarty.capture.advanced_options) }
         <fieldset id="advanced_options">
-            <legend><button id="toggle_advanced" class="button_link" type="button"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button><span>{$CONST.ADVANCED_OPTIONS}</span></legend>
+            <span class="wrap_legend"><legend><button id="toggle_advanced" class="button_link" type="button"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.TOGGLE_ALL}</span></button> {$CONST.ADVANCED_OPTIONS}</legend></span>
             <div id="adv_opts" class="additional_info">
             {$smarty.capture.advanced_options}
             </div>
diff --git a/templates/2k11/admin/images.inc.tpl b/templates/2k11/admin/images.inc.tpl
index aa733cb9..da9fa6c3 100644
--- a/templates/2k11/admin/images.inc.tpl
+++ b/templates/2k11/admin/images.inc.tpl
@@ -257,7 +257,7 @@
             <input name="serendipity[fid]" type="hidden" value="{$get.fid}">
 
             <fieldset>
-                <legend><span>{$CONST.NEWSIZE}</span></legend>
+                <span class="wrap_legend"><legend>{$CONST.NEWSIZE}</legend></span>
 
                 <div class="form_field">
                     <label for="resize_width">{$CONST.INSTALL_THUMBDIM_WIDTH}</label>
diff --git a/templates/2k11/admin/index.tpl b/templates/2k11/admin/index.tpl
index 83d5f33e..e2267e0b 100644
--- a/templates/2k11/admin/index.tpl
+++ b/templates/2k11/admin/index.tpl
@@ -49,7 +49,7 @@
             <form id="login" class="clearfix" action="serendipity_admin.php" method="post">
                 <input type="hidden" name="serendipity[action]" value="admin">
                 <fieldset>
-                    <span><legend>{$CONST.PLEASE_ENTER_CREDENTIALS}</legend></span>
+                    <span class="wrap_legend"><legend>{$CONST.PLEASE_ENTER_CREDENTIALS}</legend></span>
 
                     <div class="form_field">
                         <label for="login_uid">{$CONST.USERNAME}</label>
diff --git a/templates/2k11/admin/maintenance.inc.tpl b/templates/2k11/admin/maintenance.inc.tpl
index 1cd2d31d..aed16b8f 100644
--- a/templates/2k11/admin/maintenance.inc.tpl
+++ b/templates/2k11/admin/maintenance.inc.tpl
@@ -50,7 +50,7 @@
 
         <form method="POST" action="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=doSync">
             <fieldset>
-                <legend><span>{$CONST.SYNC_OPTION_LEGEND}</span></legend>
+                <span class="wrap_legend"><legend>{$CONST.SYNC_OPTION_LEGEND}</legend></span>
 
                 <div class="clearfix">
                     <div class="form_radio">
diff --git a/templates/2k11/admin/media_choose.tpl b/templates/2k11/admin/media_choose.tpl
index 36efda84..e1e84a97 100644
--- a/templates/2k11/admin/media_choose.tpl
+++ b/templates/2k11/admin/media_choose.tpl
@@ -93,7 +93,7 @@ if (parent.frames && parent.frames['tree']) {
             </script>
         {else}
             <fieldset id="image_size">
-                <legend><span>{$CONST.IMAGE_SIZE}</span></legend>
+                <span class="wrap_legend"><legend>{$CONST.IMAGE_SIZE}</legend></span>
 
                 <div class="clearfix">
                     <div class="form_radio">
@@ -110,7 +110,7 @@ if (parent.frames && parent.frames['tree']) {
             </fieldset>
             {if NOT $media.filename_only}
             <fieldset id="image_alignment">
-                <legend><span>{$CONST.IMAGE_ALIGNMENT}</span></legend>
+                <span class="wrap_legend"><legend>{$CONST.IMAGE_ALIGNMENT}</legend></span>
 
                 <div class="clearfix">
                     <div class="form_radio">
@@ -132,7 +132,7 @@ if (parent.frames && parent.frames['tree']) {
             </fieldset>
 
             <fieldset id="image_as_link">
-                <legend><span>{$CONST.IMAGE_AS_A_LINK}</span></legend>
+                <span class="wrap_legend"><legend>{$CONST.IMAGE_AS_A_LINK}</legend></span>
 
                 <div class="clearfix">
                     <div class="form_radio">
diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index 3052e2a8..8f614f0b 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -36,7 +36,7 @@
                     <div class="{cycle values="left,center,right"}">
                     {if $so_val.type == 'date' || $so_val.type == 'intrange'}
                         <fieldset>
-                            <legend><span>{$CONST.SORT_BY} ({$so_key})</span></legend>
+                            <span class="wrap_legend"><legend>{$CONST.SORT_BY} ({$so_key})</legend></span>
                     {else}
                         <div class="form_{if $so_val.type == 'authors'}select{else}field{/if}">
                             <label for="serendipity_filter_{$so_key}">{$so_val.desc}</label>
diff --git a/templates/2k11/admin/plugin_config_item.tpl b/templates/2k11/admin/plugin_config_item.tpl
index 7a78bf22..16820341 100644
--- a/templates/2k11/admin/plugin_config_item.tpl
+++ b/templates/2k11/admin/plugin_config_item.tpl
@@ -15,7 +15,7 @@
     </div>
 {elseif $ctype == 'radio'}
     <fieldset>
-        <legend><span>{$cname}{if $cdesc != ''} <button class="toggle_info button_link" type="button" data-href="#{$config_item}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></button>{/if}</span></legend>
+        <span class="wrap_legend"><legend>{$cname}{if $cdesc != ''} <button class="toggle_info button_link" type="button" data-href="#{$config_item}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></button>{/if}</legend></span>
         <div class="clearfix grouped">
         {foreach $radio_button AS $r}
             <div class="form_radio">
@@ -64,7 +64,7 @@
     </div>
 {elseif $ctype == 'sequence'}
     <fieldset>
-        <legend><span>{$cname}{if $cdesc != ''} <button class="toggle_info button_link" type="button" data-href="#{$config_item}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></button>{/if}</span></legend>
+        <span class="wrap_legend"><legend>{$cname}{if $cdesc != ''} <button class="toggle_info button_link" type="button" data-href="#{$config_item}_info"><span class="icon-info-circled"></span><span class="visuallyhidden"> More</span></button>{/if}</legend></span>
         <input id="{$config_item}_value" name="serendipity[{$postKey}][{$config_item}]" type="hidden" value="{$value}">
 
         <noscript>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 72e19843..77551bb2 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -444,7 +444,7 @@ form > button,
 .block_level,
 .form_multiselect label,
 label > span,
-legend > span > span,
+.wrap_legend > legend > span,
 .msg_error,
 .msg_success,
 .msg_notice,
@@ -847,13 +847,13 @@ optgroup {
 /* BACKEND FORM STYLES
    ----------------------------------------------------------------- */
 label,
-legend > span,
+.wrap_legend,
 figcaption {
     font-weight: bold;
 }
 
 label > span,
-legend > span > span,
+.wrap_legend > legend > span,
 input[type=checkbox] + label,
 input[type=radio] + label,
 .form_check label {
@@ -861,13 +861,16 @@ input[type=radio] + label,
 }
 
 input[type=checkbox],
-#toggle_extended,
 #toggle_metadata,
 #toggle_advanced,
 #category_icon {
     margin-right: .4em;
 }
 
+#toggle_extended {
+    margin-right: .65em;
+}
+
 .form_radio {
     float: left;
     margin-right: 1em;