diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less
index eb39afcfe..8ae028f5d 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -30,19 +30,16 @@ main {
 	display: block;
 }
 
-// FIXME: should we use .mw-body here instead?
-// stylelint-disable selector-max-id
-#content {
+.mw-body {
 	// avoid margin collapsing (see T147956)
 	border-top: 1px solid transparent;
 	padding-bottom: 32px;
 }
 
 .overlay-enabled,
-#content {
+.mw-body {
 	background-color: @skinContentBgColor;
 }
-// stylelint-enable selector-max-id
 
 .header-container {
 	border-bottom: 1px solid @colorGray12;
diff --git a/skinStyles/mobile.special.mobileoptions.styles/minerva.less b/skinStyles/mobile.special.mobileoptions.styles/minerva.less
index a162ccc8a..e01dd00dd 100644
--- a/skinStyles/mobile.special.mobileoptions.styles/minerva.less
+++ b/skinStyles/mobile.special.mobileoptions.styles/minerva.less
@@ -1,6 +1,5 @@
 @import '../../minerva.less/minerva.variables.less';
 
-// stylelint-disable selector-max-id
 @media all and ( min-width: @width-breakpoint-tablet ) {
 	.ns-special .pre-content {
 		background: #fff;
@@ -12,7 +11,7 @@
 		}
 	}
 
-	.ns-special #content {
+	.ns-special .mw-body {
 		background: @colorGray14;
 
 		form {
@@ -21,6 +20,7 @@
 	}
 }
 
+// stylelint-disable selector-max-id
 #mobile-options &.indicator-circle {
 	overflow: initial;
 
diff --git a/skinStyles/mobile.special.styles/minerva.less b/skinStyles/mobile.special.styles/minerva.less
index 1dfcd5e8b..eaf5af08c 100644
--- a/skinStyles/mobile.special.styles/minerva.less
+++ b/skinStyles/mobile.special.styles/minerva.less
@@ -16,7 +16,7 @@
 }
 
 .ns-special {
-	#content #section_0 { // stylelint-disable-line selector-max-id
+	.mw-body #section_0 { // stylelint-disable-line selector-max-id
 		font-size: 1.5em;
 		font-weight: bold;
 	}