diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index 2b3b5a9..6734cab 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -33,7 +33,6 @@
 			this.frm.add_custom_button(__("Customer"), this.create_customer, __("Make"));
 			this.frm.add_custom_button(__("Opportunity"), this.create_opportunity, __("Make"));
 			this.frm.add_custom_button(__("Quotation"), this.make_quotation, __("Make"));
-			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 
 		if(!this.frm.doc.__islocal) {
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index ebef4b4..4aadd76 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -48,8 +48,6 @@
 			frm.add_custom_button(__('Quotation'),
 				cur_frm.cscript.create_quotation, __("Make"));
 
-			frm.page.set_inner_btn_group_as_primary(__("Make"));
-
 			if(doc.status!=="Quotation") {
 				frm.add_custom_button(__('Lost'),
 					cur_frm.cscript['Declare Opportunity Lost']);
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js
index 6541a8c..6385c0e 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.js
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.js
@@ -21,8 +21,7 @@
 						"designation": frm.doc.job_opening,
 					};
 					frappe.new_doc("Offer Letter");
-				}, __("Make"));
-				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+				});
 			}
 		}
 
diff --git a/erpnext/public/js/communication.js b/erpnext/public/js/communication.js
index bb2eaef..e85107e 100644
--- a/erpnext/public/js/communication.js
+++ b/erpnext/public/js/communication.js
@@ -19,17 +19,16 @@
 		if(!in_list(["Lead", "Opportunity"], frm.doc.reference_doctype)) {
 			frm.add_custom_button(__("Lead"), () => {
 				frappe.confirm(__(confirm_msg, [__("Lead")]), () => {
-					frm.trigger('make_lead_from_communication');	
+					frm.trigger('make_lead_from_communication');
 				})
-			}, "Make");
+			}, __("Make"));
 
 			frm.add_custom_button(__("Opportunity"), () => {
 				frappe.confirm(__(confirm_msg, [__("Opportunity")]), () => {
 					frm.trigger('make_opportunity_from_communication');
 				})
-			}, "Make");
+			}, __("Make"));
 		}
-		frm.page.set_inner_btn_group_as_primary(__("Make"));
 	},
 
 	make_lead_from_communication: (frm) => {
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index 2369a8a..ac8eb8d 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -26,8 +26,7 @@
 		if(!cur_frm.doc.__islocal &&
 			(cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
 			cur_frm.add_custom_button(__('Maintenance Visit'),
-				this.make_maintenance_visit, __("Make"))
-			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+				this.make_maintenance_visit);
 		}
 	},
 
