diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index abb4f8edda..e4b3bab637 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -315,17 +315,6 @@ h6.uppercase, .h6.uppercase {
 }
 
 .modal {
-	.form-layout {
-		margin: -15px;
-	}
-
-	.form-grid .form-layout {
-		margin: 0px;
-	}
-
-	.form-section {
-		padding: 15px 7px;
-	}
 	.hide-border {
 		padding-top: 0;
 	}
diff --git a/frappe/public/scss/form.scss b/frappe/public/scss/form.scss
index b4d175ed43..424f82520a 100644
--- a/frappe/public/scss/form.scss
+++ b/frappe/public/scss/form.scss
@@ -1,3 +1,5 @@
+$form-left-padding: $padding-xl;
+
 .form-control {
 	border: none;
 	background-color: $control-bg;
@@ -9,10 +11,8 @@
 
 .form-section .section-body {
 	width: 100%;
-	padding: $padding-md;
-	padding-top: 0;
-	padding-left: 0;
 	@extend .row;
+	margin: 0;
 }
 
 .form-section {
@@ -30,7 +30,7 @@
 		background: $white;
 		z-index: 1;
 		width: 100%;
-		padding: $padding-lg;
+		padding: $padding-md;
 		padding-left: 0px;
 		margin: 0;
 		font-size: var(--text-lg);
@@ -67,7 +67,8 @@
 }
 
 .form-inner-toolbar {
-	padding: $padding-sm $padding-lg 0px;
+	padding-top: $padding-sm;
+	padding-left: $form-left-padding;
 	text-align: right;
 }
 
@@ -85,6 +86,11 @@
 	padding: $padding-xs $padding-sm;
 }
 
+.layout-main-section {
+	.form-page {
+		padding-left: $form-left-padding;
+	}
+}
 // .form-print-wrapper {
 // 	border: 1px solid $border-color;
 // 	border-top: none;