diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 1f36e31d4c7e06..3d8c2f8a86d8b8 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -11,15 +11,14 @@ import {
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import {
+	Button,
 	SelectControl,
 	Dropdown,
 	PanelBody,
 	ToolbarGroup,
-	ToolbarButton,
 	Spinner,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { chevronUp, chevronDown } from '@wordpress/icons';
 import { store as coreStore } from '@wordpress/core-data';
 
 /**
@@ -131,17 +130,15 @@ export default function TemplatePartEdit( {
 								contentClassName="wp-block-template-part__preview-dropdown-content"
 								position="bottom right left"
 								renderToggle={ ( { isOpen, onToggle } ) => (
-									<ToolbarButton
+									<Button
 										aria-expanded={ isOpen }
-										icon={
-											isOpen ? chevronUp : chevronDown
-										}
-										label={ __( 'Choose another' ) }
 										onClick={ onToggle }
 										// Disable when open to prevent odd FireFox bug causing reopening.
 										// As noted in https://github.com/WordPress/gutenberg/pull/24990#issuecomment-689094119 .
 										disabled={ isOpen }
-									/>
+									>
+										{ __( 'Replace' ) }
+									</Button>
 								) }
 								renderContent={ ( { onClose } ) => (
 									<TemplatePartSelection