diff --git a/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js b/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
index d96b30bf9bb1a7..d3a7bd2851cd7d 100644
--- a/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
+++ b/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
@@ -204,7 +204,7 @@ describe( 'Multi-entity editor states', () => {
 			// Our custom template shows up in the " templates > all" menu; let's use it.
 			await clickTemplateItem( [ 'Templates', 'All' ], templateName );
 			await page.waitForXPath(
-				`//p[contains(@class, "edit-site-document-actions__title") and contains(text(), '${ templateName }')]`
+				`//h1[contains(@class, "edit-site-document-actions__title") and contains(text(), '${ templateName }')]`
 			);
 
 			removeErrorMocks();
diff --git a/packages/edit-site/src/components/header/document-actions/index.js b/packages/edit-site/src/components/header/document-actions/index.js
index 6a57b32cf952f9..62ab02f2440dd0 100644
--- a/packages/edit-site/src/components/header/document-actions/index.js
+++ b/packages/edit-site/src/components/header/document-actions/index.js
@@ -90,21 +90,34 @@ export default function DocumentActions( {
 				ref={ titleRef }
 				className="edit-site-document-actions__title-wrapper"
 			>
-				<h1>
-					<VisuallyHidden>
+				<Text
+					variant="body.small"
+					className="edit-site-document-actions__title-prefix"
+				>
+					<VisuallyHidden as="span">
 						{ sprintf(
 							/* translators: %s: the entity being edited, like "template"*/
-							__( 'Edit %s:' ),
+							__( 'Editing %s:' ),
 							entityLabel
 						) }
 					</VisuallyHidden>
-					<Text
-						variant="subtitle.small"
-						className="edit-site-document-actions__title"
-					>
-						{ entityTitle }
-					</Text>
-				</h1>
+				</Text>
+
+				<Text
+					variant="body.small"
+					className="edit-site-document-actions__title"
+					as="h1"
+				>
+					{ entityTitle }
+				</Text>
+
+				<Text
+					variant="body.small"
+					className="edit-site-document-actions__secondary-item"
+				>
+					{ label ?? '' }
+				</Text>
+
 				{ dropdownContent && (
 					<Dropdown
 						popoverProps={ {
@@ -130,12 +143,6 @@ export default function DocumentActions( {
 					/>
 				) }
 			</div>
-			<Text
-				variant="body"
-				className="edit-site-document-actions__secondary-item"
-			>
-				{ label ?? '' }
-			</Text>
 		</div>
 	);
 }
diff --git a/packages/edit-site/src/components/header/document-actions/style.scss b/packages/edit-site/src/components/header/document-actions/style.scss
index 97ff4d1ea5b661..ec7ad567b190c9 100644
--- a/packages/edit-site/src/components/header/document-actions/style.scss
+++ b/packages/edit-site/src/components/header/document-actions/style.scss
@@ -14,20 +14,22 @@
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
-		transition: transform 0.2s;
-		@include reduce-motion(transition);
 
 		// See comment above about min-width
 		min-width: 0;
 
-		// Since part of the dropdown button width is blank space, visually,
-		// it looks off-center. This offsets that blank space.
-		margin-left: 12px;
+		.components-dropdown {
+			display: inline-flex;
+			margin-left: $grid-unit-05;
+
+			.components-button {
+				min-width: 0;
+				padding: 0;
+			}
+		}
 	}
 
 	.edit-site-document-actions__title-wrapper > h1 {
-		display: flex;
-		justify-content: center;
 		margin: 0;
 
 		// See comment above about min-width
@@ -38,29 +40,36 @@
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
+		max-width: 120px;
+
+		@include break-medium() {
+			max-width: 75px;
+		}
+
+		@include break-xlarge() {
+			max-width: 180px;
+		}
 	}
 
 	.edit-site-document-actions__secondary-item {
-		opacity: 0;
-		transform: translateY(0);
-		transition: transform 0.2s;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		text-align: center;
+		max-width: 0;
+		opacity: 0;
+		padding: 0;
+		transition: all ease 0.2s;
+		background: $gray-200;
+		border-radius: 2px;
 		@include reduce-motion(transition);
 	}
 
 	&.has-secondary-label {
-		transform: translateY(10px);
-
-		.edit-site-document-actions__title-wrapper {
-			transform: translateY(-12px);
-		}
-
 		.edit-site-document-actions__secondary-item {
 			opacity: 1;
-			transform: translateY(-16px);
+			padding: 0 4px;
+			max-width: 180px;
+			margin-left: 6px;
 		}
 	}
 }