diff --git src/bp-groups/js/blocks/group.js src/bp-groups/js/blocks/group.js
index c10b7e6bd..b92f36f28 100644
--- src/bp-groups/js/blocks/group.js
+++ src/bp-groups/js/blocks/group.js
@@ -191,7 +191,7 @@ var editGroup = function editGroup(_ref) {
       });
     }
   }))), createElement(InspectorControls, null, createElement(PanelBody, {
-    title: __('Group\'s home button settings', 'buddypress'),
+    title: __('Settings', 'buddypress'),
     initialOpen: true
   }, createElement(ToggleControl, {
     label: __('Display Group\'s home button', 'buddypress'),
@@ -202,10 +202,7 @@ var editGroup = function editGroup(_ref) {
       });
     },
     help: displayActionButton ? __('Include a link to the group\'s home page under their name.', 'buddypress') : __('Toggle to display a link to the group\'s home page under their name.', 'buddypress')
-  })), createElement(PanelBody, {
-    title: __('Description settings', 'buddypress'),
-    initialOpen: false
-  }, createElement(ToggleControl, {
+  }), createElement(ToggleControl, {
     label: __('Display group\'s description', 'buddypress'),
     checked: !!displayDescription,
     onChange: function onChange() {
@@ -214,22 +211,17 @@ var editGroup = function editGroup(_ref) {
       });
     },
     help: displayDescription ? __('Include the group\'s description under their name.', 'buddypress') : __('Toggle to display the group\'s description under their name.', 'buddypress')
-  })), isAvatarEnabled && createElement(PanelBody, {
-    title: __('Avatar settings', 'buddypress'),
-    initialOpen: false
-  }, createElement(SelectControl, {
-    label: __('Size', 'buddypress'),
+  }), isAvatarEnabled && createElement(SelectControl, {
+    label: __('Avatar size', 'buddypress'),
     value: avatarSize,
     options: AVATAR_SIZES,
+    help: __('Select "None" to disable the avatar.', 'buddypress'),
     onChange: function onChange(option) {
       setAttributes({
         avatarSize: option
       });
     }
-  })), isCoverImageEnabled && createElement(PanelBody, {
-    title: __('Cover image settings', 'buddypress'),
-    initialOpen: false
-  }, createElement(ToggleControl, {
+  }), isCoverImageEnabled && createElement(ToggleControl, {
     label: __('Display Cover Image', 'buddypress'),
     checked: !!displayCoverImage,
     onChange: function onChange() {
diff --git src/bp-members/js/blocks/member.js src/bp-members/js/blocks/member.js
index 4e7f56941..3f78b0dc5 100644
--- src/bp-members/js/blocks/member.js
+++ src/bp-members/js/blocks/member.js
@@ -191,7 +191,7 @@ var editMember = function editMember(_ref) {
       });
     }
   }))), createElement(InspectorControls, null, createElement(PanelBody, {
-    title: __('Profile button settings', 'buddypress'),
+    title: __('Settings', 'buddypress'),
     initialOpen: true
   }, createElement(ToggleControl, {
     label: __('Display Profile button', 'buddypress'),
@@ -202,22 +202,17 @@ var editMember = function editMember(_ref) {
       });
     },
     help: displayActionButton ? __('Include a link to the user\'s profile page under their display name.', 'buddypress') : __('Toggle to display a link to the user\'s profile page under their display name.', 'buddypress')
-  })), isAvatarEnabled && createElement(PanelBody, {
-    title: __('Avatar settings', 'buddypress'),
-    initialOpen: false
-  }, createElement(SelectControl, {
-    label: __('Size', 'buddypress'),
+  }), isAvatarEnabled && createElement(SelectControl, {
+    label: __('Avatar size', 'buddypress'),
     value: avatarSize,
     options: AVATAR_SIZES,
+    help: __('Select "None" to disable the avatar.', 'buddypress'),
     onChange: function onChange(option) {
       setAttributes({
         avatarSize: option
       });
     }
-  })), isCoverImageEnabled && createElement(PanelBody, {
-    title: __('Cover image settings', 'buddypress'),
-    initialOpen: false
-  }, createElement(ToggleControl, {
+  }), isCoverImageEnabled && createElement(ToggleControl, {
     label: __('Display Cover Image', 'buddypress'),
     checked: !!displayCoverImage,
     onChange: function onChange() {
@@ -226,10 +221,7 @@ var editMember = function editMember(_ref) {
       });
     },
     help: displayCoverImage ? __('Include the user\'s cover image over their display name.', 'buddypress') : __('Toggle to display the user\'s cover image over their display name.', 'buddypress')
-  })), isMentionEnabled && createElement(PanelBody, {
-    title: __('Mention settings', 'buddypress'),
-    initialOpen: false
-  }, createElement(ToggleControl, {
+  }), isMentionEnabled && createElement(ToggleControl, {
     label: __('Display Mention slug', 'buddypress'),
     checked: !!displayMentionSlug,
     onChange: function onChange() {
diff --git src/js/bp-groups/js/blocks/group.js src/js/bp-groups/js/blocks/group.js
index 6a1c4c869..2d95f05a6 100644
--- src/js/bp-groups/js/blocks/group.js
+++ src/js/bp-groups/js/blocks/group.js
@@ -67,7 +67,7 @@ const editGroup = ( { attributes, setAttributes, bpSettings } ) => {
 				</Toolbar>
 			</BlockControls>
 			<InspectorControls>
-				<PanelBody title={ __( 'Group\'s home button settings', 'buddypress' ) } initialOpen={ true }>
+				<PanelBody title={ __( 'Settings', 'buddypress' ) } initialOpen={ true }>
 					<ToggleControl
 						label={ __( 'Display Group\'s home button', 'buddypress' ) }
 						checked={ !! displayActionButton }
@@ -80,8 +80,7 @@ const editGroup = ( { attributes, setAttributes, bpSettings } ) => {
 								: __( 'Toggle to display a link to the group\'s home page under their name.', 'buddypress' )
 						}
 					/>
-				</PanelBody>
-				<PanelBody title={ __( 'Description settings', 'buddypress' ) } initialOpen={ false }>
+
 					<ToggleControl
 						label={ __( 'Display group\'s description', 'buddypress' ) }
 						checked={ !! displayDescription }
@@ -94,21 +93,20 @@ const editGroup = ( { attributes, setAttributes, bpSettings } ) => {
 								: __( 'Toggle to display the group\'s description under their name.', 'buddypress' )
 						}
 					/>
-				</PanelBody>
-				{ isAvatarEnabled && (
-					<PanelBody title={ __( 'Avatar settings', 'buddypress' ) } initialOpen={ false }>
+
+					{ isAvatarEnabled && (
 						<SelectControl
-							label={ __( 'Size', 'buddypress' ) }
+							label={ __( 'Avatar size', 'buddypress' ) }
 							value={ avatarSize }
 							options={ AVATAR_SIZES }
+							help={ __( 'Select "None" to disable the avatar.', 'buddypress' ) }
 							onChange={ ( option ) => {
 								setAttributes( { avatarSize: option } );
 							} }
 						/>
-					</PanelBody>
-				) }
-				{ isCoverImageEnabled && (
-					<PanelBody title={ __( 'Cover image settings', 'buddypress' ) } initialOpen={ false }>
+					) }
+
+					{ isCoverImageEnabled && (
 						<ToggleControl
 							label={ __( 'Display Cover Image', 'buddypress' ) }
 							checked={ !! displayCoverImage }
@@ -121,8 +119,8 @@ const editGroup = ( { attributes, setAttributes, bpSettings } ) => {
 									: __( 'Toggle to display the group\'s cover image over their name.', 'buddypress' )
 							}
 						/>
-					</PanelBody>
-				) }
+					) }
+				</PanelBody>
 			</InspectorControls>
 			<Disabled>
 				<ServerSideRender block="bp/group" attributes={ attributes } />
diff --git src/js/bp-members/js/blocks/member.js src/js/bp-members/js/blocks/member.js
index 1d0e650ec..58ba9cb02 100644
--- src/js/bp-members/js/blocks/member.js
+++ src/js/bp-members/js/blocks/member.js
@@ -66,7 +66,7 @@ const editMember = ( { attributes, setAttributes, bpSettings } ) => {
 				</Toolbar>
 			</BlockControls>
 			<InspectorControls>
-				<PanelBody title={ __( 'Profile button settings', 'buddypress' ) } initialOpen={ true }>
+				<PanelBody title={ __( 'Settings', 'buddypress' ) } initialOpen={ true }>
 					<ToggleControl
 						label={ __( 'Display Profile button', 'buddypress' ) }
 						checked={ !! displayActionButton }
@@ -79,21 +79,20 @@ const editMember = ( { attributes, setAttributes, bpSettings } ) => {
 								: __( 'Toggle to display a link to the user\'s profile page under their display name.', 'buddypress' )
 						}
 					/>
-				</PanelBody>
-				{ isAvatarEnabled && (
-					<PanelBody title={ __( 'Avatar settings', 'buddypress' ) } initialOpen={ false }>
+
+					{ isAvatarEnabled && (
 						<SelectControl
-							label={ __( 'Size', 'buddypress' ) }
+							label={ __( 'Avatar size', 'buddypress' ) }
 							value={ avatarSize }
 							options={ AVATAR_SIZES }
+							help={ __( 'Select "None" to disable the avatar.', 'buddypress' ) }
 							onChange={ ( option ) => {
 								setAttributes( { avatarSize: option } );
 							} }
 						/>
-					</PanelBody>
-				) }
-				{ isCoverImageEnabled && (
-					<PanelBody title={ __( 'Cover image settings', 'buddypress' ) } initialOpen={ false }>
+					) }
+
+					{ isCoverImageEnabled && (
 						<ToggleControl
 							label={ __( 'Display Cover Image', 'buddypress' ) }
 							checked={ !! displayCoverImage }
@@ -106,10 +105,9 @@ const editMember = ( { attributes, setAttributes, bpSettings } ) => {
 									: __( 'Toggle to display the user\'s cover image over their display name.', 'buddypress' )
 							}
 						/>
-					</PanelBody>
-				) }
-				{ isMentionEnabled && (
-					<PanelBody title={ __( 'Mention settings', 'buddypress' ) } initialOpen={ false }>
+					) }
+
+					{ isMentionEnabled && (
 						<ToggleControl
 							label={ __( 'Display Mention slug', 'buddypress' ) }
 							checked={ !! displayMentionSlug }
@@ -122,8 +120,8 @@ const editMember = ( { attributes, setAttributes, bpSettings } ) => {
 									: __( 'Toggle to display the user\'s mention name under their display name.', 'buddypress' )
 							}
 						/>
-					</PanelBody>
-				) }
+					) }
+				</PanelBody>
 			</InspectorControls>
 			<Disabled>
 				<ServerSideRender block="bp/member" attributes={ attributes } />