diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index c7082137d5..6d24705d54 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2462,7 +2462,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 }
 .nav-menus-php .metabox-holder .accordion-section-title span.dashicons.dashicons-arrow-down::before {
 	position: relative;
-	left: -1px
+	left: -1px;
 }
 
 .nav-menus-php .metabox-holder .accordion-section.open .accordion-section-title span.dashicons.dashicons-arrow-down {
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 59905ea902..8149c28d13 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -553,7 +553,8 @@ body.trashing #publish-settings {
 		.15s border-color ease-in-out;
 }
 
-.accordion-section-title:has(button.accordion-trigger) {
+.accordion-section-title:has(button.accordion-trigger),
+#customize-controls .current-panel .control-section > h3.accordion-section-title:has(button.accordion-trigger) {
 	padding: 0;
 }
 
@@ -561,9 +562,10 @@ body.trashing #publish-settings {
 	all: unset;
 	width: 100%;
 	height: 100%;
-	padding: 10px 10px 11px 14px;
+	padding: 10px 30px 11px 14px;
 	display: flex;
 	align-items: center;
+	box-sizing: border-box;
 }
 
 .accordion-section-title button.accordion-trigger:has(.menu-in-location) {
@@ -587,6 +589,7 @@ body.trashing #publish-settings {
 #customize-outer-theme-controls .accordion-section-title:after {
 	content: "\f345";
 	color: #a7aaad;
+	pointer-events: none;
 }
 
 #customize-theme-controls .accordion-section-content,