diff --git a/assets/apps/components/src/Style/_background-control.scss b/assets/apps/components/src/Style/_background-control.scss
index 2f1f380179..41138da59f 100644
--- a/assets/apps/components/src/Style/_background-control.scss
+++ b/assets/apps/components/src/Style/_background-control.scss
@@ -6,6 +6,7 @@
     border-radius: 0;
     padding-top: 0 !important;
     padding-bottom: 0 !important;
+    min-height: 30px;
   }
 
   .components-color-picker__inputs-toggle {
diff --git a/assets/apps/customizer-controls/src/scss/_general.scss b/assets/apps/customizer-controls/src/scss/_general.scss
index cb506ae541..8140f9f19a 100644
--- a/assets/apps/customizer-controls/src/scss/_general.scss
+++ b/assets/apps/customizer-controls/src/scss/_general.scss
@@ -23,6 +23,7 @@
 
   input[type=number] {
 	padding-right: 0;
+	min-height: 30px;
   }
 
   button.reset {
diff --git a/assets/apps/customizer-controls/src/scss/_ranges.scss b/assets/apps/customizer-controls/src/scss/_ranges.scss
index 27c7c6c157..c55ad507e0 100644
--- a/assets/apps/customizer-controls/src/scss/_ranges.scss
+++ b/assets/apps/customizer-controls/src/scss/_ranges.scss
@@ -14,6 +14,7 @@
 			width: auto;
 			max-width: 100%;
 			padding-right: 0;
+			min-height: 30px;
 		}
 
 		.components-range-control {
diff --git a/inc/admin/dashboard/main.php b/inc/admin/dashboard/main.php
index 6a11976538..58591cd25f 100755
--- a/inc/admin/dashboard/main.php
+++ b/inc/admin/dashboard/main.php
@@ -1057,6 +1057,12 @@ public function render_custom_layout_header() {
 				line-height: 1.6;
 			}
 
+			.neve_page_neve-custom-layout-upsell .cl-btn-action .dashicons,
+			.post-type-neve_custom_layouts .cl-btn-action .dashicons,
+			.post-type-neve_custom_layouts .cl-copy-button .dashicons {
+				line-height: 1;
+			}
+
 			/* Hide text on small screens but keep it accessible to screen readers */
 			@media (max-width: 500px) {
 				.cl-header-btn-text {
diff --git a/inc/admin/hooks_upsells.php b/inc/admin/hooks_upsells.php
index acc5020437..dc48029220 100644
--- a/inc/admin/hooks_upsells.php
+++ b/inc/admin/hooks_upsells.php
@@ -288,6 +288,14 @@ public function render_custom_layouts_upsell_modal() {
 				font-size: 2rem;
 			}
 
+			.neve_page_neve-custom-layout-upsell .cl-modal-dismiss .cl-close-button {
+				border: none;
+			}
+
+			.neve_page_neve-custom-layout-upsell .cl-modal-dismiss .cl-close-button span {
+				line-height: 1;
+			}
+
 			/* ----- HEADER / TITLE ----- */
 			.cl-modal-header {
 				text-align: center;