diff --git a/packages/block-editor/src/components/block-toolbar/change-design.js b/packages/block-editor/src/components/block-toolbar/change-design.js
index 9f18f81374d6e..a33eeedccd71f 100644
--- a/packages/block-editor/src/components/block-toolbar/change-design.js
+++ b/packages/block-editor/src/components/block-toolbar/change-design.js
@@ -108,7 +108,6 @@ export default function ChangeDesign( { clientId } ) {
 					<ToolbarGroup>
 						<ToolbarButton
 							isActive={ isOpen }
-							// label={ __( 'Change Design' ) }
 							onClick={ () => onToggle( ! isOpen ) }
 							aria-expanded={ isOpen }
 						>
diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
index d6a0985fef361..5e7ae73a7bb7f 100644
--- a/packages/block-editor/src/components/block-toolbar/index.js
+++ b/packages/block-editor/src/components/block-toolbar/index.js
@@ -16,7 +16,7 @@ import {
 	isReusableBlock,
 	isTemplatePart,
 } from '@wordpress/blocks';
-import { ToolbarGroup, ToolbarButton } from '@wordpress/components';
+import { ToolbarGroup } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -35,7 +35,7 @@ import { store as blockEditorStore } from '../../store';
 import __unstableBlockNameContext from './block-name-context';
 import NavigableToolbar from '../navigable-toolbar';
 import { useHasBlockToolbar } from './use-has-block-toolbar';
-import Shuffle from './shuffle';
+import ChangeDesign from './change-design';
 import { unlock } from '../../lock-unlock';
 
 /**
@@ -211,12 +211,7 @@ export function PrivateBlockToolbar( {
 					shouldShowVisualToolbar &&
 					isMultiToolbar && <BlockGroupToolbar /> }
 				{ showShuffleButton && (
-					<ToolbarGroup>
-						<Shuffle
-							clientId={ blockClientIds[ 0 ] }
-							as={ ToolbarButton }
-						/>
-					</ToolbarGroup>
+					<ChangeDesign clientId={ blockClientIds[ 0 ] } />
 				) }
 				{ shouldShowVisualToolbar && (
 					<>