diff --git a/packages/block-editor/src/components/block-list/style.scss b/packages/block-editor/src/components/block-list/style.scss
index 16422a98d9376..9ee7162fb08b8 100644
--- a/packages/block-editor/src/components/block-list/style.scss
+++ b/packages/block-editor/src/components/block-list/style.scss
@@ -266,7 +266,7 @@
 			left: $border-width;
 			right: $border-width;
 			bottom: $border-width;
-			box-shadow: 0 0 0 $border-width $gray-900;
+			box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color);
 			border-radius: $radius-block-ui - $border-width; // Border is outset, so subtract the width to achieve correct radius.
 		}
 	}
@@ -275,7 +275,7 @@
 		cursor: unset;
 
 		&::after {
-			box-shadow: 0 0 0 $border-width $gray-900; // Selected not focussed
+			box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color); // Selected not focussed.
 			top: $border-width;
 			left: $border-width;
 			right: $border-width;
diff --git a/packages/block-library/src/template-part/editor.scss b/packages/block-library/src/template-part/editor.scss
index c61e0651ae725..44690f049b634 100644
--- a/packages/block-library/src/template-part/editor.scss
+++ b/packages/block-library/src/template-part/editor.scss
@@ -42,7 +42,7 @@
 
 	.wp-block-template-part__selection-preview-item-title {
 		padding: $grid-unit-05;
-		font-size: 12px;
+		font-size: $helptext-font-size;
 		text-align: left;
 	}
 
@@ -66,7 +66,7 @@
 .block-editor-block-list__block[data-type="core/template-part"] {
 	&.has-child-selected {
 		&::after {
-			border: $border-width dotted $gray-900;
+			border: $border-width dotted var(--wp-admin-theme-color);
 		}
 
 		&.is-hovered,