diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss
index 924f6832c0..6dab2fb872 100644
--- a/frappe/public/scss/common/controls.scss
+++ b/frappe/public/scss/common/controls.scss
@@ -35,7 +35,7 @@
 
 		.toggle-password {
 			position: absolute;
-			top: 4px;
+			top: 0;
 			right: 8px;
 			padding: 3px;
 			z-index: 3;
@@ -49,6 +49,7 @@ select.form-control {
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
+	padding-block: 0;
 }
 
 /* table multiselect */
@@ -196,6 +197,7 @@ select.form-control {
 }
 
 .ace_editor {
+	min-height: 48px;
 	background-color: var(--control-bg);
 	color: var(--text-color);
 	.ace_gutter {
diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss
index 1f915367f4..a27c1779e3 100644
--- a/frappe/public/scss/common/grid.scss
+++ b/frappe/public/scss/common/grid.scss
@@ -12,12 +12,12 @@
 	border-bottom: 1px solid var(--table-border-color);
 	color: var(--gray-600);
 	background-color: var(--gray-100);
-	font-size: var(--text-base);
+	font-size: var(--text-sm);
 	height: 32px;
 	padding: 0 !important;
 	border-top-left-radius: var(--border-radius-md);
 	border-top-right-radius: var(--border-radius-md);
-	
+
 	.grid-static-col, .row-check, .row-index {
 		height: 32px;
 		padding: 6px 8px !important;
@@ -41,7 +41,7 @@
 }
 
 .data-row textarea {
-	height: 46px;
+	height: 38px;
 }
 
 .form-grid .data-row {
@@ -85,7 +85,7 @@
 }
 
 .grid-body .data-row {
-	font-size: var(--text-base);
+	font-size: var(--text-sm);
 	font-weight: var(--weight-regular);
 	color: var(--gray-700)
 }
@@ -103,7 +103,7 @@
 
 .grid-static-col,
 .row-index {
-	height: 46px;
+	height: 38px;
 	max-height: 200px;
 
 	&.search {
@@ -117,7 +117,7 @@
 }
 
 .row-check {
-	height: 46px;
+	height: 38px;
 	text-align: center;
 
 	input {
@@ -198,6 +198,10 @@
 			padding: 0px !important;
 		}
 
+		.frappe-control[data-fieldtype=Select].form-group .select-icon {
+			top: 9px;
+		}
+
 		.checkbox {
 			margin: 0px;
 			text-align: center;
@@ -211,13 +215,14 @@
 		.form-control {
 			border-radius: 0px;
 			border: 0px;
-			padding-top: 8px;
-			padding-bottom: 9px;
-			height: 46px;
+			padding-top: 10px;
+			padding-bottom: 10px;
+			height: 38px;
 		}
 
 		.link-btn {
-			top: 0px;
+			top: 5px;
+			background-color: var(--neutral-white);
 		}
 
 		.form-control:focus {
diff --git a/frappe/public/scss/espresso/_spacing.scss b/frappe/public/scss/espresso/_spacing.scss
index 60f7667742..f761df7716 100644
--- a/frappe/public/scss/espresso/_spacing.scss
+++ b/frappe/public/scss/espresso/_spacing.scss
@@ -2,7 +2,7 @@
     // Input Padding
     --input-padding: 6px 8px;
     --dropdown-padding: 4px 8px;
-    --grid-padding: 12px 8px;
+    --grid-padding: 10px 8px;
     --disabled-input-padding: 3px 8px;
     --number-card-padding: 12px 8px;
 }
\ No newline at end of file