diff --git a/packages/block-editor/src/components/block-navigation/dropdown.js b/packages/block-editor/src/components/block-navigation/dropdown.js
index ba0e824c3667c..2496d8cdfdbd9 100644
--- a/packages/block-editor/src/components/block-navigation/dropdown.js
+++ b/packages/block-editor/src/components/block-navigation/dropdown.js
@@ -23,7 +23,12 @@ const MenuIcon = (
 	</SVG>
 );
 
-function BlockNavigationDropdownToggle( { isEnabled, onToggle, isOpen } ) {
+function BlockNavigationDropdownToggle( {
+	isEnabled,
+	onToggle,
+	isOpen,
+	showTooltip,
+} ) {
 	useShortcut(
 		'core/edit-post/toggle-block-navigation',
 		useCallback( onToggle, [ onToggle ] ),
@@ -49,12 +54,14 @@ function BlockNavigationDropdownToggle( { isEnabled, onToggle, isOpen } ) {
 			className="block-editor-block-navigation"
 			shortcut={ shortcut }
 			aria-disabled={ ! isEnabled }
+			showTooltip={ showTooltip }
 		/>
 	);
 }
 
 function BlockNavigationDropdown( {
 	isDisabled,
+	showTooltip,
 	__experimentalWithBlockNavigationSlots,
 } ) {
 	const hasBlocks = useSelect(
@@ -71,6 +78,7 @@ function BlockNavigationDropdown( {
 				<BlockNavigationDropdownToggle
 					{ ...toggleProps }
 					isEnabled={ isEnabled }
+					showTooltip={ showTooltip }
 				/>
 			) }
 			renderContent={ ( { onClose } ) => (
diff --git a/packages/block-editor/src/components/tool-selector/index.js b/packages/block-editor/src/components/tool-selector/index.js
index e09c516eca132..eb74e4a3251e2 100644
--- a/packages/block-editor/src/components/tool-selector/index.js
+++ b/packages/block-editor/src/components/tool-selector/index.js
@@ -34,7 +34,7 @@ const selectIcon = (
 	</SVG>
 );
 
-function ToolSelector() {
+function ToolSelector( { showTooltip } ) {
 	const isNavigationTool = useSelect(
 		( select ) => select( 'core/block-editor' ).isNavigationMode(),
 		[]
@@ -57,6 +57,7 @@ function ToolSelector() {
 					aria-expanded={ isOpen }
 					onClick={ onToggle }
 					label={ __( 'Tools' ) }
+					showTooltip={ showTooltip }
 				/>
 			) }
 			position="bottom right"
diff --git a/packages/components/src/button/index.js b/packages/components/src/button/index.js
index 7e5acfb6f2ccf..08af4bb17adc0 100644
--- a/packages/components/src/button/index.js
+++ b/packages/components/src/button/index.js
@@ -36,6 +36,7 @@ export function Button( props, ref ) {
 		disabled,
 		icon,
 		iconSize,
+		showIconLabel,
 		showTooltip,
 		tooltipPosition,
 		shortcut,
@@ -94,8 +95,7 @@ export function Button( props, ref ) {
 		! trulyDisabled &&
 		// an explicit tooltip is passed or...
 		( ( showTooltip && label ) ||
-			// there's a shortcut or...
-			shortcut ||
+			( shortcut && showTooltip !== false ) ||
 			// there's a label and...
 			( !! label &&
 				// the children are empty and...
@@ -113,6 +113,7 @@ export function Button( props, ref ) {
 			ref={ ref }
 		>
 			{ icon && <Icon icon={ icon } size={ iconSize } /> }
+			{ showIconLabel && <div className="label">{ label }</div> }
 			{ children }
 		</Tag>
 	);
diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss
index 559d207972bb9..8b4cb2e9d3a6f 100644
--- a/packages/components/src/button/style.scss
+++ b/packages/components/src/button/style.scss
@@ -13,7 +13,6 @@
 	align-items: center;
 	box-sizing: border-box;
 	padding: 6px 12px;
-	overflow: hidden;
 	border-radius: $radius-block-ui;
 	color: $dark-gray-primary;
 
@@ -280,6 +279,11 @@
 		outline: none;
 	}
 
+	.label {
+		flex-basis: 100%;
+		margin-left: 5px;
+	}
+
 	// Fixes a Safari+VoiceOver bug, where the screen reader text is announced not respecting the source order.
 	// See https://core.trac.wordpress.org/ticket/42006 and https://github.com/h5bp/html5-boilerplate/issues/1985
 	.components-visually-hidden {
diff --git a/packages/components/src/dropdown-menu/index.js b/packages/components/src/dropdown-menu/index.js
index 288ea6f72d9d4..7a8eeef193630 100644
--- a/packages/components/src/dropdown-menu/index.js
+++ b/packages/components/src/dropdown-menu/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import { flatMap, isEmpty, isFunction } from 'lodash';
+import { flatMap, isEmpty, isFunction, isUndefined } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -124,7 +124,11 @@ function DropdownMenu( {
 						aria-haspopup="true"
 						aria-expanded={ isOpen }
 						label={ label }
-						showTooltip
+						showTooltip={
+							isUndefined( mergedToggleProps.showTooltip )
+								? true
+								: mergedToggleProps.showTooltip
+						}
 					>
 						{ mergedToggleProps.children }
 					</Button>
diff --git a/packages/edit-post/src/components/header/header-toolbar/index.js b/packages/edit-post/src/components/header/header-toolbar/index.js
index 4e386d22cc4f7..09d32ed2b69a9 100644
--- a/packages/edit-post/src/components/header/header-toolbar/index.js
+++ b/packages/edit-post/src/components/header/header-toolbar/index.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
@@ -25,6 +30,7 @@ function HeaderToolbar( { onToggleInserter, isInserterOpen } ) {
 		isInserterVisible,
 		isTextModeEnabled,
 		previewDeviceType,
+		showIconLabels,
 	} = useSelect(
 		( select ) => ( {
 			hasFixedToolbar: select( 'core/edit-post' ).isFeatureActive(
@@ -40,14 +46,20 @@ function HeaderToolbar( { onToggleInserter, isInserterOpen } ) {
 			previewDeviceType: select(
 				'core/edit-post'
 			).__experimentalGetPreviewDeviceType(),
+			showIconLabels: select( 'core/edit-post' ).isFeatureActive(
+				'showIconLabels'
+			),
 		} ),
 		[]
 	);
 	const isLargeViewport = useViewportMatch( 'medium' );
+	const isWideViewport = useViewportMatch( 'wide' );
 
 	const displayBlockToolbar =
 		! isLargeViewport || previewDeviceType !== 'Desktop' || hasFixedToolbar;
 
+	const showTooltip = ! showIconLabels;
+
 	const toolbarAriaLabel = displayBlockToolbar
 		? /* translators: accessibility text for the editor toolbar when Top Toolbar is on */
 		  __( 'Document and block tools' )
@@ -56,8 +68,10 @@ function HeaderToolbar( { onToggleInserter, isInserterOpen } ) {
 
 	return (
 		<NavigableToolbar
-			className="edit-post-header-toolbar"
 			aria-label={ toolbarAriaLabel }
+			className={ classnames( 'edit-post-header-toolbar', {
+				'show-icon-labels': showIconLabels,
+			} ) }
 		>
 			{ isInserterVisible && (
 				<Button
@@ -71,13 +85,20 @@ function HeaderToolbar( { onToggleInserter, isInserterOpen } ) {
 						'Add block',
 						'Generic label for block inserter button'
 					) }
+					showTooltip={ showTooltip }
 				/>
 			) }
-			<ToolSelector />
-			<EditorHistoryUndo />
-			<EditorHistoryRedo />
-			<TableOfContents hasOutlineItemsDisabled={ isTextModeEnabled } />
-			<BlockNavigationDropdown isDisabled={ isTextModeEnabled } />
+			<ToolSelector showTooltip={ showTooltip } />
+			<EditorHistoryUndo showTooltip={ showTooltip } />
+			<EditorHistoryRedo showTooltip={ showTooltip } />
+			<TableOfContents
+				hasOutlineItemsDisabled={ isTextModeEnabled }
+				showTooltip={ showTooltip }
+			/>
+			<BlockNavigationDropdown
+				isDisabled={ isTextModeEnabled }
+				showTooltip={ showTooltip }
+			/>
 			{ displayBlockToolbar && (
 				<div className="edit-post-header-toolbar__block-toolbar">
 					<BlockToolbar hideDragHandle />
diff --git a/packages/edit-post/src/components/header/header-toolbar/style.scss b/packages/edit-post/src/components/header/header-toolbar/style.scss
index e2c9241c4dec3..650d0d924ab30 100644
--- a/packages/edit-post/src/components/header/header-toolbar/style.scss
+++ b/packages/edit-post/src/components/header/header-toolbar/style.scss
@@ -23,6 +23,34 @@
 			display: flex;
 		}
 	}
+	&.show-icon-labels {
+		button[aria-label] {
+			display: inline-flex;
+			flex-wrap: nowrap;
+			&::after {
+				content: attr(aria-label);
+				display: block;
+				font-size: 12px;
+				margin-left: 5px;
+			}
+			&.is-primary {
+				&::after {
+					padding-right: 8px;
+				}
+			}
+		}
+		[aria-orientation=vertical] & {
+			display: block;
+		}
+		> div, > button {
+			[aria-orientation=vertical] & {
+				display: block;
+				button {
+					width: 100%;
+				}
+			}
+		}
+	}
 }
 
 // Block toolbar when fixed to the top of the screen.
@@ -75,7 +103,7 @@
 
 		.block-editor-block-toolbar .components-toolbar-group,
 		.block-editor-block-toolbar .components-toolbar {
-			$top-toolbar-padding: ($header-height - $grid-unit-60) / 2;
+			$top-toolbar-padding: ( $header-height - $grid-unit-60 ) / 2;
 			height: $header-height;
 			padding: $top-toolbar-padding 0;
 		}
@@ -86,7 +114,6 @@
 	margin-right: $grid-unit-10;
 	// Special dimensions for this button.
 	min-width: 32px;
-	width: 32px;
 	height: 32px;
 	padding: 0;
 }
diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
index 8210e19ab0b29..7d40e0c69a2e6 100644
--- a/packages/edit-post/src/components/header/index.js
+++ b/packages/edit-post/src/components/header/index.js
@@ -2,10 +2,11 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Button } from '@wordpress/components';
+import { Button, Dropdown } from '@wordpress/components';
 import { PostSavedState, PostPreviewButton } from '@wordpress/editor';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { cog } from '@wordpress/icons';
+import { useViewportMatch } from '@wordpress/compose';
+import { cog, moreHorizontal } from '@wordpress/icons';
 import {
 	PinnedItems,
 	__experimentalMainDashboardButton as MainDashboardButton,
@@ -32,6 +33,7 @@ function Header( {
 		isPublishSidebarOpened,
 		isSaving,
 		getBlockSelectionStart,
+		showIconLabel,
 	} = useSelect(
 		( select ) => ( {
 			shortcut: select(
@@ -48,6 +50,9 @@ function Header( {
 			getBlockSelectionStart: select( 'core/block-editor' )
 				.getBlockSelectionStart,
 			isPostSaveable: select( 'core/editor' ).isEditedPostSaveable(),
+			showIconLabel: select( 'core/edit-post' ).isFeatureActive(
+				'showIconLabels'
+			),
 			deviceType: select(
 				'core/edit-post'
 			).__experimentalGetPreviewDeviceType(),
@@ -58,6 +63,8 @@ function Header( {
 		'core/edit-post'
 	);
 
+	const isLargeViewport = useViewportMatch( 'large' );
+
 	const toggleGeneralSidebar = isEditorSidebarOpened
 		? closeGeneralSidebar
 		: () =>
@@ -67,6 +74,46 @@ function Header( {
 						: 'edit-post/document'
 				);
 
+	const headerSettings = (
+		<div className="edit-post-header__settings">
+			{ ! isPublishSidebarOpened && (
+				// This button isn't completely hidden by the publish sidebar.
+				// We can't hide the whole toolbar when the publish sidebar is open because
+				// we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node.
+				// We track that DOM node to return focus to the PostPublishButtonOrToggle
+				// when the publish sidebar has been closed.
+				<PostSavedState
+					forceIsDirty={ hasActiveMetaboxes }
+					forceIsSaving={ isSaving }
+				/>
+			) }
+			<DevicePreview />
+			<PostPreviewButton
+				forceIsAutosaveable={ hasActiveMetaboxes }
+				forcePreviewLink={ isSaving ? null : undefined }
+			/>
+			<PostPublishButtonOrToggle
+				forceIsDirty={ hasActiveMetaboxes }
+				forceIsSaving={ isSaving }
+				setEntitiesSavedStatesCallback={
+					setEntitiesSavedStatesCallback
+				}
+			/>
+			<Button
+				icon={ cog }
+				label={ __( 'Settings' ) }
+				onClick={ toggleGeneralSidebar }
+				isPressed={ isEditorSidebarOpened }
+				aria-expanded={ isEditorSidebarOpened }
+				showIconLabel={ showIconLabel }
+				showTooltip={ ! showIconLabel }
+				shortcut={ shortcut }
+			/>
+			<PinnedItems.Slot scope="core/edit-post" />
+			<MoreMenu showIconLabel={ showIconLabel } />
+		</div>
+	);
+
 	return (
 		<div className="edit-post-header">
 			<MainDashboardButton.Slot>
@@ -78,41 +125,23 @@ function Header( {
 					isInserterOpen={ isInserterOpen }
 				/>
 			</div>
-			<div className="edit-post-header__settings">
-				{ ! isPublishSidebarOpened && (
-					// This button isn't completely hidden by the publish sidebar.
-					// We can't hide the whole toolbar when the publish sidebar is open because
-					// we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node.
-					// We track that DOM node to return focus to the PostPublishButtonOrToggle
-					// when the publish sidebar has been closed.
-					<PostSavedState
-						forceIsDirty={ hasActiveMetaboxes }
-						forceIsSaving={ isSaving }
-					/>
-				) }
-				<DevicePreview />
-				<PostPreviewButton
-					forceIsAutosaveable={ hasActiveMetaboxes }
-					forcePreviewLink={ isSaving ? null : undefined }
-				/>
-				<PostPublishButtonOrToggle
-					forceIsDirty={ hasActiveMetaboxes }
-					forceIsSaving={ isSaving }
-					setEntitiesSavedStatesCallback={
-						setEntitiesSavedStatesCallback
-					}
-				/>
-				<Button
-					icon={ cog }
-					label={ __( 'Settings' ) }
-					onClick={ toggleGeneralSidebar }
-					isPressed={ isEditorSidebarOpened }
-					aria-expanded={ isEditorSidebarOpened }
-					shortcut={ shortcut }
+			{ isLargeViewport && headerSettings }
+			{ ! isLargeViewport && (
+				<Dropdown
+					className="my-container-class-name"
+					contentClassName="my-popover-content-classname"
+					position="bottom right"
+					renderToggle={ ( { isOpen, onToggle } ) => (
+						<Button
+							aria-expanded={ isOpen }
+							icon={ moreHorizontal }
+							isSecondary
+							onClick={ onToggle }
+						/>
+					) }
+					renderContent={ () => headerSettings }
 				/>
-				<PinnedItems.Slot scope="core/edit-post" />
-				<MoreMenu />
-			</div>
+			) }
 		</div>
 	);
 }
diff --git a/packages/edit-post/src/components/header/more-menu/index.js b/packages/edit-post/src/components/header/more-menu/index.js
index 9a0b39751fb82..383be35f6f924 100644
--- a/packages/edit-post/src/components/header/more-menu/index.js
+++ b/packages/edit-post/src/components/header/more-menu/index.js
@@ -1,9 +1,15 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
 import { DropdownMenu, MenuGroup } from '@wordpress/components';
 import { moreVertical } from '@wordpress/icons';
+import { useLayoutEffect, useRef, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -14,34 +20,62 @@ import ToolsMoreMenuGroup from '../tools-more-menu-group';
 import OptionsMenuItem from '../options-menu-item';
 import WritingMenu from '../writing-menu';
 
-const POPOVER_PROPS = {
-	className: 'edit-post-more-menu__content',
-	position: 'bottom left',
-};
 const TOGGLE_PROPS = {
 	tooltipPosition: 'bottom',
 };
 
-const MoreMenu = () => (
-	<DropdownMenu
-		className="edit-post-more-menu"
-		icon={ moreVertical }
-		label={ __( 'More tools & options' ) }
-		popoverProps={ POPOVER_PROPS }
-		toggleProps={ TOGGLE_PROPS }
-	>
-		{ ( { onClose } ) => (
-			<>
-				<WritingMenu />
-				<ModeSwitcher />
-				<PluginMoreMenuGroup.Slot fillProps={ { onClose } } />
-				<ToolsMoreMenuGroup.Slot fillProps={ { onClose } } />
-				<MenuGroup>
-					<OptionsMenuItem />
-				</MenuGroup>
-			</>
-		) }
-	</DropdownMenu>
-);
+const MoreMenu = ( { showIconLabel } ) => {
+	const [ anchorRect, setAnchorRect ] = useState( {} );
+	const currentNode = useRef();
+	const position = showIconLabel ? 'top' : 'bottom left';
+	const POPOVER_PROPS = {
+		anchorRect,
+		className: 'edit-post-more-menu__content',
+		position,
+	};
+
+	useLayoutEffect( () => {
+		function updatePosition() {
+			if ( currentNode.current ) {
+				const boundingClientRect = currentNode.current.getBoundingClientRect();
+
+				setAnchorRect( boundingClientRect );
+			}
+		}
+		window.addEventListener( 'resize', updatePosition );
+		updatePosition();
+		return () => window.removeEventListener( 'resize', updatePosition );
+	}, [] );
+
+	return (
+		<div ref={ currentNode }>
+			<DropdownMenu
+				className={ classnames( 'edit-post-more-menu', {
+					'show-icon-label': showIconLabel,
+				} ) }
+				icon={ moreVertical }
+				label={ __( 'More options' ) }
+				popoverProps={ POPOVER_PROPS }
+				toggleProps={ {
+					...TOGGLE_PROPS,
+					showIconLabel,
+					showTooltip: ! showIconLabel,
+				} }
+			>
+				{ ( { onClose } ) => (
+					<>
+						<WritingMenu />
+						<ModeSwitcher />
+						<PluginMoreMenuGroup.Slot fillProps={ { onClose } } />
+						<ToolsMoreMenuGroup.Slot fillProps={ { onClose } } />
+						<MenuGroup>
+							<OptionsMenuItem />
+						</MenuGroup>
+					</>
+				) }
+			</DropdownMenu>
+		</div>
+	);
+};
 
 export default MoreMenu;
diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
index f92b714b0df28..dc143b0d4e463 100644
--- a/packages/edit-post/src/components/header/style.scss
+++ b/packages/edit-post/src/components/header/style.scss
@@ -25,7 +25,7 @@
 		order: 1;
 
 		// Restore default order for all other browsers
-		@supports (position: sticky) {
+		@supports ( position: sticky ) {
 			order: initial;
 		}
 	}
@@ -55,11 +55,82 @@
 	flex-wrap: wrap;
 	padding-right: $grid-unit-05;
 
-	@include break-small () {
+	.my-popover-content-classname & {
+		min-width: 150px;
+
+		.editor-post-saved-state {
+			margin-bottom: 1rem;
+			padding-left: 0;
+			svg {
+				margin-left: 4px;
+				margin-right: 0;
+			}
+		}
+
+		button {
+			width: 100%;
+		}
+
+		.is-primary {
+			justify-content: center;
+		}
+
+		.is-tertiary {
+			display: flex;
+			justify-content: center;
+			margin-bottom: 1rem;
+			&.is-tertiary {
+				margin-right: 0;
+			}
+		}
+
+		.components-button {
+			.label {
+				flex-basis: auto;
+				padding-right: 7px;
+			}
+
+			&.has-icon {
+				justify-content: left;
+				padding-left: 0;
+			}
+		}
+
+		.edit-post-more-menu {
+			display: block;
+			width: 100%;
+		}
+	}
+
+	@include break-small() {
 		padding-right: $grid-unit-20;
 	}
 }
 
+//temp
+.my-container-class-name {
+	> button {
+		margin-right: 1rem;
+	}
+}
+.my-popover-content-classname {
+	.components-popover__content {
+		min-width: auto;
+	}
+	.edit-post-header__settings {
+		display: block;
+		> div,
+		> button {
+			display: inline-flex;
+			margin-bottom: 1rem;
+			text-align: left;
+			width: 100%;
+			&:last-child {
+				margin-bottom: 0;
+			}
+		}
+	}
+}
 
 /**
  * Buttons in the Toolbar
diff --git a/packages/edit-post/src/components/options-modal/index.js b/packages/edit-post/src/components/options-modal/index.js
index a4fa06cc512fc..f3b6ea4c9f14e 100644
--- a/packages/edit-post/src/components/options-modal/index.js
+++ b/packages/edit-post/src/components/options-modal/index.js
@@ -26,6 +26,7 @@ import {
 	EnablePluginDocumentSettingPanelOption,
 	EnablePublishSidebarOption,
 	EnablePanelOption,
+	ShowIconLabels,
 } from './options';
 import MetaBoxesSection from './meta-boxes-section';
 
@@ -92,6 +93,9 @@ export function OptionsModal( { isModalActive, isViewable, closeModal } ) {
 				</PageAttributesCheck>
 			</Section>
 			<MetaBoxesSection title={ __( 'Advanced panels' ) } />
+			<Section title={ __( 'Icon Labels' ) }>
+				<ShowIconLabels label="Show Icon Labels" />
+			</Section>
 		</Modal>
 	);
 }
@@ -112,6 +116,8 @@ export default compose(
 	withDispatch( ( dispatch ) => {
 		return {
 			closeModal: () => dispatch( 'core/edit-post' ).closeModal(),
+			toggleIconLabels: () =>
+				dispatch( 'core/edit-post' ).toggleFeature( 'showIconLabels' ),
 		};
 	} )
 )( OptionsModal );
diff --git a/packages/edit-post/src/components/options-modal/options/index.js b/packages/edit-post/src/components/options-modal/options/index.js
index 6ba7b4c54c7da..822c2c9ff62d2 100644
--- a/packages/edit-post/src/components/options-modal/options/index.js
+++ b/packages/edit-post/src/components/options-modal/options/index.js
@@ -2,3 +2,4 @@ export { default as EnableCustomFieldsOption } from './enable-custom-fields';
 export { default as EnablePanelOption } from './enable-panel';
 export { default as EnablePluginDocumentSettingPanelOption } from './enable-plugin-document-setting-panel';
 export { default as EnablePublishSidebarOption } from './enable-publish-sidebar';
+export { default as ShowIconLabels } from './show-icon-labels';
diff --git a/packages/edit-post/src/components/options-modal/options/show-icon-labels.js b/packages/edit-post/src/components/options-modal/options/show-icon-labels.js
new file mode 100644
index 0000000000000..e8a87e1b29fec
--- /dev/null
+++ b/packages/edit-post/src/components/options-modal/options/show-icon-labels.js
@@ -0,0 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import { compose } from '@wordpress/compose';
+import { withSelect, withDispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import BaseOption from './base';
+
+export default compose(
+	withSelect( ( select ) => ( {
+		isChecked: select( 'core/edit-post' ).isFeatureActive(
+			'showIconLabels'
+		),
+	} ) ),
+	withDispatch( ( dispatch ) => ( {
+		onChange: () =>
+			dispatch( 'core/edit-post' ).toggleFeature( 'showIconLabels' ),
+	} ) )
+)( BaseOption );
diff --git a/packages/edit-post/src/store/defaults.js b/packages/edit-post/src/store/defaults.js
index 64435c05ce74c..46949ec9cea19 100644
--- a/packages/edit-post/src/store/defaults.js
+++ b/packages/edit-post/src/store/defaults.js
@@ -9,6 +9,7 @@ export const PREFERENCES_DEFAULTS = {
 		fixedToolbar: false,
 		welcomeGuide: true,
 		fullscreenMode: true,
+		showIconLabels: false,
 	},
 	hiddenBlockTypes: [],
 	preferredStyleVariations: {},
diff --git a/packages/editor/src/components/editor-history/redo.js b/packages/editor/src/components/editor-history/redo.js
index 688c259201e00..24afb66821690 100644
--- a/packages/editor/src/components/editor-history/redo.js
+++ b/packages/editor/src/components/editor-history/redo.js
@@ -8,7 +8,7 @@ import { compose } from '@wordpress/compose';
 import { displayShortcut } from '@wordpress/keycodes';
 import { redo as redoIcon } from '@wordpress/icons';
 
-function EditorHistoryRedo( { hasRedo, redo } ) {
+function EditorHistoryRedo( { hasRedo, redo, showTooltip } ) {
 	return (
 		<Button
 			icon={ redoIcon }
@@ -20,6 +20,7 @@ function EditorHistoryRedo( { hasRedo, redo } ) {
 			aria-disabled={ ! hasRedo }
 			onClick={ hasRedo ? redo : undefined }
 			className="editor-history__redo"
+			showTooltip={ showTooltip }
 		/>
 	);
 }
diff --git a/packages/editor/src/components/editor-history/undo.js b/packages/editor/src/components/editor-history/undo.js
index 1871f2b68b95c..f6812a46b472b 100644
--- a/packages/editor/src/components/editor-history/undo.js
+++ b/packages/editor/src/components/editor-history/undo.js
@@ -8,7 +8,7 @@ import { compose } from '@wordpress/compose';
 import { displayShortcut } from '@wordpress/keycodes';
 import { undo as undoIcon } from '@wordpress/icons';
 
-function EditorHistoryUndo( { hasUndo, undo } ) {
+function EditorHistoryUndo( { hasUndo, showTooltip, undo } ) {
 	return (
 		<Button
 			icon={ undoIcon }
@@ -20,6 +20,7 @@ function EditorHistoryUndo( { hasUndo, undo } ) {
 			aria-disabled={ ! hasUndo }
 			onClick={ hasUndo ? undo : undefined }
 			className="editor-history__undo"
+			showTooltip={ showTooltip }
 		/>
 	);
 }
diff --git a/packages/editor/src/components/table-of-contents/index.js b/packages/editor/src/components/table-of-contents/index.js
index 46746a70f4719..17b20c33dd8d0 100644
--- a/packages/editor/src/components/table-of-contents/index.js
+++ b/packages/editor/src/components/table-of-contents/index.js
@@ -11,7 +11,11 @@ import { info } from '@wordpress/icons';
  */
 import TableOfContentsPanel from './panel';
 
-function TableOfContents( { hasBlocks, hasOutlineItemsDisabled } ) {
+function TableOfContents( {
+	hasBlocks,
+	hasOutlineItemsDisabled,
+	showTooltip,
+} ) {
 	return (
 		<Dropdown
 			position="bottom"
@@ -25,6 +29,7 @@ function TableOfContents( { hasBlocks, hasOutlineItemsDisabled } ) {
 					label={ __( 'Content structure' ) }
 					tooltipPosition="bottom"
 					aria-disabled={ ! hasBlocks }
+					showTooltip={ showTooltip }
 				/>
 			) }
 			renderContent={ ( { onClose } ) => (