diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index b29123f131..adfda0c982 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1814,13 +1814,17 @@ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = fa
 			$details['type'] = 'success';
 		}
 
+		if ( in_array( $details['type'], array( 'error', 'success', 'warning', 'info' ) ) ) {
+			$details['type'] = 'notice-' . $details['type'];
+		}
+
 		$css_id    = sprintf(
 			'setting-error-%s',
-			sanitize_html_class( $details['code'] )
+			esc_attr( $details['code'] )
 		);
 		$css_class = sprintf(
-			'notice notice-%s settings-error is-dismissible',
-			sanitize_html_class( $details['type'] )
+			'notice %s settings-error is-dismissible',
+			esc_attr( $details['type'] )
 		);
 
 		$output .= "<div id='$css_id' class='$css_class'> \n";
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 35515645ac..01612d255e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45872';
+$wp_version = '5.3-alpha-45873';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.