diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php
index 6496c824c9b10..75c0865b1f8eb 100644
--- a/src/wp-admin/customize.php
+++ b/src/wp-admin/customize.php
@@ -288,7 +288,7 @@
 							$class .= ' active';
 						}
 						?>
-						<button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ); ?>" data-device="<?php echo esc_attr( $device ); ?>">
+						<button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo $active ? 'true' : 'false'; ?>" data-device="<?php echo esc_attr( $device ); ?>">
 							<span class="devices__preview-label"><?php echo esc_html( $settings['label'] ); ?></span>
 						</button>
 					<?php endforeach; ?>
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index 6a9a6d2f3812d..c1efa0c063c58 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -190,7 +190,7 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 			data-choose-text="<?php esc_attr_e( 'Choose a Site Icon' ); ?>"
 			data-update-text="<?php esc_attr_e( 'Change Site Icon' ); ?>"
 			data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"
-			data-state="<?php echo esc_attr( has_site_icon() ); ?>"
+			data-state="<?php echo has_site_icon() ? '1' : ''; ?>"
 
 		>
 			<?php if ( has_site_icon() ) : ?>
diff --git a/tests/phpstan/baselines/argument.type.neon b/tests/phpstan/baselines/argument.type.neon
index da71134bcaf34..745a79986da89 100644
--- a/tests/phpstan/baselines/argument.type.neon
+++ b/tests/phpstan/baselines/argument.type.neon
@@ -43,11 +43,6 @@ parameters:
 			identifier: argument.type
 			count: 2
 			path: ../../../src/wp-admin/comment.php
-		-
-			message: '#^Parameter \#1 \$text of function esc_attr expects float\|int\|string, bool given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../src/wp-admin/customize.php
 		-
 			message: '#^Parameter \#1 \$position of function wp_comment_reply expects int, string given\.$#'
 			identifier: argument.type
@@ -448,11 +443,6 @@ parameters:
 			identifier: argument.type
 			count: 1
 			path: ../../../src/wp-admin/network/site-users.php
-		-
-			message: '#^Parameter \#1 \$text of function esc_attr expects float\|int\|string, bool given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../src/wp-admin/options-general.php
 		-
 			message: '#^Parameter \#2 \$callback of function array_filter expects \(callable\(mixed\)\: bool\)\|null, ''validate_file'' given\.$#'
 			identifier: argument.type