diff --git a/resources/common/variables.less b/resources/common/variables.less
index f99822b3..bc4f5fb1 100644
--- a/resources/common/variables.less
+++ b/resources/common/variables.less
@@ -130,16 +130,12 @@
 // Menu button
 @margin-horizontal-sidebar-button-icon: unit( 12px / @font-size-browser, em ); // 0.75em @ 16
 
-// Main menu
-@selector-main-menu-open: ~'#mw-sidebar-checkbox:checked';
-@selector-main-menu-closed: ~'#mw-sidebar-checkbox:not( :checked )';
-
 // Sidebar
-@width-sidebar-px: 220px;
-@width-sidebar-px-wide: 244px;
-
-// TOC
 @sidebar-toc-selector: ~'.mw-table-of-contents-container .sidebar-toc';
+@width-sidebar-px: 220;
+@width-sidebar-px-wide: 244;
+@margin-toc-start-content: unit( ( @width-sidebar-px + 24 ) / @font-size-browser, em );
+@margin-toc-start-content-wide: unit( ( @width-sidebar-px-wide + 52 ) / @font-size-browser, em ); // 18.5em;
 
 // Search
 @max-width-search: unit( 500px / @font-size-browser / @font-size-base, em ); // 35.71428571em @ 16 & 0.875em T270202
diff --git a/resources/skins.vector.styles/components/Sidebar.less b/resources/skins.vector.styles/components/Sidebar.less
index 42592b1f..62f4bfc4 100644
--- a/resources/skins.vector.styles/components/Sidebar.less
+++ b/resources/skins.vector.styles/components/Sidebar.less
@@ -55,7 +55,7 @@
 	}
 
 	// Hide sidebar entirely when the checkbox is disabled
-	@{selector-main-menu-closed} ~ .vector-sidebar-container & {
+	#mw-sidebar-checkbox:not( :checked ) ~ .vector-sidebar-container & {
 		display: none;
 	}
 
@@ -111,7 +111,7 @@
 		/* @embed */
 		background-image: url( images/chevronHorizontal-ltr.svg );
 
-		@{selector-main-menu-closed} ~ .mw-header & {
+		#mw-sidebar-checkbox:not( :checked ) ~ .mw-header & {
 			/* @embed */
 			background-image: url( images/menu.svg );
 		}
diff --git a/resources/skins.vector.styles/layouts/grid.less b/resources/skins.vector.styles/layouts/grid.less
index 5835ceff..bbf63ef6 100644
--- a/resources/skins.vector.styles/layouts/grid.less
+++ b/resources/skins.vector.styles/layouts/grid.less
@@ -120,9 +120,9 @@
 	}
 }
 
-.vector-toc-collapsed @{selector-main-menu-closed} {
-	& ~ .mw-content-container,
-	& ~ .mw-table-of-contents-container {
+.vector-toc-collapsed {
+	#mw-sidebar-checkbox:not( :checked ) ~ .mw-content-container,
+	#mw-sidebar-checkbox:not( :checked ) ~ .mw-table-of-contents-container {
 		.mixin-column-full-width();
 	}
 }
diff --git a/resources/skins.vector.styles/layouts/screen.less b/resources/skins.vector.styles/layouts/screen.less
index a1b3e16d..c0a95dfb 100644
--- a/resources/skins.vector.styles/layouts/screen.less
+++ b/resources/skins.vector.styles/layouts/screen.less
@@ -8,7 +8,7 @@
 @import '../../common/variables.less';
 @import 'mediawiki.mixins.less';
 
-@selector-sidebar-no-toc-sidebar-closed: ~'@{selector-main-menu-closed} ~ .vector-sidebar-container-no-toc';
+@selector-sidebar-no-toc-sidebar-closed: ~'#mw-sidebar-checkbox:not( :checked ) ~ .vector-sidebar-container-no-toc';
 
 // Content container