diff --git a/packages/block-editor/src/components/block-mover/style.scss b/packages/block-editor/src/components/block-mover/style.scss
index cf4061b3789dfb..09cec30f8a313f 100644
--- a/packages/block-editor/src/components/block-mover/style.scss
+++ b/packages/block-editor/src/components/block-mover/style.scss
@@ -95,3 +95,10 @@
 		@include block-toolbar-button-style__focus();
 	}
 }
+
+// Styles when the 'show button text labels' preference is enabled.
+.show-icon-labels {
+	.block-editor-block-mover:not(.is-horizontal) .block-editor-block-mover__move-button-container {
+		width: auto;
+	}
+}
diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index 41faa1a46eaed2..cebfac406b8e18 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -171,7 +171,6 @@
 	.block-editor-block-toolbar__block-controls .block-editor-block-mover {
 		border-left: 1px solid $gray-900;
 		margin-left: 6px;
-		margin-right: -6px;
 		white-space: nowrap;
 	}
 
diff --git a/packages/block-library/src/post-featured-image/edit.js b/packages/block-library/src/post-featured-image/edit.js
index 1cdc0d0fd32ebe..ef3758fee0cd57 100644
--- a/packages/block-library/src/post-featured-image/edit.js
+++ b/packages/block-library/src/post-featured-image/edit.js
@@ -183,7 +183,7 @@ function PostFeaturedImageDisplay( {
 		);
 	}
 
-	const label = __( 'Add a featured image' );
+	const label = __( 'Add image' );
 	const imageStyles = {
 		...borderProps.style,
 		height,
diff --git a/packages/block-library/src/site-logo/edit.js b/packages/block-library/src/site-logo/edit.js
index d84b5e6fbd6837..e8aa035df3d015 100644
--- a/packages/block-library/src/site-logo/edit.js
+++ b/packages/block-library/src/site-logo/edit.js
@@ -535,7 +535,7 @@ export default function LogoEdit( {
 		className: classes,
 	} );
 
-	const label = __( 'Add a site logo' );
+	const label = __( 'Add image' );
 
 	return (
 		<div { ...blockProps }>
diff --git a/packages/block-library/src/site-logo/editor.scss b/packages/block-library/src/site-logo/editor.scss
index e13fc68abc4c3e..a46307a999c398 100644
--- a/packages/block-library/src/site-logo/editor.scss
+++ b/packages/block-library/src/site-logo/editor.scss
@@ -5,6 +5,8 @@
 	margin-right: auto;
 }
 
+// Provide special styling for the placeholder.
+// @todo: this particular minimal style of placeholder could be componentized further.
 .wp-block-site-logo {
 	// Make the block selectable.
 	a {
@@ -28,11 +30,7 @@
 		height: auto;
 		max-width: 100%;
 	}
-}
 
-// Provide special styling for the placeholder.
-// @todo: this particular minimal style of placeholder could be componentized further.
-.wp-block-site-logo.wp-block-site-logo {
 	// Match the default logo size.
 	&.is-default-size .components-placeholder {
 		height: 120px;
@@ -73,7 +71,7 @@
 		}
 
 		// Style the upload button.
-		.components-button.components-button {
+		.components-button {
 			padding: 0;
 			display: flex;
 			justify-content: center;
diff --git a/packages/components/src/placeholder/style.scss b/packages/components/src/placeholder/style.scss
index 9f5db03711dc7e..6b1cfddca13258 100644
--- a/packages/components/src/placeholder/style.scss
+++ b/packages/components/src/placeholder/style.scss
@@ -241,3 +241,21 @@
 	stroke: currentColor;
 	opacity: 0.25;
 }
+
+// Styles when the 'show button text labels' preference is enabled.
+.show-icon-labels {
+	.block-editor-media-placeholder .components-button.has-icon {
+		width: auto;
+		padding: 0 $grid-unit-10;
+		border-radius: 0;
+
+		svg {
+			display: none;
+		}
+
+		&::after {
+			content: attr(aria-label);
+			font-size: $helptext-font-size;
+		}
+	}
+}
diff --git a/packages/components/src/toolbar-group/style.scss b/packages/components/src/toolbar-group/style.scss
index cf055791271ae6..029458cfe9f461 100644
--- a/packages/components/src/toolbar-group/style.scss
+++ b/packages/components/src/toolbar-group/style.scss
@@ -5,8 +5,12 @@
 	display: inline-flex;
 	flex-shrink: 0;
 	flex-wrap: wrap;
-	padding-left: $grid-unit-15 * 0.5; // 6px.
-	padding-right: $grid-unit-15 * 0.5;
+
+	// Consistent padding for all immediate children of the group.
+	> * {
+		padding-left: $grid-unit-15 * 0.5; // 6px.
+		padding-right: $grid-unit-15 * 0.5;
+	}
 
 	// Unset for nested toolbar groups. Increase specificity.
 	& .components-toolbar-group.components-toolbar-group {