diff --git a/includes/templates/ArticleToolbar.mustache b/includes/templates/ArticleToolbar.mustache
index 0a8fa2fbe..79568f00e 100644
--- a/includes/templates/ArticleToolbar.mustache
+++ b/includes/templates/ArticleToolbar.mustache
@@ -6,7 +6,7 @@
 			{{#data-associated-pages}}{{>Menu}}{{/data-associated-pages}}
 			{{#data-variants}}{{>Menu}}{{/data-variants}}
 		</div>
-		<div id="right-navigation" class="vector-collapsible {{#data-views.is-empty}}{{#data-actions.is-empty}}right-navigation-empty{{/data-actions.is-empty}}{{/data-views.is-empty}}">
+		<div id="right-navigation" class="vector-collapsible">
 			{{#data-views}}{{>Menu}}{{/data-views}}
 			{{#data-actions}}{{>Menu}}{{/data-actions}}
 		</div>
diff --git a/includes/templates/ContentHeader.mustache b/includes/templates/ContentHeader.mustache
index d1e43cb2b..fd0d38152 100644
--- a/includes/templates/ContentHeader.mustache
+++ b/includes/templates/ContentHeader.mustache
@@ -2,7 +2,7 @@
     Content Header - Main <H1> title for all pages, with either the indicators or language selector.
     When language button is visible, indicators are placed in the ContentSubheader.mustache template instead.
 }}
-<header class="mw-body-header vector-page-titlebar">
+<header class="mw-body-header vector-page-titlebar{{#is-title-blank}} vector-page-titlebar-blank{{/is-title-blank}}">
 	{{#data-toc}}
 	<label
 		id="vector-toc-collapsed-button"
diff --git a/resources/skins.vector.styles/components/ArticleToolbar.less b/resources/skins.vector.styles/components/ArticleToolbar.less
index 30d97b286..d4f9b5685 100644
--- a/resources/skins.vector.styles/components/ArticleToolbar.less
+++ b/resources/skins.vector.styles/components/ArticleToolbar.less
@@ -5,7 +5,8 @@
 .mw-article-toolbar-container {
 	// clearfix for #left-navigation and #right-navigation
 	display: flow-root;
-	border-bottom: @border-bottom-tabs;
+	// Use box-shadow instead of border to allow border collapsing between titlebar and toolbar
+	box-shadow: 0 1px @border-color-base;
 
 	/* Targets #left-navigation and #right-navigation */
 	& > div {
diff --git a/resources/skins.vector.styles/components/ContentHeader.less b/resources/skins.vector.styles/components/ContentHeader.less
index 334579051..276711909 100644
--- a/resources/skins.vector.styles/components/ContentHeader.less
+++ b/resources/skins.vector.styles/components/ContentHeader.less
@@ -1,6 +1,13 @@
 .vector-page-titlebar {
 	display: flex;
-	border-bottom: 1px solid @border-color-base;
+	// Ensure language button or indicators are positioned to the right even when the title is hidden
+	justify-content: flex-end;
+	// Use box-shadow instead of border to allow border collapsing between titlebar and toolbar
+	box-shadow: 0 1px @border-color-base;
+
+	&-blank {
+		box-shadow: none;
+	}
 
 	.firstHeading {
 		flex-grow: 1;