3 files changed, 17 insertions, 20 deletions
diff --git a/modules/system/system-behavior-rtl.css b/modules/system/system-behavior-rtl.css
index 7238a341c..9951071f2 100644
--- a/modules/system/system-behavior-rtl.css
+++ b/modules/system/system-behavior-rtl.css
@@ -14,12 +14,12 @@ html.js input.throbbing {
 /**
  * Collapsing fieldsets
  */
-html.js fieldset.collapsible legend a {
+html.js fieldset.collapsible .fieldset-legend {
   padding-left: 0;
   padding-right: 15px;
   background-position: 98% 75%;
 }
-html.js fieldset.collapsed legend a {
+html.js fieldset.collapsed .fieldset-legend {
   background-image: url(../../misc/menu-collapsed-rtl.png);
   background-position: 98% 50%;
 }
diff --git a/modules/system/system-behavior.css b/modules/system/system-behavior.css
index 7850a56b8..0ff2f875b 100644
--- a/modules/system/system-behavior.css
+++ b/modules/system/system-behavior.css
@@ -46,35 +46,28 @@ html.js fieldset.collapsed {
   margin-bottom: 0;
   height: 1em;
 }
-html.js fieldset.collapsed * {
+html.js fieldset.collapsed .fieldset-wrapper {
   display: none;
 }
-html.js fieldset.collapsed legend, html.js fieldset.collapsed legend a span.element-invisible {
+html.js fieldset.collapsible .fieldset-legend {
   display: block;
-  overflow: hidden;
-}
-html.js fieldset.collapsible legend a {
-  display: inline;
   padding-left: 15px; /* LTR */
   background: url(../../misc/menu-expanded.png) 5px 75% no-repeat; /* LTR */
 }
+html.js fieldset.collapsed .fieldset-legend {
+  background-image: url(../../misc/menu-collapsed.png); /* LTR */
+  background-position: 5px 50%; /* LTR */
+}
 html.js fieldset.collapsible legend span.summary {
-  display: inline;
   font-size: 0.9em;
   color: #999;
   margin-left: 0.5em;
 }
-html.js fieldset.collapsed legend a {
-  background-image: url(../../misc/menu-collapsed.png); /* LTR */
-  background-position: 5px 50%; /* LTR */
-}
-/* Note: IE-only fix due to '* html' (breaks Konqueror otherwise). */
-* html.js fieldset.collapsed legend,
-* html.js fieldset.collapsed legend *,
+/* IE6: Fix due to '* html' (breaks Konqueror otherwise). */
 * html.js fieldset.collapsed table * {
   display: inline;
 }
-/* For Safari 2 to prevent collapsible fieldsets containing tables from dissapearing due to tableheader.js. */
+/* Safari 2: Tables in collapsible fieldsets disappear due to tableheader.js. */
 html.js fieldset.collapsible {
   position: relative;
 }
@@ -267,9 +260,14 @@ div.password-confirm {
 /**
  * Inline items (need to override above)
  */
-.container-inline div, .container-inline label {
+.container-inline div,
+.container-inline label {
   display: inline;
 }
+/* Fieldset contents always need to be rendered as block. */
+.container-inline .fieldset-wrapper {
+  display: block;
+}
 
 .nowrap {
   white-space: nowrap;
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 5e7fa8a2e..41ac3a4a0 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -2900,8 +2900,7 @@ function system_actions_manage_form($form, &$form_state, $options = array()) {
   $form['parent'] = array(
     '#type' => 'fieldset',
     '#title' => t('Create an advanced action'),
-    '#prefix' => '<div class="container-inline">',
-    '#suffix' => '</div>',
+    '#attributes' => array('class' => array('container-inline')),
   );
   $form['parent']['action'] = array(
     '#type' => 'select',