diff --git a/core/includes/form.inc b/core/includes/form.inc
index ce5779c..8af8ec2 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -964,14 +964,10 @@ function theme_fieldset($variables) {
     $output .= '<legend' . new Attribute($legend_attributes) . '><span class="fieldset-legend">' . $element['#title'] . '</span></legend>';
   }
   $output .= '<div class="fieldset-wrapper">';
+  $output .= $element['#children'];
   if (!empty($element['#description'])) {
-    $attributes = array('class' => 'fieldset-description', 'id' => $description_id);
+    $attributes = array('class' => 'description', 'id' => $description_id);
     $output .= '<div' . new Attribute($attributes) . '>' . $element['#description'] . '</div>';
-
-  }
-  $output .= $element['#children'];
-  if (isset($element['#value'])) {
-    $output .= $element['#value'];
   }
   $output .= '</div>';
   $output .= "</fieldset>\n";
@@ -1256,7 +1252,11 @@ function form_pre_render_conditional_form_element($element) {
   }
 
   if (isset($element['#title']) || isset($element['#description'])) {
-    $element['#theme_wrappers'][] = 'form_element';
+    // @see #type 'fieldgroup'
+    $element['#theme_wrappers'][] = 'fieldset';
+    $element['#attributes']['class'][] = 'fieldgroup';
+    // @todo Duplicated into an additional inner/straw DIV container.
+    $element['#attributes']['class'][] = 'form-composite';
   }
   return $element;
 }
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index f205034..dd03d49 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -55,6 +55,7 @@ tr.even .form-item {
   margin-bottom: 0;
   white-space: nowrap;
 }
+.form-composite > .fieldset-wrapper > .description,
 .form-item .description {
   font-size: 0.85em;
 }
@@ -62,6 +63,7 @@ label.option {
   display: inline;
   font-weight: normal;
 }
+.form-composite > legend,
 h4.label {
   font-size: inherit;
   font-weight: bold;