diff --git a/core/includes/form.inc b/core/includes/form.inc
index b2edc2a..d555be6 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -951,6 +951,8 @@ function theme_fieldset($variables) {
   element_set_attributes($element, array('id'));
   _form_set_attributes($element, array('form-wrapper'));
 
+  $element['#attributes']['class'][] = 'form-item';
+
   if (!empty($element['#description'])) {
     $description_id = $element['#attributes']['id'] . '--description';
     $element['#attributes']['aria-describedby'] = $description_id;
@@ -1279,7 +1281,6 @@ function form_pre_render_conditional_form_element($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/themes/seven/seven.base.css b/core/themes/seven/seven.base.css
index b72bbce..59f4d5e 100644
--- a/core/themes/seven/seven.base.css
+++ b/core/themes/seven/seven.base.css
@@ -23,7 +23,7 @@ hr {
   background: #cccccc;
 }
 summary,
-legend {
+.fieldgroup:not(.form-composite) > legend {
   font-weight: bold;
   text-transform: uppercase;
 }