diff --git a/frappe/config/automation.py b/frappe/config/automation.py
new file mode 100644
index 0000000000..08de969729
--- /dev/null
+++ b/frappe/config/automation.py
@@ -0,0 +1,59 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	data = [
+		{
+			"label": _("Automation"),
+			"icon": "fa fa-random",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Assignment Rule",
+					"description": _("Set up rules for user assignments.")
+				},
+				{
+					"type": "doctype",
+					"name": "Milestone",
+					"description": _("Tracks milestones on the lifecycle of a document if it undergoes multiple stages.")
+				},
+				{
+					"type": "doctype",
+					"name": "Auto Repeat",
+					"description": _("Automatically generates recurring documents.")
+				},
+			]
+		},
+		{
+			"label": _("Event Streaming"),
+			"icon": "fa fa-random",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Event Producer",
+					"description": _("The site you want to subscribe to for consuming events.")
+				},
+				{
+					"type": "doctype",
+					"name": "Event Consumer",
+					"description": _("The site which is consuming your events.")
+				},
+				{
+					"type": "doctype",
+					"name": "Event Update Log",
+					"description": _("Maintains a Log of all inserts, updates and deletions on Event Producer site for documents that have consumers.")
+				},
+				{
+					"type": "doctype",
+					"name": "Event Sync Log",
+					"description": _("Maintains a log of every event consumed along with the status of the sync and a Resync button in case sync fails.")
+				},
+				{
+					"type": "doctype",
+					"name": "Document Type Mapping",
+					"description": _("The mapping configuration between two doctypes.")
+				}
+			]
+		}
+	]
+	return data
diff --git a/frappe/config/desktop.py b/frappe/config/desktop.py
index 538aa30390..568cc76afd 100644
--- a/frappe/config/desktop.py
+++ b/frappe/config/desktop.py
@@ -25,6 +25,16 @@ def get_data():
 			"type": "module",
 			"description": "Data import, printing, email and workflows."
 		},
+		{
+			"module_name": "Automation",
+			"category": "Administration",
+			"label": _("Automation"),
+			"color": "#bdc3c7",
+			"reverse": 1,
+			"icon": "octicon octicon-gist",
+			"type": "module",
+			"description": "Auto Repeat, Assignment Rule, Milestone Tracking and Event Streaming."
+		},
 		{
 			"module_name": "Users and Permissions",
 			"category": "Administration",
diff --git a/frappe/config/integrations.py b/frappe/config/integrations.py
index 563dc94eb4..f41adc9ea4 100644
--- a/frappe/config/integrations.py
+++ b/frappe/config/integrations.py
@@ -74,32 +74,6 @@ def get_data():
 				},
 			]
 		},
-		{
-			"label": _("Event Streaming"),
-			"icon": "fa fa-random",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Event Producer",
-					"description": _("The site you want to subscribe to for consuming events.")
-				},
-				{
-					"type": "doctype",
-					"name": "Event Consumer",
-					"description": _("The site which is consuming your events.")
-				},
-				{
-					"type": "doctype",
-					"name": "Event Update Log",
-					"description": _("Maintains a Log of all inserts, updates and deletions on Event Producer site for documents that have consumers.")
-				},
-				{
-					"type": "doctype",
-					"name": "Event Sync Log",
-					"description": _("Maintains a log of every event consumed along with the status of the sync and a Resync button in case sync fails.")
-				}
-			]
-		},
 		{
 			"label": _("Webhook"),
 			"items": [
diff --git a/frappe/config/settings.py b/frappe/config/settings.py
index a0a7dcd65f..848ef2e1aa 100644
--- a/frappe/config/settings.py
+++ b/frappe/config/settings.py
@@ -177,28 +177,7 @@ def get_data():
 					"description": _("Actions for workflow (e.g. Approve, Cancel).")
 				},
 			]
-		},
-		{
-			"label": _("Automation"),
-			"icon": "fa fa-random",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Assignment Rule",
-					"description": _("Set up rules for user assignments.")
-				},
-				{
-					"type": "doctype",
-					"name": "Milestone",
-					"description": _("Tracks milestones on the lifecycle of a document if it undergoes multiple stages.")
-				},
-				{
-					"type": "doctype",
-					"name": "Auto Repeat",
-					"description": _("Automatically generates recurring documents.")
-				},
-			]
-		},
+		}
 	]
 	add_setup_section(data, "frappe", "website", _("Website"), "fa fa-globe")
 	return data
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index 39a2b473e1..339052342d 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -17,8 +17,8 @@ frappe.breadcrumbs = {
 		'Custom': 'Settings',
 		'Workflow': 'Settings',
 		'Printing': 'Settings',
-		'Automation': 'Settings',
 		'Setup': 'Settings',
+		'Event Streaming': 'Automation'
 	},
 
 	set_doctype_module: function(doctype, module) {