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 2a8a7a753211f..b8ad196e3fd13 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
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
@@ -48,10 +43,8 @@ const FormatToolbar = () => {
 									label={ __( 'More' ) }
 									toggleProps={ {
 										...toggleProps,
-										className: classnames(
-											toggleProps.className,
-											{ 'is-pressed': hasActive }
-										),
+										className: toggleProps.className,
+										'aria-pressed': hasActive,
 										describedBy: __(
 											'Displays more block tools'
 										),
diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js
index 616478d8013f7..a199407c927e2 100644
--- a/packages/block-library/src/search/edit.js
+++ b/packages/block-library/src/search/edit.js
@@ -379,7 +379,7 @@ export default function SearchEdit( {
 								showLabel: ! showLabel,
 							} );
 						} }
-						className={ showLabel ? 'is-pressed' : undefined }
+						aria-pressed={ buttonUseIcon }
 					/>
 					<ToolbarDropdownMenu
 						icon={ getButtonPositionIcon() }
@@ -395,9 +395,7 @@ export default function SearchEdit( {
 									buttonUseIcon: ! buttonUseIcon,
 								} );
 							} }
-							className={
-								buttonUseIcon ? 'is-pressed' : undefined
-							}
+							aria-pressed={ buttonUseIcon }
 						/>
 					) }
 				</ToolbarGroup>