diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index e7eadd7f6941d..be495568c89b7 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -1748,6 +1748,7 @@ body.full-overlay-active {
 	background: transparent;
 	border: none;
 	height: 45px;
+	min-width: 50px;
 	padding: 0 3px;
 	margin: 0 0 0 -4px;
 	box-shadow: none;
@@ -1767,9 +1768,9 @@ body.full-overlay-active {
 .wp-full-overlay-footer .devices button:before {
 	display: inline-block;
 	-webkit-font-smoothing: antialiased;
-	font: normal 20px/30px "dashicons";
+	font: normal 20px/20px "dashicons";
 	vertical-align: top;
-	margin: 3px 0;
+	margin: 0 0 -2px;
 	padding: 4px 8px;
 	color: #646970;
 }
@@ -1812,6 +1813,12 @@ body.full-overlay-active {
 	content: "\f470" / '';
 }
 
+.wp-full-overlay-footer .devices .devices__preview-label {
+	display: block;
+	font-size: 10px;
+	line-height: 1;
+}
+
 @media screen and (max-width: 1024px) {
 	.wp-full-overlay-footer .devices {
 		display: none;
diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php
index 257dbbe0d60a8..be4657918d565 100644
--- a/src/wp-admin/customize.php
+++ b/src/wp-admin/customize.php
@@ -275,7 +275,7 @@
 			</button>
 			<?php $previewable_devices = $wp_customize->get_previewable_devices(); ?>
 			<?php if ( ! empty( $previewable_devices ) ) : ?>
-			<div class="devices-wrapper">
+			<div class="devices-wrapper" role="group" aria-label="<?php echo esc_attr_x( 'Responsive Views', 'label for responsive previews group' ); ?>">
 				<div class="devices">
 					<?php foreach ( (array) $previewable_devices as $device => $settings ) : ?>
 						<?php
@@ -289,7 +289,7 @@
 						}
 						?>
 						<button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ); ?>" data-device="<?php echo esc_attr( $device ); ?>">
-							<span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
+							<span class="devices__preview-label"><?php echo esc_html( $settings['label'] ); ?></span>
 						</button>
 					<?php endforeach; ?>
 				</div>
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index d574a767cb8a6..cb1447e4cde5d 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -5044,14 +5044,14 @@ public function customize_pane_settings() {
 	public function get_previewable_devices() {
 		$devices = array(
 			'desktop' => array(
-				'label'   => __( 'Enter desktop preview mode' ),
+				'label'   => __( 'Desktop' ),
 				'default' => true,
 			),
 			'tablet'  => array(
-				'label' => __( 'Enter tablet preview mode' ),
+				'label' => __( 'Tablet' ),
 			),
 			'mobile'  => array(
-				'label' => __( 'Enter mobile preview mode' ),
+				'label' => __( 'Mobile' ),
 			),
 		);
 
diff --git a/tests/phpunit/tests/customize/manager.php b/tests/phpunit/tests/customize/manager.php
index 21bdd85eebac3..bedf0b39b3e95 100644
--- a/tests/phpunit/tests/customize/manager.php
+++ b/tests/phpunit/tests/customize/manager.php
@@ -3519,14 +3519,14 @@ public function test_get_previewable_devices() {
 		// The default devices list.
 		$default_devices = array(
 			'desktop' => array(
-				'label'   => __( 'Enter desktop preview mode' ),
+				'label'   => __( 'Desktop' ),
 				'default' => true,
 			),
 			'tablet'  => array(
-				'label' => __( 'Enter tablet preview mode' ),
+				'label' => __( 'Tablet' ),
 			),
 			'mobile'  => array(
-				'label' => __( 'Enter mobile preview mode' ),
+				'label' => __( 'Mobile' ),
 			),
 		);
 
@@ -3551,7 +3551,7 @@ public function test_get_previewable_devices() {
 	private function filtered_device_list() {
 		return array(
 			'custom-device' => array(
-				'label'   => __( 'Enter custom-device preview mode' ),
+				'label'   => __( 'Custom device' ),
 				'default' => true,
 			),
 		);
diff --git a/tests/qunit/fixtures/customize-settings.js b/tests/qunit/fixtures/customize-settings.js
index 74a35379d8f6d..9f5b838b02ba2 100644
--- a/tests/qunit/fixtures/customize-settings.js
+++ b/tests/qunit/fixtures/customize-settings.js
@@ -146,14 +146,14 @@ window._wpCustomizeSettings = {
 	},
 	'previewableDevices': {
 		'desktop': {
-			'label': 'Enter desktop preview mode',
+			'label': 'Desktop',
 			'default': true
 		},
 		'tablet': {
-			'label': 'Enter tablet preview mode'
+			'label': 'Tablet'
 		},
 		'mobile': {
-			'label': 'Enter mobile preview mode'
+			'label': 'Mobile'
 		}
 	},
 	initialClientTimestamp: 1506510531595,