diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index fb6986e7ecbed..39e59f94da71d 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -77,10 +77,18 @@ html:lang(he-il) .rtl #wpadminbar * {
 	box-shadow: none;
 }
 
-#wpadminbar a:focus {
+#wpadminbar a:focus,
+#wpadminbar .ab-item[tabindex="0"]:focus {
 	outline-offset: -1px;
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
+	box-shadow: inset 0 -4px 0 0 currentColor;
+	transition: box-shadow .1s linear;
+}
+
+#wpadminbar .ab-submenu a:focus,
+#wpadminbar .ab-submenu .ab-item[tabindex="0"]:focus {
+	box-shadow: inset 4px 0 0 0 currentColor;
 }
 
 #wpadminbar {
@@ -379,11 +387,6 @@ html:lang(he-il) .rtl #wpadminbar * {
 	float: right;
 }
 
-#wpadminbar ul li:last-child,
-#wpadminbar ul li:last-child .ab-item {
-	box-shadow: none;
-}
-
 /**
  * Recovery Mode
  */
@@ -452,7 +455,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wp-admin-bar-user-info .avatar {
 	position: absolute;
 	left: -72px;
-	top: 4px;
+	top: 0;
 	width: 64px;
 	height: 64px;
 }
@@ -460,12 +463,14 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wpadminbar #wp-admin-bar-user-info a {
 	background: none;
 	height: auto;
+	position: relative;
+	top: 4px;
 }
 
 #wpadminbar #wp-admin-bar-user-info span {
 	background: none;
 	padding: 0;
-	height: 18px;
+	line-height: 1.38461538;
 }
 
 #wpadminbar #wp-admin-bar-user-info .display-name,