diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py
index 79f020e1d5..6e1bbdd651 100644
--- a/frappe/desk/doctype/desktop_icon/desktop_icon.py
+++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py
@@ -88,13 +88,14 @@ def get_desktop_icons(user=None):
 	return user_icons
 
 @frappe.whitelist()
-def add_user_icon(_doctype, label=None, link=None, type='link'):
+def add_user_icon(_doctype, label=None, link=None, type='link', standard=0):
 	'''Add a new user desktop icon to the desktop'''
 
 	if not label: label = frappe._(_doctype)
 	if not link: link = 'List/{0}'.format(_doctype)
 
-	icon_name = frappe.db.exists('Desktop Icon', {'standard': 0, 'link': link, 'owner': frappe.session.user})
+	icon_name = frappe.db.exists('Desktop Icon', {'standard': standard, 'link': link,
+		'owner': frappe.session.user})
 	if icon_name and frappe.db.get_value('Desktop Icon', icon_name, 'hidden'):
 		frappe.db.set_value('Desktop Icon', icon_name, 'hidden', 0)
 		clear_desktop_icons_cache()
@@ -127,7 +128,7 @@ def add_user_icon(_doctype, label=None, link=None, type='link'):
 				'reverse': module_icon.reverse,
 				'idx': idx + 1,
 				'custom': 1,
-				'standard': 0
+				'standard': standard
 			}).insert(ignore_permissions=True)
 			clear_desktop_icons_cache()
 
@@ -148,7 +149,15 @@ def set_order(new_order, user=None):
 			if user:
 				icon = get_user_copy(module_name, user)
 			else:
-				icon = frappe.get_doc('Desktop Icon', {'module_name': module_name, 'standard': 1})
+				name = frappe.db.get_value('Desktop Icon',
+					{'standard': 1, 'module_name': module_name})
+				if name:
+					icon = frappe.get_doc('Desktop Icon', name)
+				else:
+					# standard icon missing, create one for DocType
+					name = add_user_icon(module_name, standard=1)
+					icon = frappe.get_doc('Desktop Icon', name)
+
 			icon.db_set('idx', i)
 
 	clear_desktop_icons_cache()
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.json b/frappe/desk/page/setup_wizard/setup_wizard.json
index f18c740665..627dc2edec 100644
--- a/frappe/desk/page/setup_wizard/setup_wizard.json
+++ b/frappe/desk/page/setup_wizard/setup_wizard.json
@@ -4,7 +4,7 @@
  "docstatus": 0, 
  "doctype": "Page", 
  "idx": 1, 
- "modified": "2015-11-09 03:06:14.542388", 
+ "modified": "2016-06-08 11:03:19.697078", 
  "modified_by": "Administrator", 
  "module": "Desk", 
  "name": "setup-wizard", 
@@ -12,7 +12,7 @@
  "page_name": "setup-wizard", 
  "roles": [
   {
-   "role": "System Manager"
+   "role": "Administrator"
   }
  ], 
  "script": null,