diff --git a/frappe/desk/page/applications/applications.js b/frappe/desk/page/applications/applications.js
index e1fcf71b80..08a2e53fc1 100644
--- a/frappe/desk/page/applications/applications.js
+++ b/frappe/desk/page/applications/applications.js
@@ -48,18 +48,19 @@ frappe.applications.Installer = Class.extend({
 
 	make_app_list: function(apps) {
 		var me = this;
+		var modules = {};
 
 		$.each(Object.keys(apps).sort(), function(i, app_key) {
 			var app = apps[app_key];
 
-			frappe.modules[app_key] = {
+			modules[app_key] = {
 				label: app.app_title,
 				icon: app.app_icon,
 				color: app.app_color,
 				is_app: true
 			};
 
-			app.app_icon = frappe.ui.app_icon.get_html(app_key);
+			app.app_icon = frappe.ui.app_icon.get_html(app_key, null, modules);
 
 			$(frappe.render_template("application_row", {app: app})).appendTo(me.wrapper);
 		});
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 1798eb5050..6ac17885ea 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -3,9 +3,9 @@ app_name = "frappe"
 app_title = "Frappe Framework"
 app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
-app_icon = "assets/frappe/images/frappe.svg"
+app_icon = "octicon octicon-circuit-board"
 app_version = "5.0.0-alpha"
-app_color = "#3498db"
+app_color = "orange"
 app_email = "support@frappe.io"
 
 before_install = "frappe.utils.install.before_install"
diff --git a/frappe/public/js/frappe/ui/app_icon.js b/frappe/public/js/frappe/ui/app_icon.js
index 699afbd744..ac386da15c 100644
--- a/frappe/public/js/frappe/ui/app_icon.js
+++ b/frappe/public/js/frappe/ui/app_icon.js
@@ -4,9 +4,13 @@
 
 frappe.provide("frappe.ui")
 frappe.ui.app_icon = {
-	get_html: function(app, small) {
-		var icon = frappe.modules[app].icon;
-		var color = frappe.modules[app].color;
+	get_html: function(app, small, modules) {
+		if(!modules) {
+			modules = frappe.modules;
+		}
+
+		var icon = modules[app].icon;
+		var color = modules[app].color;
 		if(icon.split(".").slice(-1)[0]==="svg") {
 			$.ajax({
 				url: icon,