diff --git a/packages/block-editor/src/components/alignment-toolbar/index.js b/packages/block-editor/src/components/alignment-toolbar/index.js
index 8eed48b364e480..18e9f4002b681c 100644
--- a/packages/block-editor/src/components/alignment-toolbar/index.js
+++ b/packages/block-editor/src/components/alignment-toolbar/index.js
@@ -38,7 +38,8 @@ export function AlignmentToolbar( props ) {
 		value,
 		onChange,
 		alignmentControls = DEFAULT_ALIGNMENT_CONTROLS,
-		label = __( 'Change text alignment' ),
+		label = __( 'Align' ),
+		describedBy = __( 'Change text alignment' ),
 		isCollapsed = true,
 	} = props;
 
@@ -61,6 +62,7 @@ export function AlignmentToolbar( props ) {
 			isCollapsed={ isCollapsed }
 			icon={ setIcon() }
 			label={ label }
+			toggleProps={ { describedBy } }
 			popoverProps={ POPOVER_PROPS }
 			controls={ alignmentControls.map( ( control ) => {
 				const { align } = control;
diff --git a/packages/block-editor/src/components/alignment-toolbar/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/alignment-toolbar/test/__snapshots__/index.js.snap
index f995c767f95428..c6699db92e4961 100644
--- a/packages/block-editor/src/components/alignment-toolbar/test/__snapshots__/index.js.snap
+++ b/packages/block-editor/src/components/alignment-toolbar/test/__snapshots__/index.js.snap
@@ -47,13 +47,18 @@ exports[`AlignmentToolbar should allow custom alignment controls to be specified
     </SVG>
   }
   isCollapsed={true}
-  label="Change text alignment"
+  label="Align"
   popoverProps={
     Object {
       "isAlternate": true,
       "position": "bottom right",
     }
   }
+  toggleProps={
+    Object {
+      "describedBy": "Change text alignment",
+    }
+  }
 />
 `;
 
@@ -119,12 +124,17 @@ exports[`AlignmentToolbar should match snapshot 1`] = `
     </SVG>
   }
   isCollapsed={true}
-  label="Change text alignment"
+  label="Align"
   popoverProps={
     Object {
       "isAlternate": true,
       "position": "bottom right",
     }
   }
+  toggleProps={
+    Object {
+      "describedBy": "Change text alignment",
+    }
+  }
 />
 `;
diff --git a/packages/block-editor/src/components/block-alignment-toolbar/index.js b/packages/block-editor/src/components/block-alignment-toolbar/index.js
index 769e96d4542198..e14edfac6f47e0 100644
--- a/packages/block-editor/src/components/block-alignment-toolbar/index.js
+++ b/packages/block-editor/src/components/block-alignment-toolbar/index.js
@@ -96,7 +96,8 @@ export function BlockAlignmentToolbar( {
 					? activeAlignmentControl.icon
 					: defaultAlignmentControl.icon
 			}
-			label={ __( 'Change alignment' ) }
+			label={ __( 'Align' ) }
+			toggleProps={ { describedBy: __( 'Change alignment' ) } }
 			controls={ enabledControls.map( ( control ) => {
 				return {
 					...BLOCK_ALIGNMENTS_CONTROLS[ control ],
diff --git a/packages/block-editor/src/components/block-alignment-toolbar/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/block-alignment-toolbar/test/__snapshots__/index.js.snap
index 564a49e4dd238d..5910fc1b29e976 100644
--- a/packages/block-editor/src/components/block-alignment-toolbar/test/__snapshots__/index.js.snap
+++ b/packages/block-editor/src/components/block-alignment-toolbar/test/__snapshots__/index.js.snap
@@ -59,11 +59,16 @@ exports[`BlockAlignmentToolbar should match snapshot 1`] = `
     </SVG>
   }
   isCollapsed={true}
-  label="Change alignment"
+  label="Align"
   popoverProps={
     Object {
       "isAlternate": true,
     }
   }
+  toggleProps={
+    Object {
+      "describedBy": "Change alignment",
+    }
+  }
 />
 `;
diff --git a/packages/block-editor/src/components/block-mover/index.js b/packages/block-editor/src/components/block-mover/index.js
index 7ba38ce5f039a9..d727e56b65eb56 100644
--- a/packages/block-editor/src/components/block-mover/index.js
+++ b/packages/block-editor/src/components/block-mover/index.js
@@ -40,8 +40,7 @@ function BlockMover( {
 		return null;
 	}
 
-	const dragHandleLabel =
-		clientIds.length === 1 ? __( 'Drag block' ) : __( 'Drag blocks' );
+	const dragHandleLabel = __( 'Drag' );
 
 	// We emulate a disabled state because forcefully applying the `disabled`
 	// attribute on the buttons while it has focus causes the screen to change
diff --git a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
index acb7bfcf39d318..7a9c54f4cd234a 100644
--- a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
+++ b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
@@ -95,7 +95,7 @@ export function BlockSettingsDropdown( {
 			} ) => (
 				<DropdownMenu
 					icon={ moreVertical }
-					label={ __( 'More options' ) }
+					label={ __( 'Options' ) }
 					className="block-editor-block-settings-menu"
 					popoverProps={ POPOVER_PROPS }
 					noIcons
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
index cc34d56aa6aa78..2c23f973e9853b 100644
--- a/packages/block-editor/src/components/block-switcher/index.js
+++ b/packages/block-editor/src/components/block-switcher/index.js
@@ -29,7 +29,12 @@ import BlockStylesMenu from './block-styles-menu';
 export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 	const { replaceBlocks } = useDispatch( blockEditorStore );
 	const blockInformation = useBlockDisplayInformation( blocks[ 0 ].clientId );
-	const { possibleBlockTransformations, hasBlockStyles, icon } = useSelect(
+	const {
+		possibleBlockTransformations,
+		hasBlockStyles,
+		icon,
+		blockTitle,
+	} = useSelect(
 		( select ) => {
 			const { getBlockRootClientId, getBlockTransformItems } = select(
 				blockEditorStore
@@ -61,10 +66,12 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 				),
 				hasBlockStyles: !! styles?.length,
 				icon: _icon,
+				blockTitle: getBlockType( firstBlockName ).title,
 			};
 		},
 		[ clientIds, blocks, blockInformation?.icon ]
 	);
+
 	const onTransform = ( name ) =>
 		replaceBlocks( clientIds, switchToBlockType( blocks, name ) );
 	const hasPossibleBlockTransformations = !! possibleBlockTransformations.length;
@@ -74,13 +81,16 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 				<ToolbarButton
 					disabled
 					className="block-editor-block-switcher__no-switcher-icon"
-					title={ __( 'Block icon' ) }
+					title={ blockTitle }
 					icon={ <BlockIcon icon={ icon } showColors /> }
 				/>
 			</ToolbarGroup>
 		);
 	}
-	const blockSwitcherLabel =
+
+	const blockSwitcherLabel = blockTitle;
+
+	const blockSwitcherDescription =
 		1 === blocks.length
 			? __( 'Change block type or style' )
 			: sprintf(
@@ -112,7 +122,10 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 								showColors
 							/>
 						}
-						toggleProps={ toggleProps }
+						toggleProps={ {
+							describedBy: blockSwitcherDescription,
+							...toggleProps,
+						} }
 						menuProps={ { orientation: 'both' } }
 					>
 						{ ( { onClose } ) =>
diff --git a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap
index a8ec2981e622b6..b66f639d65af91 100644
--- a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap
+++ b/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap
@@ -20,7 +20,6 @@ exports[`BlockSwitcherDropdownMenu should render disabled block switcher with mu
         showColors={true}
       />
     }
-    title="Block icon"
   />
 </ToolbarGroup>
 `;
diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index c9499b4731dfd0..432a7374f612bb 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -106,3 +106,100 @@
 		transform: translateY(-($block-toolbar-height + $grid-unit-15));
 	}
 }
+
+.show-icon-labels {
+	.block-editor-block-toolbar {
+		.components-button.has-icon {
+			width: auto;
+
+			// Hide the button icons when labels are set to display...
+			svg {
+				display: none;
+			}
+			// ... and display labels.
+			&::after {
+				content: attr(aria-label);
+				font-size: $helptext-font-size;
+			}
+		}
+	}
+
+	// Padding overrides.
+
+	.components-accessible-toolbar .components-toolbar-group > div:first-child:last-child > .components-button.has-icon {
+		padding-left: 6px;
+		padding-right: 6px;
+	}
+
+	// Switcher overrides.
+	.block-editor-block-switcher {
+		border-right: 1px solid $gray-900;
+
+		.components-dropdown-menu__toggle {
+			margin-left: 0;
+		}
+	}
+
+	.block-editor-block-switcher .components-dropdown-menu__toggle,
+	.block-editor-block-switcher__no-switcher-icon {
+		.block-editor-block-icon {
+			width: 0 !important;
+			height: 0 !important;
+		}
+
+		&:focus::before {
+			right: $grid-unit-05 !important;
+		}
+	}
+
+	// Parent selector overrides
+
+	.block-editor-block-parent-selector__button {
+		.block-editor-block-icon {
+			width: 0;
+		}
+	}
+
+	// Mover overrides.
+	.block-editor-block-toolbar__block-controls .block-editor-block-mover {
+		margin-left: 0;
+		white-space: nowrap;
+	}
+
+	.block-editor-block-mover-button {
+		// The specificity can be reduced once https://github.com/WordPress/gutenberg/blob/try/block-toolbar-labels/packages/block-editor/src/components/block-mover/style.scss#L34 is also dealt with.
+		padding-left: $grid-unit !important;
+		padding-right: $grid-unit !important;
+	}
+
+	.block-editor-block-mover__drag-handle.has-icon {
+		padding-left: 6px !important;
+		padding-right: 6px !important;
+		border-right: 1px solid $gray-900;
+	}
+
+	@include break-small() {
+		// Specificity override for https://github.com/WordPress/gutenberg/blob/try/block-toolbar-labels/packages/block-editor/src/components/block-mover/style.scss#L69
+		.is-up-button.is-up-button.is-up-button {
+			border-bottom: 1px solid $gray-900;
+			margin-right: 0;
+			border-radius: 0;
+		}
+	}
+
+	.block-editor-block-contextual-toolbar .block-editor-block-mover.is-horizontal .block-editor-block-mover-button.block-editor-block-mover-button {
+		width: auto;
+	}
+
+	// Mobile adjustments
+	.components-toolbar,
+	.components-toolbar-group {
+		flex-shrink: 1;
+	}
+
+	.block-editor-format-toolbar {
+		.components-button + .components-button {
+			margin-left: 6px;
+		}
+	}
+}
diff --git a/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap b/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap
index 789949e13e9c09..1328665a03eb5d 100644
--- a/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap
+++ b/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap
@@ -51,6 +51,7 @@ exports[`ColorPaletteControl matches the snapshot 1`] = `
             className="components-circular-option-picker__option-wrapper"
           >
             <button
+              aria-describedby={null}
               aria-label="Color: red"
               aria-pressed={true}
               className="components-button components-circular-option-picker__option is-pressed"
@@ -91,6 +92,7 @@ exports[`ColorPaletteControl matches the snapshot 1`] = `
             className="components-dropdown components-circular-option-picker__dropdown-link-action"
           >
             <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="true"
               aria-label="Custom color picker"
@@ -102,6 +104,7 @@ exports[`ColorPaletteControl matches the snapshot 1`] = `
             </button>
           </div>
           <button
+            aria-describedby={null}
             className="components-button components-circular-option-picker__clear is-secondary is-small"
             onClick={[Function]}
             type="button"
diff --git a/packages/block-editor/src/components/rich-text/format-toolbar-container.js b/packages/block-editor/src/components/rich-text/format-toolbar-container.js
index 1380a29d7dbaee..0d8c88f0761b86 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar-container.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar-container.js
@@ -19,6 +19,7 @@ const FormatToolbarContainer = ( { inline, anchorRef } ) => {
 				focusOnMount={ false }
 				anchorRef={ anchorRef }
 				className="block-editor-rich-text__inline-format-toolbar"
+				__unstableSlotName="block-toolbar"
 			>
 				<FormatToolbar />
 			</Popover>
diff --git a/packages/block-editor/src/components/rich-text/format-toolbar/index.js b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
index 4e98ce8d064ba4..b2cf95204da841 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar/index.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
@@ -41,9 +41,8 @@ const FormatToolbar = () => {
 								{ ( toggleProps ) => (
 									<DropdownMenu
 										icon={ chevronDown }
-										label={ __(
-											'More rich text controls'
-										) }
+										/* translators: button label text should, if possible, be under 16 characters. */
+										label={ __( 'More' ) }
 										toggleProps={ toggleProps }
 										controls={ orderBy(
 											fills.map(
diff --git a/packages/block-editor/src/components/rich-text/format-toolbar/style.scss b/packages/block-editor/src/components/rich-text/format-toolbar/style.scss
index 986c2452169392..3a6e433ebb44ad 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar/style.scss
+++ b/packages/block-editor/src/components/rich-text/format-toolbar/style.scss
@@ -3,3 +3,20 @@
 		justify-content: center;
 	}
 }
+
+.show-icon-labels {
+	.block-editor-format-toolbar {
+		.components-button.has-icon {
+			width: auto;
+
+			// Hide the button icons when labels are set to display...
+			svg {
+				display: none;
+			}
+			// ... and display labels.
+			&::after {
+				content: attr(aria-label);
+			}
+		}
+	}
+}
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index b653e39e3dfb50..afb5d562e33eba 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -91,7 +91,8 @@ export default function ListEdit( {
 							icon: isRTL()
 								? formatListBulletsRTL
 								: formatListBullets,
-							title: __( 'Convert to unordered list' ),
+							title: __( 'Unordered' ),
+							describedBy: __( 'Convert to unordered list' ),
 							isActive: isActiveListType( value, 'ul', tagName ),
 							onClick() {
 								onChange(
@@ -108,7 +109,8 @@ export default function ListEdit( {
 							icon: isRTL()
 								? formatListNumberedRTL
 								: formatListNumbered,
-							title: __( 'Convert to ordered list' ),
+							title: __( 'Ordered' ),
+							describedBy: __( 'Convert to ordered list' ),
 							isActive: isActiveListType( value, 'ol', tagName ),
 							onClick() {
 								onChange(
@@ -123,7 +125,8 @@ export default function ListEdit( {
 						},
 						{
 							icon: isRTL() ? formatOutdentRTL : formatOutdent,
-							title: __( 'Outdent list item' ),
+							title: __( 'Outdent' ),
+							describedBy: __( 'Outdent list item' ),
 							shortcut: _x( 'Backspace', 'keyboard key' ),
 							isDisabled: ! canOutdentListItems( value ),
 							onClick() {
@@ -133,7 +136,8 @@ export default function ListEdit( {
 						},
 						{
 							icon: isRTL() ? formatIndentRTL : formatIndent,
-							title: __( 'Indent list item' ),
+							title: __( 'Indent' ),
+							describedBy: __( 'Indent list item' ),
 							shortcut: _x( 'Space', 'keyboard key' ),
 							isDisabled: ! canIndentListItems( value ),
 							onClick() {
diff --git a/packages/components/src/button/index.js b/packages/components/src/button/index.js
index 698c52e453b8a8..869f4279a99487 100644
--- a/packages/components/src/button/index.js
+++ b/packages/components/src/button/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import { isArray } from 'lodash';
+import { isArray, uniqueId } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -15,6 +15,7 @@ import { forwardRef } from '@wordpress/element';
  */
 import Tooltip from '../tooltip';
 import Icon from '../icon';
+import VisuallyHidden from '../visually-hidden';
 
 const disabledEventsOnDisabledButton = [ 'onMouseDown', 'onClick' ];
 
@@ -43,6 +44,7 @@ export function Button( props, ref ) {
 		children,
 		text,
 		__experimentalIsFocusable: isFocusable,
+		describedBy,
 		...additionalProps
 	} = props;
 
@@ -104,12 +106,18 @@ export function Button( props, ref ) {
 				// the tooltip is not explicitly disabled.
 				false !== showTooltip ) );
 
+	const descriptionId = describedBy ? uniqueId() : null;
+
+	const describedById =
+		additionalProps[ 'aria-describedby' ] || descriptionId;
+
 	const element = (
 		<Tag
 			{ ...tagProps }
 			{ ...additionalProps }
 			className={ classes }
 			aria-label={ additionalProps[ 'aria-label' ] || label }
+			aria-describedby={ describedById }
 			ref={ ref }
 		>
 			{ icon && iconPosition === 'left' && (
@@ -124,17 +132,33 @@ export function Button( props, ref ) {
 	);
 
 	if ( ! shouldShowTooltip ) {
-		return element;
+		return (
+			<>
+				{ element }
+				{ describedBy && (
+					<VisuallyHidden>
+						<span id={ descriptionId }>{ describedBy }</span>
+					</VisuallyHidden>
+				) }
+			</>
+		);
 	}
 
 	return (
-		<Tooltip
-			text={ label }
-			shortcut={ shortcut }
-			position={ tooltipPosition }
-		>
-			{ element }
-		</Tooltip>
+		<>
+			<Tooltip
+				text={ describedBy ? describedBy : label }
+				shortcut={ shortcut }
+				position={ tooltipPosition }
+			>
+				{ element }
+			</Tooltip>
+			{ describedBy && (
+				<VisuallyHidden>
+					<span id={ descriptionId }>{ describedBy }</span>
+				</VisuallyHidden>
+			) }
+		</>
 	);
 }
 
diff --git a/packages/components/src/button/test/index.js b/packages/components/src/button/test/index.js
index 49de9ef1d59ad2..de027bbe41fed8 100644
--- a/packages/components/src/button/test/index.js
+++ b/packages/components/src/button/test/index.js
@@ -3,7 +3,6 @@
  */
 import { shallow } from 'enzyme';
 import TestUtils from 'react-dom/test-utils';
-
 /**
  * WordPress dependencies
  */
@@ -18,7 +17,7 @@ import ButtonWithForwardedRef, { Button } from '../';
 describe( 'Button', () => {
 	describe( 'basic rendering', () => {
 		it( 'should render a button element with only one class', () => {
-			const button = shallow( <Button /> );
+			const button = shallow( <Button /> ).find( 'button' );
 			expect( button.hasClass( 'components-button' ) ).toBe( true );
 			expect( button.hasClass( 'is-large' ) ).toBe( false );
 			expect( button.hasClass( 'is-primary' ) ).toBe( false );
@@ -30,13 +29,15 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should render a button element with is-primary class', () => {
-			const button = shallow( <Button isPrimary /> );
+			const button = shallow( <Button isPrimary /> ).find( 'button' );
 			expect( button.hasClass( 'is-large' ) ).toBe( false );
 			expect( button.hasClass( 'is-primary' ) ).toBe( true );
 		} );
 
 		it( 'should render a button element with is-small class', () => {
-			const button = shallow( <Button isSecondary isSmall /> );
+			const button = shallow( <Button isSecondary isSmall /> ).find(
+				'button'
+			);
 			expect( button.hasClass( 'is-secondary' ) ).toBe( true );
 			expect( button.hasClass( 'is-large' ) ).toBe( false );
 			expect( button.hasClass( 'is-small' ) ).toBe( true );
@@ -44,48 +45,58 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should render a button element with is-pressed without button class', () => {
-			const button = shallow( <Button isPressed /> );
+			const button = shallow( <Button isPressed /> ).find( 'button' );
 			expect( button.hasClass( 'is-pressed' ) ).toBe( true );
 		} );
 
 		it( 'should add a disabled prop to the button', () => {
-			const button = shallow( <Button disabled /> );
+			const button = shallow( <Button disabled /> ).find( 'button' );
 			expect( button.prop( 'disabled' ) ).toBe( true );
 		} );
 
 		it( 'should add only aria-disabled attribute when disabled and isFocusable are true', () => {
 			const button = shallow(
 				<Button disabled __experimentalIsFocusable />
-			);
+			).find( 'button' );
 			expect( button.prop( 'disabled' ) ).toBe( false );
 			expect( button.prop( 'aria-disabled' ) ).toBe( true );
 		} );
 
 		it( 'should not poss the prop target into the element', () => {
-			const button = shallow( <Button target="_blank" /> );
+			const button = shallow( <Button target="_blank" /> ).find(
+				'button'
+			);
 			expect( button.prop( 'target' ) ).toBeUndefined();
 		} );
 
 		it( 'should render with an additional className', () => {
-			const button = shallow( <Button className="gutenberg" /> );
+			const button = shallow( <Button className="gutenberg" /> ).find(
+				'button'
+			);
 
 			expect( button.hasClass( 'gutenberg' ) ).toBe( true );
 		} );
 
 		it( 'should render and additional WordPress prop of value awesome', () => {
-			const button = shallow( <Button WordPress="awesome" /> );
+			const button = shallow( <Button WordPress="awesome" /> ).find(
+				'button'
+			);
 
 			expect( button.prop( 'WordPress' ) ).toBe( 'awesome' );
 		} );
 
 		it( 'should render an icon button', () => {
-			const iconButton = shallow( <Button icon={ plusCircle } /> );
+			const iconButton = shallow( <Button icon={ plusCircle } /> ).find(
+				'button'
+			);
 			expect( iconButton.hasClass( 'has-icon' ) ).toBe( true );
 			expect( iconButton.prop( 'aria-label' ) ).toBeUndefined();
 		} );
 
 		it( 'should render a Dashicon component matching the wordpress icon', () => {
-			const iconButton = shallow( <Button icon={ plusCircle } /> );
+			const iconButton = shallow( <Button icon={ plusCircle } /> ).find(
+				'button'
+			);
 			expect( iconButton.find( 'Icon' ).dive() ).not.toBeNull();
 		} );
 
@@ -95,7 +106,7 @@ describe( 'Button', () => {
 					icon={ plusCircle }
 					children={ <p className="test">Test</p> }
 				/>
-			);
+			).find( 'button' );
 			expect( iconButton.find( 'Icon' ).dive() ).not.toBeNull();
 			expect( iconButton.find( '.test' ).shallow().text() ).toBe(
 				'Test'
@@ -105,7 +116,7 @@ describe( 'Button', () => {
 		it( 'should add an aria-label when the label property is used, with Tooltip wrapper', () => {
 			const iconButton = shallow(
 				<Button icon={ plusCircle } label="WordPress" />
-			);
+			).find( 'Tooltip' );
 			expect( iconButton.name() ).toBe( 'Tooltip' );
 			expect( iconButton.prop( 'text' ) ).toBe( 'WordPress' );
 			expect( iconButton.find( 'button' ).prop( 'aria-label' ) ).toBe(
@@ -114,10 +125,34 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should support explicit aria-label override', () => {
-			const iconButton = shallow( <Button aria-label="Custom" /> );
+			const iconButton = shallow( <Button aria-label="Custom" /> ).find(
+				'button'
+			);
 			expect( iconButton.prop( 'aria-label' ) ).toBe( 'Custom' );
 		} );
 
+		it( 'should support adding aria-describedby text', () => {
+			const buttonDescription = shallow(
+				<Button describedBy="Description text" />
+			)
+				.find( 'VisuallyHidden' )
+				.shallow()
+				.text();
+			expect( buttonDescription ).toBe( 'Description text' );
+		} );
+
+		it( 'should populate tooltip with describedBy content', () => {
+			const buttonTooltip = shallow(
+				<Button
+					describedBy="Description text"
+					label="Label"
+					icon={ plusCircle }
+				/>
+			).find( 'Tooltip' );
+
+			expect( buttonTooltip.prop( 'text' ) ).toBe( 'Description text' );
+		} );
+
 		it( 'should allow tooltip disable', () => {
 			const iconButton = shallow(
 				<Button
@@ -125,7 +160,7 @@ describe( 'Button', () => {
 					label="WordPress"
 					showTooltip={ false }
 				/>
-			);
+			).find( 'button' );
 			expect( iconButton.name() ).toBe( 'button' );
 			expect( iconButton.prop( 'aria-label' ) ).toBe( 'WordPress' );
 		} );
@@ -133,7 +168,7 @@ describe( 'Button', () => {
 		it( 'should show the tooltip for empty children', () => {
 			const iconButton = shallow(
 				<Button icon={ plusCircle } label="WordPress" children={ [] } />
-			);
+			).find( 'Tooltip' );
 			expect( iconButton.name() ).toBe( 'Tooltip' );
 			expect( iconButton.prop( 'text' ) ).toBe( 'WordPress' );
 		} );
@@ -143,7 +178,7 @@ describe( 'Button', () => {
 				<Button icon={ plusCircle } label="WordPress">
 					Children
 				</Button>
-			);
+			).find( 'button' );
 			expect( iconButton.name() ).toBe( 'button' );
 		} );
 
@@ -152,14 +187,16 @@ describe( 'Button', () => {
 				<Button icon={ plusCircle } label="WordPress" showTooltip>
 					Children
 				</Button>
-			);
+			).find( 'Tooltip' );
 			expect( iconButton.name() ).toBe( 'Tooltip' );
 		} );
 	} );
 
 	describe( 'with href property', () => {
 		it( 'should render a link instead of a button with href prop', () => {
-			const button = shallow( <Button href="https://wordpress.org/" /> );
+			const button = shallow(
+				<Button href="https://wordpress.org/" />
+			).find( 'a' );
 
 			expect( button.type() ).toBe( 'a' );
 			expect( button.prop( 'href' ) ).toBe( 'https://wordpress.org/' );
@@ -168,7 +205,7 @@ describe( 'Button', () => {
 		it( 'should allow for the passing of the target prop when a link is created', () => {
 			const button = shallow(
 				<Button href="https://wordpress.org/" target="_blank" />
-			);
+			).find( 'a' );
 
 			expect( button.prop( 'target' ) ).toBe( '_blank' );
 		} );
@@ -176,7 +213,7 @@ describe( 'Button', () => {
 		it( 'should become a button again when disabled is supplied', () => {
 			const button = shallow(
 				<Button href="https://wordpress.org/" disabled />
-			);
+			).find( 'button' );
 
 			expect( button.type() ).toBe( 'button' );
 		} );
diff --git a/packages/components/src/color-palette/test/__snapshots__/index.js.snap b/packages/components/src/color-palette/test/__snapshots__/index.js.snap
index 93e90b9b95908f..1db3cdb27938f3 100644
--- a/packages/components/src/color-palette/test/__snapshots__/index.js.snap
+++ b/packages/components/src/color-palette/test/__snapshots__/index.js.snap
@@ -87,16 +87,19 @@ exports[`ColorPalette Dropdown .renderContent should render dropdown content 1`]
 `;
 
 exports[`ColorPalette Dropdown .renderToggle should render dropdown content 1`] = `
-<button
-  aria-expanded={true}
-  aria-haspopup="true"
-  aria-label="Custom color picker"
-  className="components-button is-link"
-  onClick={[MockFunction]}
-  type="button"
->
-  Custom color
-</button>
+<Fragment>
+  <button
+    aria-describedby={null}
+    aria-expanded={true}
+    aria-haspopup="true"
+    aria-label="Custom color picker"
+    className="components-button is-link"
+    onClick={[MockFunction]}
+    type="button"
+  >
+    Custom color
+  </button>
+</Fragment>
 `;
 
 exports[`ColorPalette Dropdown should render it correctly 1`] = `
@@ -117,6 +120,7 @@ exports[`ColorPalette Dropdown should render it correctly 1`] = `
       onClick={[Function]}
     >
       <button
+        aria-describedby={null}
         aria-expanded={false}
         aria-haspopup="true"
         aria-label="Custom color picker"
@@ -333,6 +337,7 @@ exports[`ColorPalette should render a dynamic toolbar of colors 1`] = `
                 }
               >
                 <button
+                  aria-describedby={null}
                   aria-label="Color: red"
                   aria-pressed={true}
                   className="components-button components-circular-option-picker__option is-pressed"
@@ -432,6 +437,7 @@ exports[`ColorPalette should render a dynamic toolbar of colors 1`] = `
                 }
               >
                 <button
+                  aria-describedby={null}
                   aria-label="Color: white"
                   aria-pressed={false}
                   className="components-button components-circular-option-picker__option"
@@ -491,6 +497,7 @@ exports[`ColorPalette should render a dynamic toolbar of colors 1`] = `
                 }
               >
                 <button
+                  aria-describedby={null}
                   aria-label="Color: blue"
                   aria-pressed={false}
                   className="components-button components-circular-option-picker__option"
@@ -547,6 +554,7 @@ exports[`ColorPalette should render a dynamic toolbar of colors 1`] = `
                 onClick={[Function]}
               >
                 <button
+                  aria-describedby={null}
                   aria-expanded={false}
                   aria-haspopup="true"
                   aria-label="Custom color picker"
@@ -570,6 +578,7 @@ exports[`ColorPalette should render a dynamic toolbar of colors 1`] = `
             onClick={[Function]}
           >
             <button
+              aria-describedby={null}
               className="components-button components-circular-option-picker__clear is-secondary is-small"
               onClick={[Function]}
               type="button"
diff --git a/packages/components/src/color-palette/test/index.js b/packages/components/src/color-palette/test/index.js
index 22d28ed762b4f7..7cc0a05e41f9be 100644
--- a/packages/components/src/color-palette/test/index.js
+++ b/packages/components/src/color-palette/test/index.js
@@ -101,7 +101,7 @@ describe( 'ColorPalette', () => {
 			} );
 
 			test( 'should call onToggle on click.', () => {
-				renderedToggleButton.simulate( 'click' );
+				renderedToggleButton.find( 'button' ).simulate( 'click' );
 
 				expect( onToggle ).toHaveBeenCalledTimes( 1 );
 			} );
diff --git a/packages/components/src/color-picker/test/__snapshots__/index.js.snap b/packages/components/src/color-picker/test/__snapshots__/index.js.snap
index 4fdc373fe966bd..e523f743a0ddda 100644
--- a/packages/components/src/color-picker/test/__snapshots__/index.js.snap
+++ b/packages/components/src/color-picker/test/__snapshots__/index.js.snap
@@ -162,6 +162,7 @@ exports[`ColorPicker should commit changes to all views on blur 1`] = `
         className="components-color-picker__inputs-toggle-wrapper"
       >
         <button
+          aria-describedby={null}
           aria-label="Change color format"
           className="components-button components-color-picker__inputs-toggle has-icon"
           onBlur={[Function]}
@@ -354,6 +355,7 @@ exports[`ColorPicker should commit changes to all views on keyDown = DOWN 1`] =
         className="components-color-picker__inputs-toggle-wrapper"
       >
         <button
+          aria-describedby={null}
           aria-label="Change color format"
           className="components-button components-color-picker__inputs-toggle has-icon"
           onBlur={[Function]}
@@ -546,6 +548,7 @@ exports[`ColorPicker should commit changes to all views on keyDown = ENTER 1`] =
         className="components-color-picker__inputs-toggle-wrapper"
       >
         <button
+          aria-describedby={null}
           aria-label="Change color format"
           className="components-button components-color-picker__inputs-toggle has-icon"
           onBlur={[Function]}
@@ -738,6 +741,7 @@ exports[`ColorPicker should commit changes to all views on keyDown = UP 1`] = `
         className="components-color-picker__inputs-toggle-wrapper"
       >
         <button
+          aria-describedby={null}
           aria-label="Change color format"
           className="components-button components-color-picker__inputs-toggle has-icon"
           onBlur={[Function]}
@@ -930,6 +934,7 @@ exports[`ColorPicker should only update input view for draft changes 1`] = `
         className="components-color-picker__inputs-toggle-wrapper"
       >
         <button
+          aria-describedby={null}
           aria-label="Change color format"
           className="components-button components-color-picker__inputs-toggle has-icon"
           onBlur={[Function]}
@@ -1122,6 +1127,7 @@ exports[`ColorPicker should render color picker 1`] = `
         className="components-color-picker__inputs-toggle-wrapper"
       >
         <button
+          aria-describedby={null}
           aria-label="Change color format"
           className="components-button components-color-picker__inputs-toggle has-icon"
           onBlur={[Function]}
diff --git a/packages/components/src/toolbar-group/toolbar-group-collapsed.js b/packages/components/src/toolbar-group/toolbar-group-collapsed.js
index 05b30b17fc251d..e78caa97113474 100644
--- a/packages/components/src/toolbar-group/toolbar-group-collapsed.js
+++ b/packages/components/src/toolbar-group/toolbar-group-collapsed.js
@@ -10,15 +10,16 @@ import DropdownMenu from '../dropdown-menu';
 import ToolbarContext from '../toolbar-context';
 import ToolbarItem from '../toolbar-item';
 
-function ToolbarGroupCollapsed( { controls = [], ...props } ) {
+function ToolbarGroupCollapsed( { controls = [], toggleProps, ...props } ) {
 	// It'll contain state if `ToolbarGroup` is being used within
 	// `<Toolbar label="label" />`
 	const accessibleToolbarState = useContext( ToolbarContext );
 
-	const renderDropdownMenu = ( toggleProps ) => (
+	const renderDropdownMenu = ( internalToggleProps ) => (
 		<DropdownMenu
 			controls={ controls }
 			toggleProps={ {
+				...internalToggleProps,
 				...toggleProps,
 				'data-toolbar-item': true,
 			} }
diff --git a/packages/components/src/toolbar/stories/index.js b/packages/components/src/toolbar/stories/index.js
index ae07d52535c9c4..298cd97a8674ab 100644
--- a/packages/components/src/toolbar/stories/index.js
+++ b/packages/components/src/toolbar/stories/index.js
@@ -51,7 +51,7 @@ export const _default = () => {
 						<DropdownMenu
 							hasArrowIndicator
 							icon={ alignLeft }
-							label="Change text alignment"
+							label="Align"
 							controls={ [
 								{
 									icon: alignLeft,
@@ -93,7 +93,7 @@ export const _default = () => {
 			</ToolbarGroup>
 			<ToolbarGroup
 				icon={ more }
-				label="Change text alignment"
+				label="Align"
 				isCollapsed
 				controls={ [
 					{
diff --git a/packages/e2e-tests/specs/editor/blocks/list.test.js b/packages/e2e-tests/specs/editor/blocks/list.test.js
index bba09376edfa69..57d9fc40e7a3fe 100644
--- a/packages/e2e-tests/specs/editor/blocks/list.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/list.test.js
@@ -194,7 +194,7 @@ describe( 'List', () => {
 		await insertBlock( 'List' );
 		await page.keyboard.type( 'one' );
 		await page.keyboard.press( 'Enter' );
-		await clickBlockToolbarButton( 'Indent list item' );
+		await clickBlockToolbarButton( 'Indent' );
 		await page.keyboard.type( 'two' );
 		await transformBlockTo( 'Paragraph' );
 
@@ -276,7 +276,7 @@ describe( 'List', () => {
 		await insertBlock( 'List' );
 		await page.keyboard.type( 'one' );
 		await page.keyboard.press( 'Enter' );
-		await clickBlockToolbarButton( 'Indent list item' );
+		await clickBlockToolbarButton( 'Indent' );
 		await page.keyboard.type( 'two' );
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.type( 'three' );
@@ -296,7 +296,7 @@ describe( 'List', () => {
 	it( 'should change the base list type', async () => {
 		await insertBlock( 'List' );
 		const button = await page.waitForSelector(
-			'button[aria-label="Convert to ordered list"]'
+			'button[aria-label="Ordered"]'
 		);
 		await button.click();
 
@@ -310,7 +310,7 @@ describe( 'List', () => {
 		await pressKeyWithModifier( 'primary', 'm' );
 		await page.keyboard.type( '1' );
 
-		await clickBlockToolbarButton( 'Convert to ordered list' );
+		await clickBlockToolbarButton( 'Ordered' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
diff --git a/packages/e2e-tests/specs/editor/blocks/preformatted.test.js b/packages/e2e-tests/specs/editor/blocks/preformatted.test.js
index 83e6e3383b6cf3..7d0fb6abf08918 100644
--- a/packages/e2e-tests/specs/editor/blocks/preformatted.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/preformatted.test.js
@@ -22,12 +22,12 @@ describe( 'Preformatted', () => {
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Convert to Blocks' );
 		// Once it's edited, it should be saved as BR tags.
 		await page.keyboard.type( '0' );
 		await page.keyboard.press( 'Enter' );
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Edit as HTML' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
diff --git a/packages/e2e-tests/specs/editor/plugins/align-hook.test.js b/packages/e2e-tests/specs/editor/plugins/align-hook.test.js
index 6b0c41ae9115d3..59b10cca428100 100644
--- a/packages/e2e-tests/specs/editor/plugins/align-hook.test.js
+++ b/packages/e2e-tests/specs/editor/plugins/align-hook.test.js
@@ -35,7 +35,7 @@ describe( 'Align Hook Works As Expected', () => {
 	} );
 
 	const getAlignmentToolbarLabels = async () => {
-		await clickBlockToolbarButton( 'Change alignment' );
+		await clickBlockToolbarButton( 'Align' );
 		const buttonLabels = await page.evaluate( () => {
 			return Array.from(
 				document.querySelectorAll(
@@ -58,7 +58,7 @@ describe( 'Align Hook Works As Expected', () => {
 	const createDoesNotApplyAlignmentByDefaultTest = ( blockName ) => {
 		it( 'Does not apply any alignment by default', async () => {
 			await insertBlock( blockName );
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			const pressedButtons = await page.$$(
 				'.components-dropdown-menu__menu button.is-active'
 			);
@@ -83,11 +83,11 @@ describe( 'Align Hook Works As Expected', () => {
 				'.components-dropdown-menu__menu button.is-active';
 			// set the specified alignment.
 			await insertBlock( blockName );
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			await ( await page.$x( BUTTON_XPATH ) )[ 0 ].click();
 
 			// verify the button of the specified alignment is pressed.
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			let pressedButtons = await page.$$( BUTTON_PRESSED_SELECTOR );
 			expect( pressedButtons ).toHaveLength( 1 );
 
@@ -104,11 +104,11 @@ describe( 'Align Hook Works As Expected', () => {
 			);
 
 			// remove the alignment.
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			await ( await page.$x( BUTTON_XPATH ) )[ 0 ].click();
 
 			// verify no alignment button is in pressed state.
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			pressedButtons = await page.$$( BUTTON_PRESSED_SELECTOR );
 			expect( pressedButtons ).toHaveLength( 0 );
 
@@ -124,7 +124,7 @@ describe( 'Align Hook Works As Expected', () => {
 			);
 
 			// verify no alignment button is in pressed state after parsing the block.
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			pressedButtons = await page.$$( BUTTON_PRESSED_SELECTOR );
 			expect( pressedButtons ).toHaveLength( 0 );
 		} );
@@ -135,7 +135,7 @@ describe( 'Align Hook Works As Expected', () => {
 		it( 'Shows no alignment buttons on the alignment toolbar', async () => {
 			await insertBlock( BLOCK_NAME );
 			const CHANGE_ALIGNMENT_BUTTON_SELECTOR =
-				'.block-editor-block-toolbar .components-dropdown-menu__toggle[aria-label="Change alignment"]';
+				'.block-editor-block-toolbar .components-dropdown-menu__toggle[aria-label="Align"]';
 			const changeAlignmentButton = await page.$(
 				CHANGE_ALIGNMENT_BUTTON_SELECTOR
 			);
@@ -192,7 +192,7 @@ describe( 'Align Hook Works As Expected', () => {
 		it( 'Applies the selected alignment by default', async () => {
 			await insertBlock( BLOCK_NAME );
 			// verify the correct alignment button is pressed
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			const selectedAlignmentControls = await page.$x(
 				SELECTED_ALIGNMENT_CONTROL_SELECTOR
 			);
@@ -209,7 +209,7 @@ describe( 'Align Hook Works As Expected', () => {
 		it( 'Can remove the default alignment and the align attribute equals none but alignnone class is not applied', async () => {
 			await insertBlock( BLOCK_NAME );
 			// remove the alignment.
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			const [ selectedAlignmentControl ] = await page.$x(
 				SELECTED_ALIGNMENT_CONTROL_SELECTOR
 			);
diff --git a/packages/e2e-tests/specs/editor/plugins/annotations.test.js b/packages/e2e-tests/specs/editor/plugins/annotations.test.js
index 14cfbcaa1e7c41..31a3a738930159 100644
--- a/packages/e2e-tests/specs/editor/plugins/annotations.test.js
+++ b/packages/e2e-tests/specs/editor/plugins/annotations.test.js
@@ -11,7 +11,7 @@ import {
 } from '@wordpress/e2e-test-utils';
 
 const clickOnBlockSettingsMenuItem = async ( buttonLabel ) => {
-	await clickBlockToolbarButton( 'More options' );
+	await clickBlockToolbarButton( 'Options' );
 	await clickMenuItem( buttonLabel );
 };
 
diff --git a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
index 1eefa0a69ebbf4..a9b0181d4e47fc 100644
--- a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
+++ b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
@@ -39,7 +39,7 @@ describe( 'cpt locking', () => {
 			'.block-editor-rich-text__editable[data-type="core/paragraph"]',
 			'p1'
 		);
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		expect(
 			await page.$x( '//button/span[contains(text(), "Remove block")]' )
 		).toHaveLength( 0 );
@@ -171,7 +171,7 @@ describe( 'cpt locking', () => {
 				'.block-editor-rich-text__editable[data-type="core/paragraph"]',
 				'p1'
 			);
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			await clickMenuItem( 'Remove block' );
 			expect( await getEditedPostContent() ).toMatchSnapshot();
 		} );
@@ -191,7 +191,7 @@ describe( 'cpt locking', () => {
 				'.block-editor-rich-text__editable[data-type="core/paragraph"]',
 				'p1'
 			);
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			await clickMenuItem( 'Remove block' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
diff --git a/packages/e2e-tests/specs/editor/plugins/format-api.test.js b/packages/e2e-tests/specs/editor/plugins/format-api.test.js
index f04fc8834c7cda..e168cc6927bbf1 100644
--- a/packages/e2e-tests/specs/editor/plugins/format-api.test.js
+++ b/packages/e2e-tests/specs/editor/plugins/format-api.test.js
@@ -29,7 +29,7 @@ describe( 'Using Format API', () => {
 		await clickBlockAppender();
 		await page.keyboard.type( 'First paragraph' );
 		await pressKeyWithModifier( 'shiftAlt', 'ArrowLeft' );
-		await clickBlockToolbarButton( 'More rich text controls' );
+		await clickBlockToolbarButton( 'More' );
 		await clickButton( 'Custom Link' );
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
diff --git a/packages/e2e-tests/specs/editor/various/adding-inline-tokens.test.js b/packages/e2e-tests/specs/editor/various/adding-inline-tokens.test.js
index 6c1017c6d53589..bb9e7980dbc9a7 100644
--- a/packages/e2e-tests/specs/editor/various/adding-inline-tokens.test.js
+++ b/packages/e2e-tests/specs/editor/various/adding-inline-tokens.test.js
@@ -27,7 +27,7 @@ describe( 'adding inline tokens', () => {
 		await clickBlockAppender();
 		await page.keyboard.type( 'a ' );
 
-		await clickBlockToolbarButton( 'More rich text controls' );
+		await clickBlockToolbarButton( 'More' );
 		await clickButton( 'Inline image' );
 
 		// Wait for media modal to appear and upload image.
diff --git a/packages/e2e-tests/specs/editor/various/block-deletion.test.js b/packages/e2e-tests/specs/editor/various/block-deletion.test.js
index 80d9d3a11e19bd..00e239eae69593 100644
--- a/packages/e2e-tests/specs/editor/various/block-deletion.test.js
+++ b/packages/e2e-tests/specs/editor/various/block-deletion.test.js
@@ -31,7 +31,7 @@ const addThreeParagraphsToNewPost = async () => {
  * see: https://github.com/WordPress/gutenberg/pull/14908#discussion_r284725956
  */
 const clickOnBlockSettingsMenuRemoveBlockButton = async () => {
-	await clickBlockToolbarButton( 'More options' );
+	await clickBlockToolbarButton( 'Options' );
 
 	let isRemoveButton = false;
 
diff --git a/packages/e2e-tests/specs/editor/various/block-grouping.test.js b/packages/e2e-tests/specs/editor/various/block-grouping.test.js
index 016d62d6cc68bb..b75718fbc24d75 100644
--- a/packages/e2e-tests/specs/editor/various/block-grouping.test.js
+++ b/packages/e2e-tests/specs/editor/various/block-grouping.test.js
@@ -77,7 +77,7 @@ describe( 'Block Grouping', () => {
 			await pressKeyWithModifier( 'primary', 'a' );
 			await pressKeyWithModifier( 'primary', 'a' );
 
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			await clickMenuItem( 'Group' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
@@ -90,13 +90,13 @@ describe( 'Block Grouping', () => {
 			await pressKeyWithModifier( 'primary', 'a' );
 
 			// Group
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			await clickMenuItem( 'Group' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
 
 			// UnGroup
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			await clickMenuItem( 'Ungroup' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
@@ -104,7 +104,7 @@ describe( 'Block Grouping', () => {
 
 		it( 'does not allow ungrouping a group block that has no children', async () => {
 			await insertBlock( 'Group' );
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			const ungroupButtons = await page.$x(
 				'//button/span[text()="Ungroup"]'
 			);
@@ -141,7 +141,7 @@ describe( 'Block Grouping', () => {
 		} );
 
 		it( 'does not show group option in the options toolbar if Grouping block is disabled', async () => {
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 
 			const blockOptionsDropdownHTML = await page.evaluate(
 				() =>
@@ -161,7 +161,7 @@ describe( 'Block Grouping', () => {
 
 			// Full width image.
 			await insertBlock( 'Image' );
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			const fullButton = await page.waitForXPath(
 				`//button[contains(@class,'components-dropdown-menu__menu-item') and contains(text(), 'Full width')]`
 			);
@@ -172,7 +172,7 @@ describe( 'Block Grouping', () => {
 
 			// Wide width image.
 			await insertBlock( 'Image' );
-			await clickBlockToolbarButton( 'Change alignment' );
+			await clickBlockToolbarButton( 'Align' );
 			const wideButton = await page.waitForXPath(
 				`//button[contains(@class,'components-dropdown-menu__menu-item') and contains(text(), 'Wide width')]`
 			);
@@ -226,7 +226,7 @@ describe( 'Block Grouping', () => {
 			// Group - this will use whichever Block is registered as the Grouping Block
 			// as opposed to "transformTo()" which uses whatever is passed to it. To
 			// ensure this test is meaningful we must rely on what is registered.
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			await clickMenuItem( 'Group' );
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
diff --git a/packages/e2e-tests/specs/editor/various/duplicating-blocks.test.js b/packages/e2e-tests/specs/editor/various/duplicating-blocks.test.js
index 11c95026a88282..587751c414574d 100644
--- a/packages/e2e-tests/specs/editor/various/duplicating-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/various/duplicating-blocks.test.js
@@ -24,7 +24,7 @@ describe( 'Duplicating blocks', () => {
 		// When the selection was not collapsed
 		await pressKeyWithModifier( 'primary', 'a' );
 
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Duplicate' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
diff --git a/packages/e2e-tests/specs/editor/various/editor-modes.test.js b/packages/e2e-tests/specs/editor/various/editor-modes.test.js
index 48056ccde42763..01d6137ae89055 100644
--- a/packages/e2e-tests/specs/editor/various/editor-modes.test.js
+++ b/packages/e2e-tests/specs/editor/various/editor-modes.test.js
@@ -32,7 +32,7 @@ describe( 'Editing modes (visual/HTML)', () => {
 		expect( visualBlock ).toHaveLength( 1 );
 
 		// Change editing mode from "Visual" to "HTML".
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Edit as HTML' );
 
 		// Wait for the block to be converted to HTML editing mode.
@@ -42,7 +42,7 @@ describe( 'Editing modes (visual/HTML)', () => {
 		expect( htmlBlock ).toHaveLength( 1 );
 
 		// Change editing mode from "HTML" back to "Visual".
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Edit visually' );
 
 		// This block should be in "visual" mode by default.
@@ -54,7 +54,7 @@ describe( 'Editing modes (visual/HTML)', () => {
 
 	it( 'should display sidebar in HTML mode', async () => {
 		// Change editing mode from "Visual" to "HTML".
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Edit as HTML' );
 
 		// The font size picker for the paragraph block should appear, even in
@@ -67,7 +67,7 @@ describe( 'Editing modes (visual/HTML)', () => {
 
 	it( 'should update HTML in HTML mode when sidebar is used', async () => {
 		// Change editing mode from "Visual" to "HTML".
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Edit as HTML' );
 
 		// Make sure the paragraph content is rendered as expected.
diff --git a/packages/e2e-tests/specs/editor/various/invalid-block.test.js b/packages/e2e-tests/specs/editor/various/invalid-block.test.js
index 3313e819d752c0..508fc4d4570dc5 100644
--- a/packages/e2e-tests/specs/editor/various/invalid-block.test.js
+++ b/packages/e2e-tests/specs/editor/various/invalid-block.test.js
@@ -18,7 +18,7 @@ describe( 'invalid blocks', () => {
 		await clickBlockAppender();
 		await page.keyboard.type( 'hello' );
 
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 
 		// Change to HTML mode and close the options
 		await clickMenuItem( 'Edit as HTML' );
diff --git a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
index 2b092c9b466906..9c45ff7d43a7ff 100644
--- a/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
@@ -43,7 +43,7 @@ const tabThroughParagraphBlock = async ( paragraphText ) => {
 
 const tabThroughBlockToolbar = async () => {
 	await page.keyboard.press( 'Tab' );
-	await expect( await getActiveLabel() ).toBe( 'Change block type or style' );
+	await expect( await getActiveLabel() ).toBe( 'Paragraph' );
 
 	await page.keyboard.press( 'ArrowRight' );
 	await expect( await getActiveLabel() ).toBe( 'Move up' );
@@ -52,7 +52,7 @@ const tabThroughBlockToolbar = async () => {
 	await expect( await getActiveLabel() ).toBe( 'Move down' );
 
 	await page.keyboard.press( 'ArrowRight' );
-	await expect( await getActiveLabel() ).toBe( 'Change text alignment' );
+	await expect( await getActiveLabel() ).toBe( 'Align' );
 
 	await page.keyboard.press( 'ArrowRight' );
 	await expect( await getActiveLabel() ).toBe( 'Bold' );
@@ -64,13 +64,13 @@ const tabThroughBlockToolbar = async () => {
 	await expect( await getActiveLabel() ).toBe( 'Link' );
 
 	await page.keyboard.press( 'ArrowRight' );
-	await expect( await getActiveLabel() ).toBe( 'More rich text controls' );
+	await expect( await getActiveLabel() ).toBe( 'More' );
 
 	await page.keyboard.press( 'ArrowRight' );
-	await expect( await getActiveLabel() ).toBe( 'More options' );
+	await expect( await getActiveLabel() ).toBe( 'Options' );
 
 	await page.keyboard.press( 'ArrowRight' );
-	await expect( await getActiveLabel() ).toBe( 'Change block type or style' );
+	await expect( await getActiveLabel() ).toBe( 'Paragraph' );
 };
 
 describe( 'Order of block keyboard navigation', () => {
diff --git a/packages/e2e-tests/specs/editor/various/multi-block-selection.test.js b/packages/e2e-tests/specs/editor/various/multi-block-selection.test.js
index bfa098f7f42406..82bfea06b4f347 100644
--- a/packages/e2e-tests/specs/editor/various/multi-block-selection.test.js
+++ b/packages/e2e-tests/specs/editor/various/multi-block-selection.test.js
@@ -566,7 +566,7 @@ describe( 'Multi-block selection', () => {
 		await page.keyboard.type( '2' );
 		await pressKeyWithModifier( 'primary', 'a' );
 		await pressKeyWithModifier( 'primary', 'a' );
-		await clickBlockToolbarButton( 'Change text alignment' );
+		await clickBlockToolbarButton( 'Align' );
 		await clickButton( 'Align text center' );
 
 		expect( await getEditedPostContent() ).toMatchSnapshot();
diff --git a/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js b/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js
index 6cd4b93e93c1dd..e7c3afcfcefb17 100644
--- a/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js
@@ -47,7 +47,7 @@ const createReusableBlock = async ( content, title ) => {
 	await insertBlock( 'Paragraph' );
 	await page.keyboard.type( content );
 
-	await clickBlockToolbarButton( 'More options' );
+	await clickBlockToolbarButton( 'Options' );
 	await clickMenuItem( 'Add to Reusable blocks' );
 
 	// Wait for creation to finish
@@ -193,7 +193,7 @@ describe( 'Reusable blocks', () => {
 		await pressKeyWithModifier( 'primary', 'a' );
 
 		// Convert block to a reusable block
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		await clickMenuItem( 'Add to Reusable blocks' );
 
 		// Wait for creation to finish
@@ -249,7 +249,7 @@ describe( 'Reusable blocks', () => {
 		await page.click( blockSelector );
 
 		// Delete the block, leaving the reusable block empty
-		await clickBlockToolbarButton( 'More options' );
+		await clickBlockToolbarButton( 'Options' );
 		const deleteButton = await page.waitForXPath(
 			'//button/span[text()="Remove block"]'
 		);
diff --git a/packages/e2e-tests/specs/editor/various/style-variation.test.js b/packages/e2e-tests/specs/editor/various/style-variation.test.js
index 9d070c0d95b43c..6bc3606ca25891 100644
--- a/packages/e2e-tests/specs/editor/various/style-variation.test.js
+++ b/packages/e2e-tests/specs/editor/various/style-variation.test.js
@@ -18,7 +18,7 @@ describe( 'adding blocks', () => {
 		await insertBlock( 'Quote' );
 		await page.keyboard.type( 'Quote content' );
 
-		await clickBlockToolbarButton( 'Change block type or style' );
+		await clickBlockToolbarButton( 'Quote' );
 
 		const styleVariations = await page.$$(
 			'.block-editor-block-styles__item'
diff --git a/packages/e2e-tests/specs/editor/various/toolbar-roving-tabindex.test.js b/packages/e2e-tests/specs/editor/various/toolbar-roving-tabindex.test.js
index b31c088352a63a..8e61c7951994c6 100644
--- a/packages/e2e-tests/specs/editor/various/toolbar-roving-tabindex.test.js
+++ b/packages/e2e-tests/specs/editor/various/toolbar-roving-tabindex.test.js
@@ -20,9 +20,12 @@ async function expectLabelToHaveFocus( label ) {
 	).toBe( label );
 }
 
-async function testBlockToolbarKeyboardNavigation( currentBlockLabel ) {
+async function testBlockToolbarKeyboardNavigation(
+	currentBlockLabel,
+	currentBlockTitle
+) {
 	await focusBlockToolbar();
-	await expectLabelToHaveFocus( 'Change block type or style' );
+	await expectLabelToHaveFocus( currentBlockTitle );
 	await page.keyboard.press( 'ArrowRight' );
 	await expectLabelToHaveFocus( 'Move up' );
 	await page.keyboard.press( 'Tab' );
@@ -31,21 +34,24 @@ async function testBlockToolbarKeyboardNavigation( currentBlockLabel ) {
 	await expectLabelToHaveFocus( 'Move up' );
 }
 
-async function wrapCurrentBlockWithGroup() {
-	await page.click( '[aria-label="Change block type or style"]' );
+async function wrapCurrentBlockWithGroup( currentBlockTitle ) {
+	await page.click( `[aria-label="${ currentBlockTitle }"]` );
 	await page.evaluate( () => {
 		document.querySelector( '.editor-block-list-item-group' ).click();
 	} );
 }
 
-async function testGroupKeyboardNavigation( currentBlockLabel ) {
+async function testGroupKeyboardNavigation(
+	currentBlockLabel,
+	currentBlockTitle
+) {
 	await expectLabelToHaveFocus( 'Block: Group' );
 	await page.keyboard.press( 'Tab' );
 	await expectLabelToHaveFocus( currentBlockLabel );
 	await pressKeyWithModifier( 'shift', 'Tab' );
 	await expectLabelToHaveFocus( 'Select parent (Group)' );
 	await page.keyboard.press( 'ArrowRight' );
-	await expectLabelToHaveFocus( 'Change block type or style' );
+	await expectLabelToHaveFocus( currentBlockTitle );
 }
 
 describe( 'Toolbar roving tabindex', () => {
@@ -58,51 +64,60 @@ describe( 'Toolbar roving tabindex', () => {
 	it( 'ensures paragraph block toolbar uses roving tabindex', async () => {
 		await insertBlock( 'Paragraph' );
 		await page.keyboard.type( 'Paragraph' );
-		await testBlockToolbarKeyboardNavigation( 'Paragraph block' );
-		await wrapCurrentBlockWithGroup();
-		await testGroupKeyboardNavigation( 'Paragraph block' );
+		await testBlockToolbarKeyboardNavigation(
+			'Paragraph block',
+			'Paragraph'
+		);
+		await wrapCurrentBlockWithGroup( 'Paragraph' );
+		await testGroupKeyboardNavigation( 'Paragraph block', 'Paragraph' );
 	} );
 
 	it( 'ensures heading block toolbar uses roving tabindex', async () => {
 		await insertBlock( 'Heading' );
 		await page.keyboard.type( 'Heading' );
-		await testBlockToolbarKeyboardNavigation( 'Block: Heading' );
-		await wrapCurrentBlockWithGroup();
-		await testGroupKeyboardNavigation( 'Block: Heading' );
+		await testBlockToolbarKeyboardNavigation( 'Block: Heading', 'Heading' );
+		await wrapCurrentBlockWithGroup( 'Heading' );
+		await testGroupKeyboardNavigation( 'Block: Heading', 'Heading' );
 	} );
 
 	it( 'ensures list block toolbar uses roving tabindex', async () => {
 		await insertBlock( 'List' );
 		await page.keyboard.type( 'List' );
-		await testBlockToolbarKeyboardNavigation( 'Block: List' );
-		await wrapCurrentBlockWithGroup();
-		await testGroupKeyboardNavigation( 'Block: List' );
+		await testBlockToolbarKeyboardNavigation( 'Block: List', 'List' );
+		await wrapCurrentBlockWithGroup( 'List' );
+		await testGroupKeyboardNavigation( 'Block: List', 'List' );
 	} );
 
 	it( 'ensures image block toolbar uses roving tabindex', async () => {
 		await insertBlock( 'Image' );
-		await testBlockToolbarKeyboardNavigation( 'Block: Image' );
-		await wrapCurrentBlockWithGroup();
-		await testGroupKeyboardNavigation( 'Block: Image' );
+		await testBlockToolbarKeyboardNavigation( 'Block: Image', 'Image' );
+		await wrapCurrentBlockWithGroup( 'Image' );
+		await testGroupKeyboardNavigation( 'Block: Image', 'Image' );
 	} );
 
 	it( 'ensures table block toolbar uses roving tabindex', async () => {
 		await insertBlock( 'Table' );
-		await testBlockToolbarKeyboardNavigation( 'Block: Table' );
+		await testBlockToolbarKeyboardNavigation( 'Block: Table', 'Table' );
 		// Move focus to the first toolbar item
 		await page.keyboard.press( 'Home' );
-		await expectLabelToHaveFocus( 'Change block type or style' );
+		await expectLabelToHaveFocus( 'Table' );
 		await page.click( '.blocks-table__placeholder-button' );
-		await testBlockToolbarKeyboardNavigation( 'Block: Table' );
-		await wrapCurrentBlockWithGroup();
-		await testGroupKeyboardNavigation( 'Block: Table' );
+		await testBlockToolbarKeyboardNavigation( 'Block: Table', 'Table' );
+		await wrapCurrentBlockWithGroup( 'Table' );
+		await testGroupKeyboardNavigation( 'Block: Table', 'Table' );
 	} );
 
 	it( 'ensures custom html block toolbar uses roving tabindex', async () => {
 		await insertBlock( 'Custom HTML' );
-		await testBlockToolbarKeyboardNavigation( 'Block: Custom HTML' );
-		await wrapCurrentBlockWithGroup();
-		await testGroupKeyboardNavigation( 'Block: Custom HTML' );
+		await testBlockToolbarKeyboardNavigation(
+			'Block: Custom HTML',
+			'Custom HTML'
+		);
+		await wrapCurrentBlockWithGroup( 'Custom HTML' );
+		await testGroupKeyboardNavigation(
+			'Block: Custom HTML',
+			'Custom HTML'
+		);
 	} );
 
 	it( 'ensures block toolbar remembers the last focused item', async () => {
diff --git a/packages/e2e-tests/specs/editor/various/writing-flow.test.js b/packages/e2e-tests/specs/editor/various/writing-flow.test.js
index f7d8b031f2911c..eff7ad5c16ff11 100644
--- a/packages/e2e-tests/specs/editor/various/writing-flow.test.js
+++ b/packages/e2e-tests/specs/editor/various/writing-flow.test.js
@@ -586,7 +586,7 @@ describe( 'Writing Flow', () => {
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.type( '/image' );
 		await page.keyboard.press( 'Enter' );
-		await clickBlockToolbarButton( 'Change alignment' );
+		await clickBlockToolbarButton( 'Align' );
 		await clickButton( 'Wide width' );
 		await page.keyboard.press( 'ArrowUp' );
 
diff --git a/packages/e2e-tests/specs/experiments/template-part.test.js b/packages/e2e-tests/specs/experiments/template-part.test.js
index 3fd59b6db0ef24..b46362447a3d7f 100644
--- a/packages/e2e-tests/specs/experiments/template-part.test.js
+++ b/packages/e2e-tests/specs/experiments/template-part.test.js
@@ -70,7 +70,7 @@ describe( 'Template Part', () => {
 		}
 
 		async function triggerEllipsisMenuItem( textPrompt ) {
-			await clickBlockToolbarButton( 'More options' );
+			await clickBlockToolbarButton( 'Options' );
 			const button = await page.waitForXPath(
 				`//span[contains(text(), "${ textPrompt }")]`
 			);
diff --git a/packages/edit-post/src/components/header/more-menu/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/header/more-menu/test/__snapshots__/index.js.snap
index 7dfc1004081211..af117caedc07b9 100644
--- a/packages/edit-post/src/components/header/more-menu/test/__snapshots__/index.js.snap
+++ b/packages/edit-post/src/components/header/more-menu/test/__snapshots__/index.js.snap
@@ -68,6 +68,7 @@ exports[`MoreMenu should match snapshot 1`] = `
             text="Options"
           >
             <button
+              aria-describedby={null}
               aria-expanded={false}
               aria-haspopup="true"
               aria-label="Options"
diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
index 77cd403b68a973..3aa6a440ca7846 100644
--- a/packages/edit-post/src/components/header/style.scss
+++ b/packages/edit-post/src/components/header/style.scss
@@ -130,8 +130,6 @@
 	}
 	// Exception for drodpdown toggle buttons.
 	// Exception for the fullscreen mode button.
-	// Temporary exception for block toolbar (pending design).
-	.edit-post-header-toolbar__block-toolbar .components-button.has-icon,
 	.edit-post-fullscreen-mode-close.has-icon,
 	.components-button.has-icon.button-toggle {
 		svg {
diff --git a/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap b/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap
index 73f69e0b93df00..fee4ac787e9698 100644
--- a/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap
+++ b/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap
@@ -61,6 +61,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox and a confirmation
     A page reload is required for this change. Make sure your content is saved before reloading.
   </p>
   <button
+    aria-describedby={null}
     className="components-button edit-post-preferences-modal__custom-fields-confirmation-button is-secondary"
     disabled={false}
     onClick={[Function]}
@@ -176,6 +177,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox and a confirmati
     A page reload is required for this change. Make sure your content is saved before reloading.
   </p>
   <button
+    aria-describedby={null}
     className="components-button edit-post-preferences-modal__custom-fields-confirmation-button is-secondary"
     disabled={false}
     onClick={[Function]}