diff --git a/src/wp-admin/css/color-picker.css b/src/wp-admin/css/color-picker.css
index 5c0b544c9e..5fc95f5f56 100644
--- a/src/wp-admin/css/color-picker.css
+++ b/src/wp-admin/css/color-picker.css
@@ -59,7 +59,7 @@
 	border-left: 1px solid #999;
 }
 
-.wp-color-result.wp-picker-open {
+.wp-color-result {
 	top: 0;
 }
 
@@ -96,11 +96,29 @@
 }
 
 .wp-picker-container .iris-picker {
+	border-radius: 0;
 	border-color: #dfdfdf;
 	margin-top: 6px;
 }
 
-input[type="text"].iris-error {
+.wp-picker-container input[type="text"].wp-color-picker {
+	width: 65px;
+	font-size: 12px;
+	font-family: monospace;
+	text-align: center;
+	line-height: 16px;
+	margin: 0;
+}
+
+.wp-picker-container input[type="text"].wp-color-picker:focus::-webkit-input-placeholder {
+	color: transparent;
+}
+
+.wp-picker-container input[type="text"].wp-color-picker:-moz-placeholder {
+	color: #999;
+}
+
+.wp-picker-container input[type="text"].iris-error {
 	background-color: #ffebe8;
 	border-color: #c00;
 	color: #000;
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 3ebb07239a..63a3a3a4c1 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -313,26 +313,6 @@ body {
 	border-color: rgba(0, 0, 0, 0.25);
 }
 
-.customize-control-color .iris-picker {
-	border-radius: 0 !important;
-}
-
-.accordion-section input[type="text"].color-picker-hex {
-	width: 65px;
-	font-family: monospace;
-	text-align: center;
-	line-height: 16px;
-}
-
-/* The centered cursor overlaps the placeholder in webkit. Hide it when selected. */
-.accordion-section input[type="text"].color-picker-hex:focus::-webkit-input-placeholder {
-	color: transparent;
-}
-
-.accordion-section input[type="text"].color-picker-hex:-moz-placeholder {
-	color: #999;
-}
-
 /*
  * Image Picker
  */