Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin.php	(revision 10536)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin.php	(working copy)
@@ -97,50 +97,58 @@
 
 	<?php endif; ?>
 
-	<h4><?php _e( 'Privacy Options', 'buddypress' ); ?></h4>
+	<div aria-labelledby="group-privacy-options" role="group">
 
-	<div class="radio">
+		<h2 id="group-privacy-options"><?php _e( 'Privacy Options', 'buddypress' ); ?></h2>
 
-		<label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'buddypress' ); ?></label>
+		<div class="radio">
 
-		<ul id="public-group-description">
-			<li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li>
-			<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
-			<li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
-		</ul>
+			<label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'buddypress' ); ?></label>
 
-		<label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'buddypress' ); ?></label>
+			<ul id="public-group-description">
+				<li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li>
+				<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
+				<li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
+			</ul>
 
-		<ul id="private-group-description">
-			<li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
-			<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
-			<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
-		</ul>
+			<label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'buddypress' ); ?></label>
 
-		<label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e('This is a hidden group', 'buddypress' ); ?></label>
+			<ul id="private-group-description">
+				<li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
+				<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
+				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
+			</ul>
 
-		<ul id="hidden-group-description">
-			<li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
-			<li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
-			<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
-		</ul>
+			<label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e('This is a hidden group', 'buddypress' ); ?></label>
 
+			<ul id="hidden-group-description">
+				<li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
+				<li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
+				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
+			</ul>
+
+		</div>
+
 	</div>
 
 	<hr />
 
-	<h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4>
+	<div aria-labelledby="group-group-invitations" role="group">
 
-	<p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
+		<h2 id="group-group-invitations"><?php _e( 'Group Invitations', 'buddypress' ); ?></h2>
 
-	<div class="radio">
+		<p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
 
-		<label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php _e( 'All group members', 'buddypress' ); ?></label>
+		<div class="radio">
 
-		<label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php _e( 'Group admins and mods only', 'buddypress' ); ?></label>
+			<label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php _e( 'All group members', 'buddypress' ); ?></label>
 
-		<label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php _e( 'Group admins only', 'buddypress' ); ?></label>
+			<label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php _e( 'Group admins and mods only', 'buddypress' ); ?></label>
 
+			<label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php _e( 'Group admins only', 'buddypress' ); ?></label>
+
+		</div>
+
 	</div>
 
 	<hr />
Index: src/bp-templates/bp-legacy/css/twentyfifteen-rtl.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentyfifteen-rtl.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentyfifteen-rtl.css	(working copy)
@@ -1000,6 +1000,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentyfifteen.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentyfifteen.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentyfifteen.css	(working copy)
@@ -1000,6 +1000,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentyfifteen.scss
===================================================================
--- src/bp-templates/bp-legacy/css/twentyfifteen.scss	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentyfifteen.scss	(working copy)
@@ -1273,6 +1273,7 @@
 // headings settings screens & general global settings styles
 .groups {
 	#group-settings-form {
+		h2,
 		h4 {
 			background: $dark-background;
 			color: $content-background;
Index: src/bp-templates/bp-legacy/css/twentysixteen-rtl.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentysixteen-rtl.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentysixteen-rtl.css	(working copy)
@@ -1060,6 +1060,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentysixteen.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentysixteen.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentysixteen.css	(working copy)
@@ -1060,6 +1060,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentysixteen.scss
===================================================================
--- src/bp-templates/bp-legacy/css/twentysixteen.scss	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentysixteen.scss	(working copy)
@@ -1466,6 +1466,7 @@
 // headings settings screens & general global settings styles
 .groups {
 	#group-settings-form {
+		h2,
 		h4 {
 			background: $dark-background;
 			color: $content-background;
Index: src/bp-templates/bp-legacy/css/twentythirteen-rtl.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentythirteen-rtl.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentythirteen-rtl.css	(working copy)
@@ -1089,6 +1089,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentythirteen.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentythirteen.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentythirteen.css	(working copy)
@@ -1089,6 +1089,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentythirteen.scss
===================================================================
--- src/bp-templates/bp-legacy/css/twentythirteen.scss	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentythirteen.scss	(working copy)
@@ -1715,6 +1715,7 @@
 
 		.profile {
 			.bp-widget {
+				h2,
 				h4 {
 					background: lighten($dark-background, 10%);
 					color: #fff;
Index: src/bp-templates/bp-legacy/css/twentytwelve-rtl.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentytwelve-rtl.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentytwelve-rtl.css	(working copy)
@@ -1079,6 +1079,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentytwelve.css
===================================================================
--- src/bp-templates/bp-legacy/css/twentytwelve.css	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentytwelve.css	(working copy)
@@ -1079,6 +1079,7 @@
 * @subsection 6.2.1.1 - Group Management
 *-----------------------------------------
 */
+.groups #group-settings-form h2,
 .groups #group-settings-form h4 {
 	background: #555;
 	color: #fff;
Index: src/bp-templates/bp-legacy/css/twentytwelve.scss
===================================================================
--- src/bp-templates/bp-legacy/css/twentytwelve.scss	(revision 10536)
+++ src/bp-templates/bp-legacy/css/twentytwelve.scss	(working copy)
@@ -1494,6 +1494,7 @@
 // headings settings screens & general global settings styles
 .groups {
 	#group-settings-form {
+		h2,
 		h4 {
 			background: $dark-background;
 			color: $content-background;