diff --git a/packages/edit-site/src/components/site-icon/style.scss b/packages/edit-site/src/components/site-icon/style.scss
index 126127877f3378..6f140eede7ac4b 100644
--- a/packages/edit-site/src/components/site-icon/style.scss
+++ b/packages/edit-site/src/components/site-icon/style.scss
@@ -8,10 +8,6 @@
 		padding: $grid-unit-15;
 	}
 
-	// Add focus-visible styles
-	button[data-focus-visible="true"] & {
-		border: 2px solid #1e90ff;
-	}
 }
 
 .edit-site-site-icon__image {
@@ -25,8 +21,12 @@
 		border-radius: 0;
 	}
 
-	// Add focus-visible styles
-	button[data-focus-visible="true"] & {
-		border: 2px solid #1e90ff;
+}
+
+/* Apply focus border to both the site icon and image when the button is focused */
+button:focus {
+	.edit-site-site-icon__icon,
+	.edit-site-site-icon__image {
+		border: var(--wp-admin-border-width-focus) solid var(--wp-admin-theme-color);
 	}
 }