diff --git a/resources/skins.vector.styles/components/MenuTabs.less b/resources/skins.vector.styles/components/MenuTabs.less
index 4c66db42..0cad6b6d 100644
--- a/resources/skins.vector.styles/components/MenuTabs.less
+++ b/resources/skins.vector.styles/components/MenuTabs.less
@@ -93,9 +93,9 @@
 		.mw-list-item {
 			.mw-ui-icon {
 				// Align small icons with the bottom of the tabs.
-				// Height of tab is 38px, and small icon is 32px,
-				// With 2px border, 38 - 32 + 2
-				margin: 8px 0 0 0;
+				// Height of tab is 41px, and small icon is 36px,
+				// With 1px border, 41 - 36 + 1;
+				margin: 4px 0 0 0;
 			}
 		}
 	}
diff --git a/resources/skins.vector.styles/components/StickyHeader.less b/resources/skins.vector.styles/components/StickyHeader.less
index 8817b2a7..d8e52183 100644
--- a/resources/skins.vector.styles/components/StickyHeader.less
+++ b/resources/skins.vector.styles/components/StickyHeader.less
@@ -42,10 +42,6 @@
 	&-context-bar {
 		display: flex;
 		align-items: center;
-
-		.vector-feature-visual-enhancement-next-enabled & {
-			column-gap: 8px;
-		}
 	}
 
 	&-start {
diff --git a/resources/skins.vector.styles/components/UserLinks.less b/resources/skins.vector.styles/components/UserLinks.less
index 2492d5d3..94c83791 100644
--- a/resources/skins.vector.styles/components/UserLinks.less
+++ b/resources/skins.vector.styles/components/UserLinks.less
@@ -66,16 +66,12 @@
 /**
  * Horizontal links menu - logged in and logged out.
  */
+// TODO: Remove vector-user-menu-more after I371bb11903d8cdd8f0da89266fcf549050c0da8c has been in prod for a week
+.vector-user-menu-more,
 .vector-user-menu-overflow {
-	margin-right: 8px;
-
 	.vector-menu-content-list {
 		display: flex;
 		align-items: center;
-
-		.vector-feature-visual-enhancement-next-enabled & {
-			column-gap: 8px;
-		}
 	}
 
 	// Add margin to links that don't have the .mw-ui-button or related icon classes.