diff --git a/includes/templates/Header.mustache b/includes/templates/Header.mustache
index 29060c5c..bf00f65f 100644
--- a/includes/templates/Header.mustache
+++ b/includes/templates/Header.mustache
@@ -2,20 +2,18 @@
 	string msg-citizen-header-menu-toggle tooltip for menu toggle
 	string msg-citizen-header-search-toggle tooltip for search toggle
 }}
-<header class="mw-header-container" id="mw-navigation">
-	<div class="mw-header-icons">
-		<div class="mw-header-menu mw-header-end">
-			<input type="checkbox" role="button" title="{{msg-citizen-header-menu-toggle}}" />
-			<div class="mw-header-menu-toggle">
-				<span></span>
-				<span></span>
-				<span></span>
-			</div>
-			{{#data-menu}}{{>Menu}}{{/data-menu}}
+<header class="mw-header">
+	<div class="mw-header-menu mw-header-end">
+		<input type="checkbox" role="button" title="{{msg-citizen-header-menu-toggle}}" />
+		<div class="mw-header-menu-toggle">
+			<span></span>
+			<span></span>
+			<span></span>
 		</div>
+		{{#data-menu}}{{>Menu}}{{/data-menu}}
 	</div>
 	<div class="mw-header-icons">
-		<div class="mw-header" id="user-icons">
+		<div id="user-icons">
 			{{#data-extratools}}{{>Portal}}{{/data-extratools}}
 		</div>
 		<div class="mw-header-end" id="site-search">
diff --git a/resources/components/darkmode.less b/resources/components/darkmode.less
index ff9c7dd9..1774763f 100644
--- a/resources/components/darkmode.less
+++ b/resources/components/darkmode.less
@@ -198,7 +198,7 @@
 		}
 	}
 
-	.mw-header-container:before {
+	.mw-header:before {
 		box-shadow: 0 0 50px @header-height @dark-bg-0;
 	}
 
diff --git a/resources/components/navigation.less b/resources/components/navigation.less
index 00ce45db..85cedbd9 100644
--- a/resources/components/navigation.less
+++ b/resources/components/navigation.less
@@ -7,7 +7,7 @@
  * Header
 */
 
-.mw-header-container {
+.mw-header {
 	position: fixed;
 	z-index: 10;
 	top: 0;
diff --git a/skinStyles/extensions/VisualEditor/ext.visualEditor.core.less b/skinStyles/extensions/VisualEditor/ext.visualEditor.core.less
index 60de6e91..78f0096e 100644
--- a/skinStyles/extensions/VisualEditor/ext.visualEditor.core.less
+++ b/skinStyles/extensions/VisualEditor/ext.visualEditor.core.less
@@ -6,7 +6,7 @@
 @import '../../../resources/variables.less';
 
 .ve-activated {
-	.mw-header-container {
+	.mw-header {
 		background-color: #fff;
 
 		&:before {