diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index b9c503a..d9faf6d 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -63,7 +63,7 @@
 				{
 					"type": "doctype",
 					"name": "Account",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Chart of Accounts"),
 					"route": "Tree/Account",
 					"description": _("Tree of financial accounts."),
@@ -199,7 +199,7 @@
 				{
 					"type": "doctype",
 					"name": "Cost Center",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Chart of Cost Centers"),
 					"route": "Tree/Cost Center",
 					"description": _("Tree of financial Cost Centers."),
@@ -244,7 +244,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -351,7 +351,7 @@
 		},
 		{
 			"label": _("Other Reports"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "report",
@@ -423,7 +423,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index 3c947cb..e246266 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Purchasing"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -57,7 +57,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -98,7 +98,7 @@
 				{
 					"type": "doctype",
 					"name": "Item Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Item Group"),
 					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
@@ -119,13 +119,13 @@
 		},
 		{
 			"label": _("Analytics"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "page",
 					"name": "purchase-analytics",
 					"label": _("Purchase Analytics"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
@@ -143,7 +143,7 @@
 		},
 		{
 			"label": _("Other Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index 6f39050..9935aef 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -4,7 +4,7 @@
 	return [
 		{
 			"label": _("Sales Pipeline"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -30,13 +30,13 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "page",
 					"name": "sales-funnel",
 					"label": _("Sales Funnel"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
@@ -66,7 +66,7 @@
 		},
 		{
 			"label": _("Communication"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -77,7 +77,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -88,7 +88,7 @@
 					"type": "doctype",
 					"label": _("Customer Group"),
 					"name": "Customer Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Customer Group",
 					"description": _("Manage Customer Group Tree."),
 				},
@@ -96,7 +96,7 @@
 					"type": "doctype",
 					"label": _("Territory"),
 					"name": "Territory",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Territory",
 					"description": _("Manage Territory Tree."),
 				},
@@ -104,7 +104,7 @@
 					"type": "doctype",
 					"label": _("Sales Person"),
 					"name": "Sales Person",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Sales Person",
 					"description": _("Manage Sales Person Tree."),
 				},
@@ -112,7 +112,7 @@
 		},
 		{
 			"label": _("SMS"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index c5a1320..9397ffc 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -79,7 +79,7 @@
 		{
 			"module_name": "Stock",
 			"color": "#f39c12",
-			"icon": "icon-truck",
+			"icon": "fa fa-truck",
 			"icon": "octicon octicon-package",
 			"type": "module",
 			"hidden": 1
@@ -94,7 +94,7 @@
 		{
 			"module_name": "Selling",
 			"color": "#1abc9c",
-			"icon": "icon-tag",
+			"icon": "fa fa-tag",
 			"icon": "octicon octicon-tag",
 			"type": "module",
 			"hidden": 1
@@ -102,7 +102,7 @@
 		{
 			"module_name": "Buying",
 			"color": "#c0392b",
-			"icon": "icon-shopping-cart",
+			"icon": "fa fa-shopping-cart",
 			"icon": "octicon octicon-briefcase",
 			"type": "module",
 			"hidden": 1
@@ -110,7 +110,7 @@
 		{
 			"module_name": "HR",
 			"color": "#2ecc71",
-			"icon": "icon-group",
+			"icon": "fa fa-group",
 			"icon": "octicon octicon-organization",
 			"label": _("Human Resources"),
 			"type": "module",
@@ -119,7 +119,7 @@
 		{
 			"module_name": "Manufacturing",
 			"color": "#7f8c8d",
-			"icon": "icon-cogs",
+			"icon": "fa fa-cogs",
 			"icon": "octicon octicon-tools",
 			"type": "module",
 			"hidden": 1
@@ -127,7 +127,7 @@
 		{
 			"module_name": "POS",
 			"color": "#589494",
-			"icon": "icon-th",
+			"icon": "fa fa-th",
 			"icon": "octicon octicon-credit-card",
 			"type": "page",
 			"link": "pos",
@@ -136,7 +136,7 @@
 		{
 			"module_name": "Projects",
 			"color": "#8e44ad",
-			"icon": "icon-puzzle-piece",
+			"icon": "fa fa-puzzle-piece",
 			"icon": "octicon octicon-rocket",
 			"type": "module",
 			"hidden": 1
@@ -144,7 +144,7 @@
 		{
 			"module_name": "Support",
 			"color": "#2c3e50",
-			"icon": "icon-phone",
+			"icon": "fa fa-phone",
 			"icon": "octicon octicon-issue-opened",
 			"type": "module",
 			"hidden": 1
@@ -231,7 +231,7 @@
 		{
 			"module_name": "Assessment",
 			"color": "#8a70be",
-			"icon": "icon-file-text-alt",
+			"icon": "fa fa-file-text-alt",
 			"label": _("Assessment"),
 			"link": "List/Assessment",
 			"_doctype": "Assessment",
@@ -240,7 +240,7 @@
 		{
 			"module_name": "Fees",
 			"color": "#83C21E",
-			"icon": "icon-money",
+			"icon": "fa fa-money",
 			"label": _("Fees"),
 			"link": "List/Fees",
 			"_doctype": "Fees",
@@ -258,7 +258,7 @@
 		{
 			"module_name": "Room",
 			"color": "#f22683",
-			"icon": "icon-map-marker",
+			"icon": "fa fa-map-marker",
 			"label": _("Room"),
 			"link": "List/Room",
 			"_doctype": "Room",
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 39d8878..0b21fec 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -151,14 +151,14 @@
 
 		{
 			"label": _("Tools"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 
 			]
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -193,7 +193,7 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -235,7 +235,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/maintenance.py b/erpnext/config/maintenance.py
index aa2f87c..7a44f55 100644
--- a/erpnext/config/maintenance.py
+++ b/erpnext/config/maintenance.py
@@ -4,7 +4,7 @@
 	return [
 		{
 			"label": _("Maintenance"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index d2432b6..0f76952 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Production"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -41,7 +41,7 @@
 				{
 					"type": "doctype",
 					"name": "BOM",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("BOM Browser"),
 					"description": _("Tree of Bill of Materials"),
 					"link": "Tree/BOM",
@@ -66,7 +66,7 @@
 		},
 		{
 			"label": _("Tools"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
@@ -87,7 +87,7 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -123,7 +123,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/projects.py b/erpnext/config/projects.py
index 87174a4..1a70aee 100644
--- a/erpnext/config/projects.py
+++ b/erpnext/config/projects.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Projects"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -48,7 +48,7 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -66,7 +66,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 45ec1f7..c406d09 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -5,7 +5,7 @@
 	return [
 		{
 			"label": _("Sales"),
-			"icon": "icon-star",
+			"icon": "fa fa-star",
 			"items": [
 				{
 					"type": "doctype",
@@ -31,7 +31,7 @@
 					"type": "doctype",
 					"label": _("Customer Group"),
 					"name": "Customer Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Customer Group",
 					"description": _("Manage Customer Group Tree."),
 				},
@@ -69,7 +69,7 @@
 				{
 					"type": "doctype",
 					"name": "Item Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Item Group"),
 					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
@@ -100,7 +100,7 @@
 					"type": "doctype",
 					"label": _("Territory"),
 					"name": "Territory",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Territory",
 					"description": _("Manage Territory Tree."),
 				},
@@ -113,7 +113,7 @@
 					"type": "doctype",
 					"label": _("Sales Person"),
 					"name": "Sales Person",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"link": "Tree/Sales Person",
 					"description": _("Manage Sales Person Tree."),
 				},
@@ -135,7 +135,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -167,26 +167,26 @@
 		},
 		{
 			"label": _("Analytics"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "page",
 					"name": "sales-analytics",
 					"label": _("Sales Analytics"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "page",
 					"name": "sales-funnel",
 					"label": _("Sales Funnel"),
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
 					"is_query_report": True,
 					"name": "Customer Acquisition and Loyalty",
 					"doctype": "Customer",
-					"icon": "icon-bar-chart",
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
@@ -204,7 +204,7 @@
 		},
 		{
 			"label": _("Other Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -270,7 +270,7 @@
 		},
 		{
 			"label": _("SMS"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index 5ad6403..9c9bae2 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -6,7 +6,7 @@
 	data = [
 		{
 			"label": _("Settings"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
@@ -19,7 +19,7 @@
 		},
 		{
 			"label": _("Printing"),
-			"icon": "icon-print",
+			"icon": "fa fa-print",
 			"items": [
 				{
 					"type": "doctype",
@@ -75,7 +75,7 @@
 		},
 		{
 			"label": _("Customize"),
-			"icon": "icon-glass",
+			"icon": "fa fa-glass",
 			"items": [
 				{
 					"type": "doctype",
@@ -92,7 +92,7 @@
 		},
 		{
 			"label": _("Email"),
-			"icon": "icon-envelope",
+			"icon": "fa fa-envelope",
 			"items": [
 				{
 					"type": "doctype",
@@ -109,12 +109,12 @@
 	]
 
 	for module, label, icon in (
-		("accounts", _("Accounts"), "icon-money"),
-		("stock", _("Stock"), "icon-truck"),
-		("selling", _("Selling"), "icon-tag"),
-		("buying", _("Buying"), "icon-shopping-cart"),
-		("hr", _("Human Resources"), "icon-group"),
-		("support", _("Support"), "icon-phone")):
+		("accounts", _("Accounts"), "fa fa-money"),
+		("stock", _("Stock"), "fa fa-truck"),
+		("selling", _("Selling"), "fa fa-tag"),
+		("buying", _("Buying"), "fa fa-shopping-cart"),
+		("hr", _("Human Resources"), "fa fa-group"),
+		("support", _("Support"), "fa fa-phone")):
 
 		add_setup_section(data, "erpnext", module, label, icon)
 
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 5b78ca3..3ca424d 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -79,7 +79,7 @@
 				{
 					"type": "doctype",
 					"name": "Item Group",
-					"icon": "icon-sitemap",
+					"icon": "fa fa-sitemap",
 					"label": _("Item Group"),
 					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
@@ -140,7 +140,7 @@
 		},
 		{
 			"label": _("Tools"),
-			"icon": "icon-wrench",
+			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
@@ -166,7 +166,7 @@
 		},
 		{
 			"label": _("Setup"),
-			"icon": "icon-cog",
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
@@ -198,7 +198,7 @@
 		},
 		{
 			"label": _("Analytics"),
-			"icon": "icon-table",
+			"icon": "fa fa-table",
 			"items": [
 				{
 					"type": "report",
@@ -210,7 +210,7 @@
 					"type": "page",
 					"name": "stock-analytics",
 					"label": _("Stock Analytics"),
-					"icon": "icon-bar-chart"
+					"icon": "fa fa-bar-chart"
 				},
 				{
 					"type": "report",
@@ -229,7 +229,7 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "report",
@@ -277,7 +277,7 @@
 		},
 		{
 			"label": _("Help"),
-			"icon": "icon-facetime-video",
+			"icon": "fa fa-facetime-video",
 			"items": [
 				{
 					"type": "help",
diff --git a/erpnext/config/support.py b/erpnext/config/support.py
index a4a4c22..c1f56f0 100644
--- a/erpnext/config/support.py
+++ b/erpnext/config/support.py
@@ -35,13 +35,13 @@
 		},
 		{
 			"label": _("Reports"),
-			"icon": "icon-list",
+			"icon": "fa fa-list",
 			"items": [
 				{
 					"type": "page",
 					"name": "support-analytics",
 					"label": _("Support Analytics"),
-					"icon": "icon-bar-chart"
+					"icon": "fa fa-bar-chart"
 				},
 				{
 					"type": "report",
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 3ebe6f0..95f6c0b 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -6,7 +6,7 @@
 app_title = "ERPNext"
 app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
-app_icon = "icon-th"
+app_icon = "fa fa-th"
 app_color = "#e74c3c"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"