diff --git a/mobile.less/mobile.variables.less b/mobile.less/mobile.variables.less
index a12be5fda8..c06ee087c4 100644
--- a/mobile.less/mobile.variables.less
+++ b/mobile.less/mobile.variables.less
@@ -43,10 +43,5 @@
 // background color for help screens/tutorials
 @colorTutorial: #2e76ff;
 
-// TODO: Can these be made to use core variables (or swapped out for some)?
-@colorErrorBackground: #fae3e3;
-@colorSuccessBackground: #e1fddf;
-@colorSuccessText: #009000;
-
 // FIXME: To be moved to includes/Config in a follow up patch.
 @wgMFDeviceWidthDesktop: 62.5em; // 1000px / 16 px;
diff --git a/resources/mobile.messageBox.styles/messageBox.less b/resources/mobile.messageBox.styles/messageBox.less
index dac9148c5c..ca91306fcb 100644
--- a/resources/mobile.messageBox.styles/messageBox.less
+++ b/resources/mobile.messageBox.styles/messageBox.less
@@ -13,11 +13,6 @@
 	color: @colorGray2;
 }
 
-.successbox {
-	color: @colorSuccessText;
-	background: @colorSuccessBackground;
-}
-
 // Necessary for fallback editor preview.
 .previewnote p,
 .successbox,
@@ -29,6 +24,16 @@
 	margin: 0 0 1em;
 }
 
+.errorbox {
+	background-color: @backgroundColorError;
+	color: @colorTextEmphasized;
+}
+
+.successbox {
+	background-color: @backgroundColorSuccess;
+	color: @colorTextEmphasized;
+}
+
 .successbox,
 .errorbox,
 .warningbox,
@@ -44,12 +49,3 @@
 		margin-bottom: 1em;
 	}
 }
-
-.errorbox {
-	/**
-	 * @wmui-color-red90 from wikimedia-ui-base.less
-	 * https://phabricator.wikimedia.org/source/wikimedia-ui-base/browse/master/wikimedia-ui-base.less
-	 */
-	background-color: #fee7e6;
-	color: @colorErrorText;
-}
diff --git a/resources/mobile.special.styles/common.less b/resources/mobile.special.styles/common.less
index bc9cdab616..5db723140e 100644
--- a/resources/mobile.special.styles/common.less
+++ b/resources/mobile.special.styles/common.less
@@ -4,8 +4,8 @@
 // used in Special:Nearby and Special:UserLogin
 .errorbox,
 .error {
-	color: @colorErrorText;
-	background: @colorErrorBackground;
+	background: @backgroundColorError;
+	color: @colorError;
 }
 
 .mw-ui-button-group,
diff --git a/resources/mobile.talk.overlays/talk.less b/resources/mobile.talk.overlays/talk.less
index e7722b7210..66bb6ccc4b 100644
--- a/resources/mobile.talk.overlays/talk.less
+++ b/resources/mobile.talk.overlays/talk.less
@@ -4,7 +4,7 @@
 	// src/mobile.talk.overlays/TalkSectionOverlay.js
 	// Could this be generalised? e.g. MessageBox
 	.error {
-		border: 1px solid @colorErrorText;
+		border: 1px solid @borderColorError;
 	}
 
 	// src/mobile.talk.overlays/TalkSectionOverlay.js