diff --git a/includes/templates/Header.mustache b/includes/templates/Header.mustache
index 9d66ee636..405447db9 100644
--- a/includes/templates/Header.mustache
+++ b/includes/templates/Header.mustache
@@ -2,7 +2,7 @@
 	<div class="vector-header-start">
 		<label
 			id="mw-sidebar-button"
-			class="mw-checkbox-hack-button mw-ui-icon mw-ui-button mw-ui-quiet mw-ui-icon-element"
+			class="mw-checkbox-hack-button mw-ui-icon mw-ui-button mw-ui-quiet mw-ui-icon-element mw-ui-icon-flush-right"
 			for="mw-sidebar-checkbox"
 			role="button"
 			aria-controls="mw-panel"
diff --git a/resources/common/variables.less b/resources/common/variables.less
index 706ddf735..255bbee91 100644
--- a/resources/common/variables.less
+++ b/resources/common/variables.less
@@ -135,6 +135,7 @@
 @padding-dropdown-menu-item: 0 12px;
 
 // Menu button
+// Delete this variable when VisualEnhancementNext flag is enabled everywhere
 @margin-horizontal-sidebar-button-icon: unit( 12px / @font-size-browser, em ); // 0.75em @ 16
 
 // Main menu
diff --git a/resources/skins.vector.styles/components/Header.less b/resources/skins.vector.styles/components/Header.less
index 05c5ecc49..cc6d39a33 100644
--- a/resources/skins.vector.styles/components/Header.less
+++ b/resources/skins.vector.styles/components/Header.less
@@ -27,7 +27,9 @@
 	}
 
 	#mw-sidebar-button {
-		margin-right: @margin-horizontal-sidebar-button-icon; // Accidentally the same.
+		.vector-feature-visual-enhancement-next-disabled & {
+			margin-right: @margin-horizontal-sidebar-button-icon;
+		}
 	}
 
 	.vector-header-start,
diff --git a/resources/skins.vector.styles/components/Logo.less b/resources/skins.vector.styles/components/Logo.less
index 6531b28ba..e9d2b0a47 100644
--- a/resources/skins.vector.styles/components/Logo.less
+++ b/resources/skins.vector.styles/components/Logo.less
@@ -2,6 +2,11 @@
 @import 'mediawiki.mixins.less';
 
 .mw-logo {
+	.vector-feature-visual-enhancement-next-enabled & {
+		// The logo is 24px from the main menu button icon
+		margin-left: 24px;
+	}
+
 	.flex-display();
 	// If icon is not configured, ensure that the logo still takes up available
 	// space allocated by layout.