diff --git a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
index c0b3dd9b93..47e0ac3533 100644
--- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
+++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
@@ -1461,13 +1461,13 @@ dt {
 	border: 3px solid #28303d;
 }
 
-.wp-block-navigation .wp-block-navigation__container {
-	background: #d1e4dd;
-	padding: 0;
+.wp-block-navigation [data-block] {
+	margin-top: revert;
+	margin-bottom: revert;
 }
 
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: 13px;
+.wp-block-navigation .wp-block-navigation__container {
+	background: #d1e4dd;
 }
 
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css
index 53aabc38f4..d2e772f7cb 100644
--- a/wp-content/themes/twentytwentyone/assets/css/ie.css
+++ b/wp-content/themes/twentytwentyone/assets/css/ie.css
@@ -3538,14 +3538,6 @@ dd {
 	border: 3px solid #28303d;
 }
 
-.wp-block-navigation .wp-block-navigation-link {
-	padding: 0;
-}
-
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: 13px;
-}
-
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 	font-size: 1.25rem;
@@ -3563,7 +3555,6 @@ dd {
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
 	border: none;
 	left: 0;
-	margin-left: 13px;
 	min-width: max-content;
 	opacity: 0;
 	padding: 0;
@@ -3571,22 +3562,10 @@ dd {
 	top: inherit;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
-	display: inline-block;
-	padding: 7px 13px;
-}
-
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
 	display: none;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
-.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
-	display: block;
-	opacity: 1;
-	visibility: visible;
-}
-
 .wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
 	background: #d1e4dd;
 	margin: 0;
diff --git a/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/wp-content/themes/twentytwentyone/assets/css/style-editor.css
index d6f1bd7819..9ff76a5234 100644
--- a/wp-content/themes/twentytwentyone/assets/css/style-editor.css
+++ b/wp-content/themes/twentytwentyone/assets/css/style-editor.css
@@ -1376,13 +1376,13 @@ dt {
 	border: calc(3 * var(--separator--height)) solid var(--global--color-border);
 }
 
-.wp-block-navigation .wp-block-navigation__container {
-	background: var(--global--color-background);
-	padding: 0;
+.wp-block-navigation [data-block] {
+	margin-top: revert;
+	margin-bottom: revert;
 }
 
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: var(--primary-nav--padding);
+.wp-block-navigation .wp-block-navigation__container {
+	background: var(--global--color-background);
 }
 
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss
index 028376dabb..38b4a7e550 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss
@@ -1,16 +1,16 @@
 .wp-block-navigation {
 
+	[data-block] {
+		margin-top: revert;
+		margin-bottom: revert;
+	}
+
 	.wp-block-navigation__container {
 		background: var(--global--color-background);
-		padding: 0;
 	}
 
 	.wp-block-navigation-link {
 
-		.wp-block-navigation-link__content {
-			padding: var(--primary-nav--padding);
-		}
-
 		.wp-block-navigation-link__label {
 			font-family: var(--primary-nav--font-family);
 			font-size: var(--primary-nav--font-size);
diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss
index 3e3b1ca348..d991e52cc3 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss
@@ -1,12 +1,6 @@
 .wp-block-navigation {
 
 	.wp-block-navigation-link {
-		padding: 0;
-
-		.wp-block-navigation-link__content {
-			padding: var(--primary-nav--padding);
-		}
-
 		.wp-block-navigation-link__label {
 			font-family: var(--primary-nav--font-family);
 			font-size: var(--primary-nav--font-size);
@@ -30,35 +24,16 @@
 			.wp-block-navigation__container {
 				border: none;
 				left: 0;
-				margin-left: var(--primary-nav--padding);
 				min-width: max-content;
 				opacity: 0;
 				padding: 0;
 				position: inherit;
 				top: inherit;
 
-				.wp-block-navigation-link {
-
-					.wp-block-navigation-link__content {
-						display: inline-block;
-						padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
-					}
-				}
-
 				.wp-block-navigation-link__submenu-icon {
 					display: none;
 				}
 			}
-
-			&:hover,
-			&:focus-within {
-
-				.wp-block-navigation__container {
-					display: block;
-					opacity: 1;
-					visibility: visible;
-				}
-			}
 		}
 
 		> .has-child {
diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css
index 5880cd2f05..58d5130f88 100644
--- a/wp-content/themes/twentytwentyone/style-rtl.css
+++ b/wp-content/themes/twentytwentyone/style-rtl.css
@@ -2711,14 +2711,6 @@ dd {
 	border: calc(3 * var(--separator--height)) solid var(--global--color-border);
 }
 
-.wp-block-navigation .wp-block-navigation-link {
-	padding: 0;
-}
-
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: var(--primary-nav--padding);
-}
-
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
 	font-family: var(--primary-nav--font-family);
 	font-size: var(--primary-nav--font-size);
@@ -2736,7 +2728,6 @@ dd {
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
 	border: none;
 	right: 0;
-	margin-right: var(--primary-nav--padding);
 	min-width: max-content;
 	opacity: 0;
 	padding: 0;
@@ -2744,22 +2735,10 @@ dd {
 	top: inherit;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
-	display: inline-block;
-	padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
-}
-
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
 	display: none;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
-.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
-	display: block;
-	opacity: 1;
-	visibility: visible;
-}
-
 .wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
 	background: var(--global--color-background);
 	margin: 0;
diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css
index 45600e20fc..07466eb094 100644
--- a/wp-content/themes/twentytwentyone/style.css
+++ b/wp-content/themes/twentytwentyone/style.css
@@ -2721,14 +2721,6 @@ dd {
 	border: calc(3 * var(--separator--height)) solid var(--global--color-border);
 }
 
-.wp-block-navigation .wp-block-navigation-link {
-	padding: 0;
-}
-
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: var(--primary-nav--padding);
-}
-
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
 	font-family: var(--primary-nav--font-family);
 	font-size: var(--primary-nav--font-size);
@@ -2746,7 +2738,6 @@ dd {
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
 	border: none;
 	left: 0;
-	margin-left: var(--primary-nav--padding);
 	min-width: max-content;
 	opacity: 0;
 	padding: 0;
@@ -2754,22 +2745,10 @@ dd {
 	top: inherit;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
-	display: inline-block;
-	padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
-}
-
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
 	display: none;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
-.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
-	display: block;
-	opacity: 1;
-	visibility: visible;
-}
-
 .wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
 	background: var(--global--color-background);
 	margin: 0;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 000e57106a..6ff4599286 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-alpha-55100';
+$wp_version = '6.2-alpha-55101';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.