diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
index 7e6969163b..a967498d0f 100644
--- a/frappe/public/js/frappe/form/templates/contact_list.html
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -1,18 +1,18 @@
 <div class="clearfix"></div>
 {% for(var i=0, l=contact_list.length; i<l; i++) { %}
 	<div class="address-box">
-		<p class="h6">
+		<p class="h6 flex align-center">
 			{%= contact_list[i].first_name %} {%= contact_list[i].last_name %}
 			{% if(contact_list[i].is_primary_contact) { %}
-				<span class="text-muted">({%= __("Primary") %})</span>
+				<span class="text-muted">&nbsp;({%= __("Primary") %})</span>
 			{% } %}
 			{% if(contact_list[i].designation){ %}
 			 <span class="text-muted">&ndash; {%= contact_list[i].designation %}</span>
 			{% } %}
 			<a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}"
-				class="btn btn-xs btn-default pull-right"
-				style="margin-top:-3px; margin-right: -5px;">
-				{%= __("Edit") %}</a>
+				class="btn btn-xs btn-default ml-auto">
+				{%= __("Edit") %}
+			</a>
 		</p>
 		{% if (contact_list[i].phones || contact_list[i].email_ids) { %}
 		<p>
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 2dcf634619..2581f30c0f 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -233,15 +233,6 @@
 	background-color: #e74c3c;
 }
 
-.address-box {
-	background-color: @light-bg;
-	padding: 0px 15px;
-	margin: 15px 0px;
-	border: 1px solid @border-color;
-	border-radius: 3px;
-	font-size: 12px;
-}
-
 .timeline {
 	margin: 30px 0px;
 
diff --git a/frappe/public/scss/controls.scss b/frappe/public/scss/controls.scss
index 6a22112975..d859eb083f 100644
--- a/frappe/public/scss/controls.scss
+++ b/frappe/public/scss/controls.scss
@@ -35,6 +35,17 @@
 	.ql-editor:not(.read-mode) {
 		background-color: var(--control-bg);
 	}
+	.address-box {
+		background-color: var(--control-bg);
+		padding: var(--padding-sm);
+		margin-bottom: var(--margin-sm);
+		border: 1px solid var(--border-color);
+		border-radius: var(--border-radius);
+		font-size: var(--text-sm);
+		p:last-child {
+			margin-bottom: 0;
+		}
+	}
 }
 
 .frappe-control:not([data-fieldtype='MultiSelectPills']) {