diff --git a/frappe/printing/page/print/print.js b/frappe/printing/page/print/print.js
index f930359b58..468172007c 100644
--- a/frappe/printing/page/print/print.js
+++ b/frappe/printing/page/print/print.js
@@ -75,7 +75,7 @@ frappe.ui.form.PrintView = class {
 		});
 
 		this.page.add_action_icon(
-			"file",
+			"es-line-filetype",
 			() => {
 				this.go_to_form_view();
 			},
diff --git a/frappe/public/js/frappe/form/controls/signature.js b/frappe/public/js/frappe/form/controls/signature.js
index 6ab96012f1..f169ec748a 100644
--- a/frappe/public/js/frappe/form/controls/signature.js
+++ b/frappe/public/js/frappe/form/controls/signature.js
@@ -43,7 +43,7 @@ frappe.ui.form.ControlSignature = class ControlSignature extends frappe.ui.form.
 			this.$reset_button_wrapper = $(`
 					<div class="signature-btn-row">
 						<a href="#" type="button" class="signature-reset btn icon-btn">
-							${frappe.utils.icon("refresh", "sm")}
+							${frappe.utils.icon("es-line-reload", "sm")}
 						</a>
 					</div>
 				`)
diff --git a/frappe/public/js/frappe/form/section.js b/frappe/public/js/frappe/form/section.js
index 28db1c16cf..ffe53545a7 100644
--- a/frappe/public/js/frappe/form/section.js
+++ b/frappe/public/js/frappe/form/section.js
@@ -128,7 +128,7 @@ export default class Section {
 	}
 
 	set_icon(hide) {
-		let indicator_icon = hide ? "down" : "up-line";
+		let indicator_icon = hide ? "es-line-down" : "es-line-up";
 		this.indicator && this.indicator.html(frappe.utils.icon(indicator_icon, "sm", "mb-1"));
 	}
 
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index e6c24e304c..fd30cf6f5a 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -276,7 +276,7 @@ frappe.ui.form.Toolbar = class Toolbar {
 		// Navigate
 		if (!this.frm.is_new() && !this.frm.meta.issingle) {
 			this.page.add_action_icon(
-				"left",
+				"es-line-left-chevron",
 				() => {
 					this.frm.navigate_records(1);
 				},
@@ -284,7 +284,7 @@ frappe.ui.form.Toolbar = class Toolbar {
 				__("Previous Document")
 			);
 			this.page.add_action_icon(
-				"right",
+				"es-line-right-chevron",
 				() => {
 					this.frm.navigate_records(0);
 				},
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 9d456ddf6a..0cc8a77df6 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -230,7 +230,7 @@ frappe.views.BaseList = class BaseList {
 				$secondary_action.addClass("visible-xs");
 			}
 		} else {
-			this.refresh_button = this.page.add_action_icon("refresh", () => {
+			this.refresh_button = this.page.add_action_icon("es-line-reload", () => {
 				this.refresh();
 			});
 		}
@@ -842,7 +842,7 @@ class FilterArea {
 			<div class="btn-group">
 				<button class="btn btn-default btn-sm filter-button">
 					<span class="filter-icon">
-						${frappe.utils.icon("filter")}
+						${frappe.utils.icon("es-line-filter")}
 					</span>
 					<span class="button-label hidden-xs">
 					${__("Filter")}
@@ -850,7 +850,7 @@ class FilterArea {
 				</button>
 				<button class="btn btn-default btn-sm filter-x-button" title="${__("Clear all filters")}">
 					<span class="filter-icon">
-						${frappe.utils.icon("filter-x")}
+						${frappe.utils.icon("es-small-close")}
 					</span>
 				</button>
 			</div>
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 8980a6d777..29e0a76689 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -903,7 +903,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		if (this.list_view_settings && !this.list_view_settings.disable_comment_count) {
 			comment_count = $(`<span class="comment-count"></span>`);
 			$(comment_count).append(`
-				${frappe.utils.icon("small-message")}
+				${frappe.utils.icon("es-line-chat-alt")}
 				${doc._comment_count > 99 ? "99+" : doc._comment_count || 0}`);
 		}
 
@@ -1024,7 +1024,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		];
 		const title = docstatus_description[doc.docstatus || 0];
 		if (indicator) {
-			return `<span class="indicator-pill ${indicator[1]} filterable ellipsis"
+			return `<span class="indicator-pill ${indicator[1]} filterable no-indicator-dot ellipsis"
 				data-filter='${indicator[2]}' title='${title}'>
 				<span class="ellipsis"> ${__(indicator[0])}</span>
 			</span>`;
diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js
index a98612b6a0..31ddb707a7 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -229,7 +229,7 @@ frappe.ui.GroupBy = class {
 			$(`<div class="group-by-selector">
 				<button class="btn btn-default btn-sm group-by-button ellipsis">
 					<span class="group-by-icon">
-						${frappe.utils.icon("group-by")}
+						${frappe.utils.icon("es-line-group")}
 					</span>
 					<span class="button-label hidden-xs">
 						${__("Add Group")}
diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.bundle.js b/frappe/public/js/frappe/views/kanban/kanban_board.bundle.js
index 30c218f475..e457482f65 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.bundle.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.bundle.js
@@ -757,7 +757,7 @@ frappe.provide("frappe.views");
 
 			if (card.comment_count > 0)
 				html += `<span class="list-comment-count small text-muted ">
-					${frappe.utils.icon("small-message")}
+					${frappe.utils.icon("es-line-chat-alt")}
 					${card.comment_count}
 				</span>`;
 
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 86b764457f..150ccc5e0e 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -88,7 +88,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	set_default_secondary_action() {
 		this.refresh_button && this.refresh_button.remove();
-		this.refresh_button = this.page.add_action_icon("refresh", () => {
+		this.refresh_button = this.page.add_action_icon("es-line-reload", () => {
 			this.setup_progress_bar();
 			this.refresh();
 		});