diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php
index d8ebb7942d..788e7180b2 100644
--- a/src/wp-admin/admin-header.php
+++ b/src/wp-admin/admin-header.php
@@ -200,6 +200,10 @@ if ( $current_screen->is_block_editor() ) {
 	}
 }
 
+if ( wp_is_recovery_mode() ) {
+	$admin_body_class .= ' recovery-mode';
+}
+
 ?>
 </head>
 <?php
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 868978d55f..82a7b5a5b1 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -3683,7 +3683,7 @@ img {
 
 @media screen and (max-width: 782px) {
 	html.wp-toolbar {
-		padding-top: 46px;
+		padding-top: 0;
 	}
 
 	.screen-reader-shortcut:focus {
@@ -3699,6 +3699,22 @@ img {
 		-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
 	}
 
+	#wpadminbar #wp-admin-bar-recovery-mode {
+		display: block;
+		left: 50px;
+		position: absolute;
+		right: 50px;
+		top: 0;
+	}
+
+	#wpadminbar #wp-admin-bar-recovery-mode a {
+		padding: 0 15px;
+	}
+
+	#wpbody {
+		padding-top: 46px;
+	}
+
 	#wpcontent {
 		position: relative;
 		margin-left: 0;
@@ -3982,18 +3998,10 @@ img {
 		overflow-x: hidden;
 	}
 
-	html.wp-toolbar {
-		padding-top: 0;
-	}
-
 	.screen-reader-shortcut:focus {
 		top: 7px;
 	}
 
-	#wpbody {
-		padding-top: 46px;
-	}
-
 	/* Keep full-width boxes on Edit Post page from causing horizontal scroll */
 	div#post-body.metabox-holder.columns-1 {
 		overflow-x: hidden;
diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index 295fbec07e..12c7ad4bbe 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -1097,7 +1097,8 @@ html:lang(he-il) .rtl #wpadminbar * {
 }
 
 /* Smartphone */
-@media screen and (max-width: 600px) {
+@media screen and (max-width: 782px) {
+
 	#wpadminbar {
 		position: absolute;
 	}