diff --git a/packages/block-library/src/button/style.scss b/packages/block-library/src/button/style.scss
index 0662e66b83371d..7bbe8900b8dc29 100644
--- a/packages/block-library/src/button/style.scss
+++ b/packages/block-library/src/button/style.scss
@@ -1,7 +1,7 @@
 $blocks-button__height: 56px;
 
 .wp-block-button {
-	color: var(--wp--color--white, $white);
+	color: $white;
 
 	&.aligncenter {
 		text-align: center;
@@ -14,7 +14,7 @@ $blocks-button__height: 56px;
 }
 
 .wp-block-button__link {
-	background-color: var(--wp--color--background, $dark-gray-700);
+	background-color: $dark-gray-700;
 	border: none;
 	border-radius: $blocks-button__height / 2;
 	box-shadow: none;
@@ -36,6 +36,10 @@ $blocks-button__height: 56px;
 	}
 }
 
+.wp-gs .wp-block-button__link:not(.has-background) {
+	background-color: var(--wp--color--primary);
+}
+
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;
 }
@@ -44,7 +48,7 @@ $blocks-button__height: 56px;
 }
 
 .is-style-outline {
-	color: var(--wp--color--background, $dark-gray-700);
+	color: $dark-gray-700;
 
 	.wp-block-button__link {
 		background-color: transparent;