diff --git a/include/admin/tpl/category.inc.tpl b/include/admin/tpl/category.inc.tpl
index a150c7dd..7d4e03ed 100644
--- a/include/admin/tpl/category.inc.tpl
+++ b/include/admin/tpl/category.inc.tpl
@@ -75,24 +75,6 @@
             </div>
 
             <div class="clearfix">
-                <div class="form_field">
-                    <label for="category_icon">{$CONST.IMAGE}</label>
-                    {* TODO: this should probably become/fallback to input[type=file] *}
-                    <input id="category_icon" name="serendipity[cat][icon]" type="text" value="{$this_cat.category_icon|default:""|escape:"html"}" onchange="document.getElementById('imagepreview').src = this.value; document.getElementById('imagepreview').style.display = '';">
-                    <script>
-                        var category_icon = document.getElementById('category_icon');
-                        var imgBtn        = document.createElement('div');
-                        imgBtn.id         = "insert_image";
-                        imgBtn.innerHTML  = '<input type="button" name="insImage" value="{$CONST.IMAGE}" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[htmltarget]=category_icon&amp;serendipity[filename_only]=true\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');">';
-                        category_icon.parentNode.insertBefore(imgBtn, category_icon.nextSibling);
-                    </script>
-                    <!-- noscript>FIXXME: Emit a warning if JS is disabled</noscript -->
-                    <figure id="preview" class="standalone">
-                        <figcaption>{$CONST.PREVIEW}</figcaption>
-                        <img id="imagepreview" src="{$this_cat.category_icon|default:""|escape:"html"}" alt="">
-                    </figure>
-                </div>
-
                 <div class="form_multiselect">
                     <label for="read_authors">{$CONST.PERM_READ}</label>
                     <select id="read_authors" size="6" multiple name="serendipity[cat][read_authors][]">
@@ -114,10 +96,29 @@
                 </div>
             </div>
 
-            <fieldset>
-                <legend><span>{$CONST.CATEGORY_HIDE_SUB}</span></legend>
+            <div class="clearfix">
+                <div class="form_field">
+                    <label for="category_icon">{$CONST.IMAGE}</label>
+                    {* TODO: this should probably become/fallback to input[type=file] *}
+                    <input id="category_icon" name="serendipity[cat][icon]" type="text" value="{$this_cat.category_icon|default:""|escape:"html"}" onchange="document.getElementById('imagepreview').src = this.value; document.getElementById('imagepreview').style.display = '';">
+                    <script>
+                        var category_icon = document.getElementById('category_icon');
+                        var imgBtn        = document.createElement('div');
+                        imgBtn.id         = "insert_image";
+                        imgBtn.innerHTML  = '<input type="button" name="insImage" value="{$CONST.IMAGE}" onclick="window.open(\'serendipity_admin_image_selector.php?serendipity[htmltarget]=category_icon&amp;serendipity[filename_only]=true\', \'ImageSel\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\');">';
+                        category_icon.parentNode.insertBefore(imgBtn, category_icon.nextSibling);
+                    </script>
+                    <!-- noscript>FIXXME: Emit a warning if JS is disabled</noscript -->
+                </div>
 
-                <span class="block_level">{$CONST.CATEGORY_HIDE_SUB_DESC}</span>
+                <figure id="preview">
+                    <figcaption>{$CONST.PREVIEW}</figcaption>
+                    <img id="imagepreview" src="{$this_cat.category_icon|default:""|escape:"html"}" alt="">
+                </figure>
+            </div>
+
+            <fieldset class="clearfix">
+                <legend><span>{$CONST.CATEGORY_HIDE_SUB} <span>{$CONST.CATEGORY_HIDE_SUB_DESC}</span></span></legend>
 
                 <div class="clearfix">
                     <div class="form_radio">
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 956f2fbe..51b72b93 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -821,6 +821,7 @@ input[type=checkbox] { margin-right: .4em; }
 
 .serendipity_commentDirection,
 .configuration_group fieldset>fieldset,
+#preview,
 .form_field,
 .form_area,
 .form_check,
@@ -1187,6 +1188,8 @@ form>.button_link:first-of-type { margin-top: 0; }
 
 #serendipity_admin_groups li ul div { margin-left: 1.5em; }
 
+.category_info { margin-left: 2.5em; }
+
 #template_select article,
 .media_file,
 .plugins_installable>li {
@@ -1436,7 +1439,9 @@ form>.button_link:first-of-type { margin-top: 0; }
     #uploadform .form_select select,
     #uploadform .form_field input,
     #serendipity_plugin_config fieldset legend,
-    #serendipity_plugin_config fieldset>.clearfix {
+    #serendipity_plugin_config fieldset>.clearfix,
+    #serendipity_category fieldset legend,
+    #serendipity_category fieldset>.clearfix {
         float: left;
         margin-right: 2%;
         width: 48%;
@@ -1541,6 +1546,12 @@ form>.button_link:first-of-type { margin-top: 0; }
         width: 33% ;
     }
 
+    #preview {
+        float: left;
+        margin-bottom: 2.25em;
+        width: 66%;
+    }
+
     #filter_entries .form_select,
     #filter_entries .form_field {
         float: left;