diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 67db140..df57f82 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -28,12 +28,12 @@
 		<main id="content" class="mw-body">
 			{{#hasheadingholder}}
 			{{{prebodyhtml}}}
-			<div class="pre-content heading-holder {{^haspageactions}}heading-holder--no-page-actions{{/haspageactions}}">
-				{{{pageactionshtml}}}
+			<div class="pre-content heading-holder heading-holder--new">
 				{{{headinghtml}}}
 				{{{taglinehtml}}}
 				{{{postheadinghtml}}}
 				{{{subtitle}}}
+				{{{pageactionshtml}}}
 				{{{internalBanner}}}
 			</div>
 			{{/hasheadingholder}}
diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less
index f2f323f..1ed5b3b 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -4,17 +4,30 @@
 .heading-holder {
 	@pageActionsGutter: 0.5em;
 	@pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
+	// FIXME: padding-bottom can be removed when work on T212216
+	// has been deployed and varnish cache cleared.
 	padding: @titleSectionSpacingTop 0 (@pageActionsHeight + @pageActionsGutter);
 	position: relative;
 
+	// FIXME: Can be made default when work on T212216
+	// has been deployed and varnish cache cleared.
+	&--new {
+		padding-bottom: 0;
+	}
+	// FIXME: Can be removed when work on T212216
+	// has been deployed and varnish cache cleared.
 	&--no-page-actions {
 		padding-bottom: @pageActionsGutter;
+
+		&--new {
+			padding-bottom: 0;
+		}
 	}
 
 	.tagline {
 		color: @colorGray5;
 		font-size: 0.85em;
-		margin: 2px 0 0;
+		margin: 2px 0 12px;
 	}
 }
 
@@ -29,9 +42,8 @@
 	float: none;
 	border: 0;
 	overflow: hidden;
-	position: absolute;
-	bottom: 0;
 	width: 100%;
+	margin-top: -2px;
 	border-top: 1px solid @colorGray14;
 	border-bottom: 1px solid @colorGray12;
 	padding: 0.5em 0;
@@ -78,6 +90,13 @@
 	}
 }
 
+// FIXME: cached HTML. Can be removed when work on T212216
+// has been deployed and varnish cache cleared.
+.heading-holder #page-actions:first-child {
+	position: absolute;
+	bottom: 0;
+}
+
 // Watchstar is hidden for anonymous no-js users
 // While we could link the icon to the login/signup form, this is not
 // a perfect experience and could be confusing.