Index: wp-content/themes/twentytwentyone/assets/css/ie-editor.css
===================================================================
--- wp-content/themes/twentytwentyone/assets/css/ie-editor.css	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/css/ie-editor.css	(working copy)
@@ -379,6 +379,10 @@
 	background-color: #f1f1f1;
 }
 
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+	background: none;
+}
+
 .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) img {
 	outline: 2px dotted #28303d;
 }
Index: wp-content/themes/twentytwentyone/assets/css/ie.css
===================================================================
--- wp-content/themes/twentytwentyone/assets/css/ie.css	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/css/ie.css	(working copy)
@@ -2222,6 +2222,10 @@
 	background-color: #f1f1f1;
 }
 
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+	background: none;
+}
+
 .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) img {
 	outline: 2px dotted #28303d;
 }
@@ -5553,15 +5557,6 @@
 	line-height: 1.4;
 }
 
-a.custom-logo-link {
-	text-decoration: none;
-}
-
-.has-background-white a.custom-logo-link:focus,
-.is-dark-theme a.custom-logo-link:focus {
-	background: none;
-}
-
 .site-title > a {
 	text-decoration-color: #39414d;
 }
Index: wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css
===================================================================
--- wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/css/style-dark-mode-rtl.css	(working copy)
@@ -24,6 +24,11 @@
 		text-decoration: none;
 	}
 
+	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus,
+	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav.custom-logo-link:focus {
+		background: none;
+	}
+
 	.is-dark-theme.is-dark-theme img {
 		filter: brightness(0.85) contrast(1.1);
 	}
Index: wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css
===================================================================
--- wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/css/style-dark-mode.css	(working copy)
@@ -24,6 +24,11 @@
 		text-decoration: none;
 	}
 
+	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus,
+	.is-dark-theme.is-dark-theme .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) .meta-nav.custom-logo-link:focus {
+		background: none;
+	}
+
 	.is-dark-theme.is-dark-theme img {
 		filter: brightness(0.85) contrast(1.1);
 	}
Index: wp-content/themes/twentytwentyone/assets/css/style-editor.css
===================================================================
--- wp-content/themes/twentytwentyone/assets/css/style-editor.css	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/css/style-editor.css	(working copy)
@@ -514,6 +514,10 @@
 	background-color: #f1f1f1;
 }
 
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+	background: none;
+}
+
 .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) img {
 	outline: 2px dotted var(--wp--style--color--link, var(--global--color-primary));
 }
Index: wp-content/themes/twentytwentyone/assets/sass/04-elements/links.scss
===================================================================
--- wp-content/themes/twentytwentyone/assets/sass/04-elements/links.scss	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/sass/04-elements/links.scss	(working copy)
@@ -52,6 +52,13 @@
 		}
 	}
 
+	&.custom-logo-link {
+
+		&:focus {
+			background: none;
+		}
+	}
+
 	img {
 		outline: 2px dotted var(--wp--style--color--link, var(--global--color-primary));
 	}
Index: wp-content/themes/twentytwentyone/assets/sass/06-components/header.scss
===================================================================
--- wp-content/themes/twentytwentyone/assets/sass/06-components/header.scss	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/sass/06-components/header.scss	(working copy)
@@ -77,18 +77,6 @@
 	line-height: 1.4;
 }
 
-a.custom-logo-link {
-	text-decoration: none;
-
-	&:focus {
-		// Change colors when the body background is white.
-		.has-background-white &,
-		.is-dark-theme & {
-			background: none;
-		}
-	}
-}
-
 .site-title > a {
 	text-decoration-color: var(--global--color-secondary);
 }
Index: wp-content/themes/twentytwentyone/assets/sass/style-dark-mode.scss
===================================================================
--- wp-content/themes/twentytwentyone/assets/sass/style-dark-mode.scss	(revision 49982)
+++ wp-content/themes/twentytwentyone/assets/sass/style-dark-mode.scss	(working copy)
@@ -21,6 +21,13 @@
 			background: #000;
 			color: #fff;
 			text-decoration: none;
+
+			&.custom-logo-link {
+
+				&:focus {
+					background: none;
+				}
+			}
 		}
 
 		img {
Index: wp-content/themes/twentytwentyone/style-rtl.css
===================================================================
--- wp-content/themes/twentytwentyone/style-rtl.css	(revision 49982)
+++ wp-content/themes/twentytwentyone/style-rtl.css	(working copy)
@@ -1686,6 +1686,10 @@
 	background-color: #f1f1f1;
 }
 
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+	background: none;
+}
+
 .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) img {
 	outline: 2px dotted var(--wp--style--color--link, var(--global--color-primary));
 }
@@ -3891,15 +3895,6 @@
 	line-height: 1.4;
 }
 
-a.custom-logo-link {
-	text-decoration: none;
-}
-
-.has-background-white a.custom-logo-link:focus,
-.is-dark-theme a.custom-logo-link:focus {
-	background: none;
-}
-
 .site-title > a {
 	text-decoration-color: var(--global--color-secondary);
 }
Index: wp-content/themes/twentytwentyone/style.css
===================================================================
--- wp-content/themes/twentytwentyone/style.css	(revision 49982)
+++ wp-content/themes/twentytwentyone/style.css	(working copy)
@@ -1696,6 +1696,10 @@
 	background-color: #f1f1f1;
 }
 
+.site a:focus:not(.wp-block-button__link):not(.wp-block-file__button).custom-logo-link:focus {
+	background: none;
+}
+
 .site a:focus:not(.wp-block-button__link):not(.wp-block-file__button) img {
 	outline: 2px dotted var(--wp--style--color--link, var(--global--color-primary));
 }
@@ -3911,15 +3915,6 @@
 	line-height: 1.4;
 }
 
-a.custom-logo-link {
-	text-decoration: none;
-}
-
-.has-background-white a.custom-logo-link:focus,
-.is-dark-theme a.custom-logo-link:focus {
-	background: none;
-}
-
 .site-title > a {
 	text-decoration-color: var(--global--color-secondary);
 }