diff --git a/src/wp-admin/css/color-picker.css b/src/wp-admin/css/color-picker.css
index 3d3e5e8964..beec82636d 100644
--- a/src/wp-admin/css/color-picker.css
+++ b/src/wp-admin/css/color-picker.css
@@ -120,16 +120,14 @@
 
 .iris-picker .ui-square-handle:focus,
 .iris-picker .iris-strip .ui-slider-handle:focus {
-	box-shadow:
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
+	border-color: #007cba;
+	border-style: solid;
+	box-shadow: 0 0 0 1px #007cba;
+	outline: 2px solid transparent;
 }
 
 .iris-picker .iris-palette:focus {
-	box-shadow:
-		inset 0 0 5px rgba(0, 0, 0, 0.4),
-		0 0 0 1px #5b9dd9,
-		0 0 2px 1px rgba(30, 140, 190, 0.8);
+	box-shadow: 0 0 0 2px #007cba;
 }
 
 @media screen and (max-width: 782px) {
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index b72c110a2c..044edc5b6a 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -1392,12 +1392,10 @@ p.customize-section-description {
 
 .customize-control .attachment-media-view .button-add-media:focus {
 	background-color: #fbfbfc;
+	border-color: #007cba;
 	border-style: solid;
-	border-color: #5b9dd9;
-	box-shadow: 0 0 3px rgba( 0, 115, 170, .8 );
-	/* Only visible in Windows High Contrast mode */
+	box-shadow: 0 0 0 1px #007cba;
 	outline: 2px solid transparent;
-	outline-offset: -2px;
 }
 
 .customize-control-header .inner {