diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg
index 2b0cc8b696..d2c162161f 100644
--- a/frappe/public/icons/timeless/symbol-defs.svg
+++ b/frappe/public/icons/timeless/symbol-defs.svg
@@ -693,4 +693,10 @@
 	<symbol viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-star">
 		<path d="M11.5516 2.90849C11.735 2.53687 12.265 2.53687 12.4484 2.90849L14.8226 7.71919C14.8954 7.86677 15.0362 7.96905 15.1991 7.99271L20.508 8.76415C20.9181 8.82374 21.0818 9.32772 20.7851 9.61699L16.9435 13.3616C16.8257 13.4765 16.7719 13.642 16.7997 13.8042L17.7066 19.0916C17.7766 19.5001 17.3479 19.8116 16.9811 19.6187L12.2327 17.1223C12.087 17.0457 11.913 17.0457 11.7673 17.1223L7.01888 19.6187C6.65207 19.8116 6.22335 19.5001 6.29341 19.0916L7.20028 13.8042C7.2281 13.642 7.17433 13.4765 7.05648 13.3616L3.21491 9.61699C2.91815 9.32772 3.08191 8.82374 3.49202 8.76415L8.80094 7.99271C8.9638 7.96905 9.10458 7.86677 9.17741 7.71919L11.5516 2.90849Z" fill="var(--star-fill)" stroke="var(--star-fill)"/>
 	</symbol>
+	<symbol fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="icon-map">
+		<g stroke="#111" stroke-miterlimit="10">
+		<path d="M11.467 3.458c1.958 1.957 1.958 5.088.027 7.02L7.97 14l-3.523-3.523a4.945 4.945 0 010-6.993l.026-.026a4.922 4.922 0 016.993 0zm0 0c-.026-.026-.026-.026 0 0z"></path>
+		<path d="M7.971 8.259a1.305 1.305 0 100-2.61 1.305 1.305 0 000 2.61z"></path>
+		</g>
+	</symbol>
 </svg>
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index a2dc51d69b..beacb136e6 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -179,7 +179,8 @@ frappe.views.BaseList = class BaseList {
 			'Calendar': 'calendar',
 			'Gantt': 'gantt',
 			'Kanban': 'kanban',
-			'Dashboard': 'dashboard'
+			'Dashboard': 'dashboard',
+			'Map': 'map',
 		};
 
 		if (frappe.boot.desk_settings.view_switcher) {
@@ -823,6 +824,7 @@ frappe.views.view_modes = [
 	"Image",
 	"Inbox",
 	"Tree",
+	"Map",
 ];
 frappe.views.is_valid = (view_mode) =>
 	frappe.views.view_modes.includes(view_mode);
diff --git a/frappe/public/js/frappe/list/list_view_select.js b/frappe/public/js/frappe/list/list_view_select.js
index 826158ff3f..9607be6e90 100644
--- a/frappe/public/js/frappe/list/list_view_select.js
+++ b/frappe/public/js/frappe/list/list_view_select.js
@@ -123,7 +123,14 @@ frappe.views.ListViewSelect = class ListViewSelect {
 						kanbans => this.setup_kanban_switcher(kanbans)
 					);
 				}
-			}
+			},
+			Map: {
+				condition: this.list_view.settings.get_coords_method ||
+					(this.list_view.meta.fields.find(i => i.fieldname === "latitude") &&
+					this.list_view.meta.fields.find(i => i.fieldname === "longitude")) ||
+					(this.list_view.meta.fields.find(i => i.fieldname === 'location' && i.fieldtype == 'Geolocation')),
+				action: () => this.set_route("map")
+			},
 		};
 
 		frappe.views.view_modes.forEach(view => {