diff --git a/resources/common/components/Indicators.less b/resources/common/components/Indicators.less
index 98a3f7fd..ed85f9d6 100644
--- a/resources/common/components/Indicators.less
+++ b/resources/common/components/Indicators.less
@@ -4,6 +4,7 @@
 	font-size: @font-size-base;
 	line-height: @line-height-base;
 	position: relative;
+	float: right;
 }
 
 .mw-indicator {
diff --git a/resources/common/components/SiteNotice.less b/resources/common/components/SiteNotice.less
index 97f2c3e9..428556a8 100644
--- a/resources/common/components/SiteNotice.less
+++ b/resources/common/components/SiteNotice.less
@@ -1,6 +1,14 @@
 @import '../variables.less';
 
+/** element that wraps a notice that comes from wiki page */
+#localNotice {
+	margin-bottom: 0.9em;
+}
+
 /* Site Notice (includes notices from CentralNotice extension) */
 #siteNotice {
 	font-size: @font-size-site-notice;
+	margin: @grid-row-gap 0;
+	position: relative;
+	text-align: center;
 }
diff --git a/resources/skins.vector.styles/layouts/screen.less b/resources/skins.vector.styles/layouts/screen.less
index 7a6e7c1a..f0f05da6 100644
--- a/resources/skins.vector.styles/layouts/screen.less
+++ b/resources/skins.vector.styles/layouts/screen.less
@@ -80,26 +80,24 @@ body {
 	float: right;
 }
 
-#siteNotice {
-	// Override core styles to ensure sufficient spacing between page content and main menu
-	margin: @grid-row-gap 0 !important; /* stylelint-disable-line declaration-no-important */
-}
-
 .vector-body {
 	position: relative;
 	z-index: @z-index-base;
 
 	#siteSub {
+		// By default its hidden as it was hidden in Vector legacy but site styles can reveal.
+		display: none;
 		margin-top: 8px; // T311564
 	}
 
 	#contentSub,
 	#contentSub2 {
-		// T311564: Override core styles to apply margin-top rather than margin-bottom
-		margin-top: 8px;
-		margin-bottom: 0;
-		// T307715: Override core styles to align with page title and #siteSub
-		margin-left: 0;
+		font-size: 84%;
+		line-height: 1.2em;
+		// T311564
+		margin: 8px 0 0;
+		color: #54595d;
+		width: auto;
 	}
 }
 
diff --git a/skin.json b/skin.json
index bf0e4020..d656e1bc 100644
--- a/skin.json
+++ b/skin.json
@@ -235,9 +235,14 @@
 				"content-links-external": false,
 				"content-media": true,
 				"content-tables": true,
-				"interface": true,
-				"interface-message-box": true,
+				"interface": false,
 				"interface-category": true,
+				"interface-edit-section-links": true,
+				"interface-indicators": false,
+				"interface-message-box": true,
+				"interface-site-notice": false,
+				"interface-subtitle": false,
+				"interface-user-message": true,
 				"i18n-ordered-lists": true,
 				"i18n-all-lists-margins": true,
 				"i18n-headings": true,