diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 1982175db4..b6285ceb39 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1023,7 +1023,7 @@ Object.assign(frappe.utils, {
 
 	icon(icon_name, size="sm", icon_class) {
 		return `<svg class="icon icon-${size}">
-			<use class="${icon_class}" xlink:href="#icon-${icon_name}"></use>
+			<use class="${icon_class || icon_name}" href="#icon-${icon_name}"></use>
 		</svg>`;
 	}
 });
diff --git a/frappe/public/scss/form.scss b/frappe/public/scss/form.scss
index 14ec2dd238..7108539838 100644
--- a/frappe/public/scss/form.scss
+++ b/frappe/public/scss/form.scss
@@ -1,5 +1,3 @@
-$form-left-padding: var(--padding-xl);
-
 .form-control {
 	border: none;
 	background-color: $control-bg;
@@ -66,7 +64,6 @@ $form-left-padding: var(--padding-xl);
 
 .form-inner-toolbar {
 	padding-top: var(--padding-md);
-	padding-left: $form-left-padding;
 	text-align: right;
 }
 
@@ -82,10 +79,4 @@ $form-left-padding: var(--padding-xl);
 	font-weight: 400;
 	background-color: $control-bg;
 	padding: var(--padding-xs) var(--padding-sm);
-}
-
-.layout-main-section {
-	.form-page {
-		padding-left: $form-left-padding;
-	}
 }
\ No newline at end of file
diff --git a/frappe/public/scss/icons.scss b/frappe/public/scss/icons.scss
index 1343da202f..ddf3c9646b 100644
--- a/frappe/public/scss/icons.scss
+++ b/frappe/public/scss/icons.scss
@@ -21,6 +21,10 @@ use.like-icon {
 	stroke: var(--gray-500);
 }
 
+.icon > .close {
+	fill: var(--gray-900);
+}
+
 .liked {
 	use.like-icon {
 		stroke: none;