diff --git a/src/wp-admin/css/color-picker.css b/src/wp-admin/css/color-picker.css
index 29540153ad..815a7df600 100644
--- a/src/wp-admin/css/color-picker.css
+++ b/src/wp-admin/css/color-picker.css
@@ -10,7 +10,7 @@
 
 /* Needs higher specificiity. */
 .wp-picker-container .wp-color-result.button {
-	height: 24px;
+	min-height: 28px;
 	margin: 0 6px 6px 0px;
 	padding: 0 0 0 30px;
 	font-size: 11px;
@@ -22,7 +22,7 @@
 	border-left: 1px solid #ccc;
 	color: #555;
 	display: block;
-	line-height: 2;
+	line-height: 2.36363636; /* 26px */
 	padding: 0 6px;
 	text-align: center;
 }
@@ -70,9 +70,10 @@
 	margin: 0 !important;
 }
 
-.wp-picker-input-wrap .button,
-.wp-customizer .wp-picker-input-wrap .button {
+.wp-picker-input-wrap .button.wp-picker-default,
+.wp-customizer .wp-picker-input-wrap .button.wp-picker-default {
 	margin-left: 6px;
+	padding: 2px 8px;
 }
 
 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -89,8 +90,9 @@
 	width: 65px;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 1.4;
+	line-height: 1.33333333; /* 16px */
 	margin: 0;
+	padding: 5px;
 	vertical-align: top;
 }