diff --git a/src/wp-admin/css/admin-menu.css b/src/wp-admin/css/admin-menu.css
index 424d44d106..a3d8f4f262 100644
--- a/src/wp-admin/css/admin-menu.css
+++ b/src/wp-admin/css/admin-menu.css
@@ -167,12 +167,10 @@
 #adminmenu .wp-submenu a {
 	color: #b4b9be;
 	color: rgba(240, 245, 250, 0.7);
-	display: flex;
 	font-size: 13px;
 	line-height: 1.4;
 	margin: 0;
 	padding: 5px 0;
-	word-break: break-word;
 }
 
 #adminmenu .wp-submenu a:hover,
@@ -339,9 +337,7 @@
 }
 
 #adminmenu div.wp-menu-name {
-	display: flex;
 	padding: 8px 0;
-	word-break: break-word;
 }
 
 #adminmenu div.wp-menu-image {
@@ -512,17 +508,14 @@ ul#adminmenu > li.current > a.current:after {
 }
 
 /* @todo: consider to use a single rule for these counters and the list table comments counters. */
-#adminmenu .wp-submenu a > span,
-#adminmenu .wp-menu-name > span {
-	margin: 0px 1px -1px 5px;
-}
-
-#adminmenu .wp-submenu a > span > span,
-#adminmenu .wp-menu-name > span > span,
-#adminmenu .wp-submenu-head > span > span{
+#adminmenu .awaiting-mod,
+#adminmenu .update-plugins {
 	display: inline-block;
-	min-width: 8px;
+	vertical-align: top;
+	box-sizing: border-box;
+	margin: 1px 0 -1px 2px;
 	padding: 0 5px;
+	min-width: 18px;
 	height: 18px;
 	border-radius: 9px;
 	background-color: #ca4a1f;
@@ -530,9 +523,13 @@ ul#adminmenu > li.current > a.current:after {
 	font-size: 11px;
 	line-height: 1.6;
 	text-align: center;
-	word-break: normal;
 	z-index: 26;
+}
 
+#adminmenu li.current a .awaiting-mod,
+#adminmenu li a.wp-has-current-submenu .update-plugins {
+	background-color: #ca4a1f;
+	color: #fff;
 }
 
 #adminmenu li span.count-0 {
@@ -695,7 +692,7 @@ li#wp-admin-bar-menu-toggle {
 	}
 
 	.auto-fold #adminmenu a.menu-top {
-		height: auto;
+		height: 34px;
 	}
 
 	.auto-fold #adminmenu li.wp-menu-open {