diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 055334a52e..a0b3d37811 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -973,6 +973,11 @@ p.customize-section-description {
 	margin-top: 7px;
 }
 
+.customize-control-radio label,
+.customize-control-checkbox label {
+	vertical-align: top;
+}
+
 .customize-control .attachment-thumb.type-icon {
 	float: left;
 	margin: 10px;
@@ -2684,6 +2689,10 @@ body.adding-widget .add-new-widget:before,
 		display: inline;
 	}
 
+	.customize-control-header button.random .dice {
+		margin-top: 0;
+	}
+
 	.customize-control-radio .customize-inside-control-row,
 	.customize-control-checkbox .customize-inside-control-row,
 	.customize-control-nav_menu_auto_add .customize-inside-control-row {
@@ -2696,9 +2705,9 @@ body.adding-widget .add-new-widget:before,
 		margin-left: -32px;
 	}
 
-	.customize-control input[type="radio"] + label,
-	.customize-control input[type="checkbox"] + label {
-		line-height: 32px;
+	.customize-control input[type="radio"] + label + br,
+	.customize-control input[type="checkbox"] + label + br {
+		line-height: 32px; /* For widgets checkboxes */
 	}
 
 	.customize-control .date-time-fields select {
diff --git a/src/wp-admin/css/customize-nav-menus.css b/src/wp-admin/css/customize-nav-menus.css
index 37da06f5a2..8faecb3248 100644
--- a/src/wp-admin/css/customize-nav-menus.css
+++ b/src/wp-admin/css/customize-nav-menus.css
@@ -215,15 +215,8 @@
 	padding-top: 12px;
 }
 
-.menu-settings .customize-control-checkbox label,
-.menu-location-settings .customize-control-checkbox label {
-	line-height: 1;
-}
-
-/* @todo update selector or potentially remove */
-.menu-settings .customize-control.customize-control-checkbox,
-.menu-location-settings .customize-control.customize-control-checkbox {
-	margin-bottom: 8px; /* Override collapsing at smaller viewports. */
+.customize-control-nav_menu_auto_add label {
+	vertical-align: top;
 }
 
 .customize-control-menu {