diff --git a/assets/stylesheets/_mixins.scss b/assets/stylesheets/_mixins.scss
index 89297e6335bc92..331a7ddb45f5bd 100644
--- a/assets/stylesheets/_mixins.scss
+++ b/assets/stylesheets/_mixins.scss
@@ -325,7 +325,7 @@
 	height: 0;
 	border-left: 3px solid transparent;
 	border-right: 3px solid transparent;
-	border-top: 5px solid currentColor;
+	border-top: 5px solid;
 	margin-left: $grid-size-small;
 
 	// This gives the icon space on the right side consistent with the material
diff --git a/packages/block-editor/src/components/inserter-list-item/style.scss b/packages/block-editor/src/components/inserter-list-item/style.scss
index 895f9c39b7866e..073c815dc2909e 100644
--- a/packages/block-editor/src/components/inserter-list-item/style.scss
+++ b/packages/block-editor/src/components/inserter-list-item/style.scss
@@ -45,7 +45,7 @@
 		&:hover {
 			.block-editor-block-types-list__item-icon,
 			.block-editor-block-types-list__item-title {
-				color: currentColor;
+				color: inherit;
 			}
 		}
 
@@ -60,7 +60,7 @@
 
 			.block-editor-block-types-list__item-icon,
 			.block-editor-block-types-list__item-title {
-				color: currentColor;
+				color: inherit;
 			}
 		}
 	}
diff --git a/packages/block-library/src/button/style.scss b/packages/block-library/src/button/style.scss
index 1519c6a11ddce5..9fb53733a2d132 100644
--- a/packages/block-library/src/button/style.scss
+++ b/packages/block-library/src/button/style.scss
@@ -47,6 +47,6 @@ $blocks-button__height: 56px;
 
 	.wp-block-button__link {
 		background-color: transparent;
-		border: 2px solid currentcolor;
+		border: 2px solid;
 	}
 }
diff --git a/packages/block-library/src/table/editor.scss b/packages/block-library/src/table/editor.scss
index c294b5d0516666..52f6a60e545d15 100644
--- a/packages/block-library/src/table/editor.scss
+++ b/packages/block-library/src/table/editor.scss
@@ -27,7 +27,7 @@
 	td,
 	th {
 		padding: 0;
-		border: $border-width solid $black;
+		border: $border-width solid;
 	}
 
 	td.is-selected,
diff --git a/packages/block-library/src/table/theme.scss b/packages/block-library/src/table/theme.scss
index 4266ce6f110b8d..7f604ba661f29c 100644
--- a/packages/block-library/src/table/theme.scss
+++ b/packages/block-library/src/table/theme.scss
@@ -6,7 +6,7 @@
 	td,
 	th {
 		padding: 0.5em;
-		border: 1px solid currentColor;
+		border: 1px solid;
 		word-break: break-all;
 	}
 }
diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss
index 0f49a9625519be..acbf83e897af7a 100644
--- a/packages/components/src/button/style.scss
+++ b/packages/components/src/button/style.scss
@@ -162,7 +162,7 @@
 	}
 
 	&:active {
-		color: currentColor;
+		color: inherit;
 	}
 
 	&:disabled,