diff --git a/packages/block-editor/src/components/alignment-control/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/alignment-control/test/__snapshots__/index.js.snap
index 4f549af0b2dc11..872673b35f26f2 100644
--- a/packages/block-editor/src/components/alignment-control/test/__snapshots__/index.js.snap
+++ b/packages/block-editor/src/components/alignment-control/test/__snapshots__/index.js.snap
@@ -56,6 +56,7 @@ exports[`AlignmentUI should allow custom alignment controls to be specified 1`]
   }
   toggleProps={
     Object {
+      "className": "is-pressed",
       "describedBy": "Change text alignment",
     }
   }
@@ -133,6 +134,7 @@ exports[`AlignmentUI should match snapshot 1`] = `
   }
   toggleProps={
     Object {
+      "className": "is-pressed",
       "describedBy": "Change text alignment",
     }
   }
diff --git a/packages/block-editor/src/components/alignment-control/ui.js b/packages/block-editor/src/components/alignment-control/ui.js
index 9b6b52042d1156..541b3f8495dc9b 100644
--- a/packages/block-editor/src/components/alignment-control/ui.js
+++ b/packages/block-editor/src/components/alignment-control/ui.js
@@ -63,7 +63,10 @@ function AlignmentUI( {
 		<UIComponent
 			icon={ setIcon() }
 			label={ label }
-			toggleProps={ { describedBy } }
+			toggleProps={ {
+				describedBy,
+				className: activeAlignment ? 'is-pressed' : undefined,
+			} }
 			popoverProps={ POPOVER_PROPS }
 			controls={ alignmentControls.map( ( control ) => {
 				const { align } = control;
diff --git a/packages/block-editor/src/components/block-alignment-control/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/block-alignment-control/test/__snapshots__/index.js.snap
index bf43a991115033..01d6169ecc75d4 100644
--- a/packages/block-editor/src/components/block-alignment-control/test/__snapshots__/index.js.snap
+++ b/packages/block-editor/src/components/block-alignment-control/test/__snapshots__/index.js.snap
@@ -67,6 +67,7 @@ exports[`BlockAlignmentUI should match snapshot 1`] = `
   }
   toggleProps={
     Object {
+      "className": "is-pressed",
       "describedBy": "Change alignment",
     }
   }
diff --git a/packages/block-editor/src/components/block-alignment-control/ui.js b/packages/block-editor/src/components/block-alignment-control/ui.js
index 141b6c02b4a77a..4d7930f996a43a 100644
--- a/packages/block-editor/src/components/block-alignment-control/ui.js
+++ b/packages/block-editor/src/components/block-alignment-control/ui.js
@@ -67,6 +67,7 @@ function BlockAlignmentUI( {
 
 	const UIComponent = isToolbar ? ToolbarGroup : ToolbarDropdownMenu;
 	const extraProps = isToolbar ? { isCollapsed } : {};
+	const hasActive = enabledControls.some( ( control ) => control === value );
 
 	return (
 		<UIComponent
@@ -77,7 +78,10 @@ function BlockAlignmentUI( {
 					: defaultAlignmentControl.icon
 			}
 			label={ __( 'Align' ) }
-			toggleProps={ { describedBy: __( 'Change alignment' ) } }
+			toggleProps={ {
+				describedBy: __( 'Change alignment' ),
+				className: hasActive ? 'is-pressed' : undefined,
+			} }
 			controls={ enabledControls.map( ( control ) => {
 				return {
 					...BLOCK_ALIGNMENTS_CONTROLS[ control ],
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 a3150e0ba86be8..7c0bf84e9d199e 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
@@ -3,6 +3,7 @@
  */
 
 import { orderBy } from 'lodash';
+import classnames from 'classnames';
 
 /**
  * WordPress dependencies
@@ -20,22 +21,37 @@ const POPOVER_PROPS = {
 const FormatToolbar = () => {
 	return (
 		<>
-			{ [ 'bold', 'italic', 'link', 'text-color' ].map( ( format ) => (
+			{ [ 'bold', 'italic', 'link' ].map( ( format ) => (
 				<Slot
 					name={ `RichText.ToolbarControls.${ format }` }
 					key={ format }
 				/>
 			) ) }
 			<Slot name="RichText.ToolbarControls">
-				{ ( fills ) =>
-					fills.length !== 0 && (
+				{ ( fills ) => {
+					if ( ! fills.length ) {
+						return null;
+					}
+
+					const allProps = fills.map( ( [ { props } ] ) => props );
+					const hasActive = allProps.some(
+						( { isActive } ) => isActive
+					);
+
+					return (
 						<ToolbarItem>
 							{ ( toggleProps ) => (
 								<DropdownMenu
 									icon={ chevronDown }
 									/* translators: button label text should, if possible, be under 16 characters. */
 									label={ __( 'More' ) }
-									toggleProps={ toggleProps }
+									toggleProps={ {
+										...toggleProps,
+										className: classnames(
+											toggleProps.className,
+											{ 'is-pressed': hasActive }
+										),
+									} }
 									controls={ orderBy(
 										fills.map( ( [ { props } ] ) => props ),
 										'title'
@@ -44,8 +60,8 @@ const FormatToolbar = () => {
 								/>
 							) }
 						</ToolbarItem>
-					)
-				}
+					);
+				} }
 			</Slot>
 		</>
 	);
diff --git a/packages/format-library/src/text-color/index.js b/packages/format-library/src/text-color/index.js
index 83004135aa837a..a6555e3ceb78f5 100644
--- a/packages/format-library/src/text-color/index.js
+++ b/packages/format-library/src/text-color/index.js
@@ -56,9 +56,8 @@ function TextColorEdit( {
 	return (
 		<>
 			<RichTextToolbarButton
-				key={ isActive ? 'text-color' : 'text-color-not-active' }
 				className="format-library-text-color-button"
-				name={ isActive ? 'text-color' : undefined }
+				isActive={ isActive }
 				icon={
 					<>
 						<Icon icon={ textColorIcon } />
diff --git a/packages/format-library/src/text-color/style.scss b/packages/format-library/src/text-color/style.scss
index f17790f713882a..804c9ce0cbedbc 100644
--- a/packages/format-library/src/text-color/style.scss
+++ b/packages/format-library/src/text-color/style.scss
@@ -40,6 +40,6 @@
 	height: 4px;
 	width: 20px;
 	position: absolute;
-	bottom: 10px;
-	left: 8px;
+	bottom: 13px;
+	left: 16px;
 }