diff --git a/src/js/_enqueues/wp/updates.js b/src/js/_enqueues/wp/updates.js
index ff8cb07e96..761f31fdd2 100644
--- a/src/js/_enqueues/wp/updates.js
+++ b/src/js/_enqueues/wp/updates.js
@@ -2719,7 +2719,7 @@
 			}
 
 			// Clear any previous errors.
-			$parent.find( '.notice.error' ).addClass( 'hidden' );
+			$parent.find( '.notice.notice-error' ).addClass( 'hidden' );
 
 			// Show loading status.
 			if ( 'enable' === action ) {
@@ -2752,7 +2752,7 @@
 							errorMessage = __( 'The request could not be completed.' );
 						}
 
-						$parent.find( '.notice.error' ).removeClass( 'hidden' ).find( 'p' ).text( errorMessage );
+						$parent.find( '.notice.notice-error' ).removeClass( 'hidden' ).find( 'p' ).text( errorMessage );
 						wp.a11y.speak( errorMessage, 'polite' );
 						return;
 					}
@@ -2808,7 +2808,7 @@
 					$document.trigger( 'wp-auto-update-setting-changed', { state: action, type: type, asset: asset } );
 				} )
 				.fail( function() {
-					$parent.find( '.notice.error' )
+					$parent.find( '.notice.notice-error' )
 						.removeClass( 'hidden' )
 						.find( 'p' )
 						.text( __( 'The request could not be completed.' ) );
diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
index 8c039ec767..96b738608d 100644
--- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -775,7 +775,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		 */
 		echo apply_filters( 'theme_auto_update_setting_html', $html, $stylesheet, $theme );
 
-		echo '<div class="auto-updates-error inline notice error hidden"><p></p></div>';
+		echo '<div class="notice notice-error notice-alt inline hidden"><p></p></div>';
 	}
 
 	/**
diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
index 0ac1719bec..ee5833aba1 100644
--- a/src/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugins-list-table.php
@@ -1096,7 +1096,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					 */
 					echo apply_filters( 'plugin_auto_update_setting_html', $html, $plugin_file, $plugin_data );
 
-					echo '<div class="inline notice error hidden"><p></p></div>';
+					echo '<div class="notice notice-error notice-alt inline hidden"><p></p></div>';
 					echo '</td>';
 
 					break;
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index b6551fcbc9..fa442bb5e2 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -559,7 +559,7 @@ if ( ! is_multisite() && $broken_themes ) {
  */
 function wp_theme_auto_update_setting_template() {
 	$template = '
-		<p class="theme-autoupdate">
+		<div class="theme-autoupdate">
 			<# if ( data.autoupdate ) { #>
 				<a href="{{{ data.actions.autoupdate }}}" class="toggle-auto-update" data-slug="{{ data.id }}" data-wp-action="disable">
 					<span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span>
@@ -579,8 +579,8 @@ function wp_theme_auto_update_setting_template() {
 				<# } #>
 				<br />' . wp_get_auto_update_message() . '</span>
 			<# } #>
-			<span class="auto-updates-error hidden"><p></p></span>
-		</p>
+			<div class="notice notice-error notice-alt inline hidden"><p></p></div>
+		</div>
 	';
 
 	/**