diff --git a/frappe/public/images/favicon.ico b/frappe/public/images/favicon.ico
new file mode 100644
index 0000000000..19714782c3
Binary files /dev/null and b/frappe/public/images/favicon.ico differ
diff --git a/frappe/public/images/icons/accept.gif b/frappe/public/images/icons/accept.gif
deleted file mode 100644
index 29f3ed7c97..0000000000
Binary files a/frappe/public/images/icons/accept.gif and /dev/null differ
diff --git a/frappe/public/images/icons/application.gif b/frappe/public/images/icons/application.gif
deleted file mode 100644
index 457867741c..0000000000
Binary files a/frappe/public/images/icons/application.gif and /dev/null differ
diff --git a/frappe/public/images/icons/arrow_down.gif b/frappe/public/images/icons/arrow_down.gif
deleted file mode 100644
index cf389527b8..0000000000
Binary files a/frappe/public/images/icons/arrow_down.gif and /dev/null differ
diff --git a/frappe/public/images/icons/arrow_up.gif b/frappe/public/images/icons/arrow_up.gif
deleted file mode 100644
index 92378d54ee..0000000000
Binary files a/frappe/public/images/icons/arrow_up.gif and /dev/null differ
diff --git a/frappe/public/images/icons/bullet_arrow_down.png b/frappe/public/images/icons/bullet_arrow_down.png
deleted file mode 100755
index 9b23c06d7b..0000000000
Binary files a/frappe/public/images/icons/bullet_arrow_down.png and /dev/null differ
diff --git a/frappe/public/images/icons/close.gif b/frappe/public/images/icons/close.gif
deleted file mode 100644
index dba096b78a..0000000000
Binary files a/frappe/public/images/icons/close.gif and /dev/null differ
diff --git a/frappe/public/images/icons/collapse.gif b/frappe/public/images/icons/collapse.gif
deleted file mode 100644
index 01e691450c..0000000000
Binary files a/frappe/public/images/icons/collapse.gif and /dev/null differ
diff --git a/frappe/public/images/icons/error.gif b/frappe/public/images/icons/error.gif
deleted file mode 100644
index 4682b63007..0000000000
Binary files a/frappe/public/images/icons/error.gif and /dev/null differ
diff --git a/frappe/public/images/icons/expand.gif b/frappe/public/images/icons/expand.gif
deleted file mode 100644
index 1b24ef1248..0000000000
Binary files a/frappe/public/images/icons/expand.gif and /dev/null differ
diff --git a/frappe/public/images/icons/folder.gif b/frappe/public/images/icons/folder.gif
deleted file mode 100644
index 45b191d8ae..0000000000
Binary files a/frappe/public/images/icons/folder.gif and /dev/null differ
diff --git a/frappe/public/images/icons/glyphicons-halflings-white.png b/frappe/public/images/icons/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484a29..0000000000
Binary files a/frappe/public/images/icons/glyphicons-halflings-white.png and /dev/null differ
diff --git a/frappe/public/images/icons/glyphicons-halflings.png b/frappe/public/images/icons/glyphicons-halflings.png
deleted file mode 100644
index 79bc568c21..0000000000
Binary files a/frappe/public/images/icons/glyphicons-halflings.png and /dev/null differ
diff --git a/frappe/public/images/icons/help.png b/frappe/public/images/icons/help.png
deleted file mode 100755
index 5c870176d4..0000000000
Binary files a/frappe/public/images/icons/help.png and /dev/null differ
diff --git a/frappe/public/images/icons/icons.png b/frappe/public/images/icons/icons.png
deleted file mode 100644
index fac6f173f0..0000000000
Binary files a/frappe/public/images/icons/icons.png and /dev/null differ
diff --git a/frappe/public/images/icons/lightbulb.gif b/frappe/public/images/icons/lightbulb.gif
deleted file mode 100644
index 9a15662458..0000000000
Binary files a/frappe/public/images/icons/lightbulb.gif and /dev/null differ
diff --git a/frappe/public/images/icons/link.png b/frappe/public/images/icons/link.png
deleted file mode 100755
index 25eacb7c25..0000000000
Binary files a/frappe/public/images/icons/link.png and /dev/null differ
diff --git a/frappe/public/images/icons/minus.gif b/frappe/public/images/icons/minus.gif
deleted file mode 100755
index bb6b73b339..0000000000
Binary files a/frappe/public/images/icons/minus.gif and /dev/null differ
diff --git a/frappe/public/images/icons/page.png b/frappe/public/images/icons/page.png
deleted file mode 100755
index 03ddd799fa..0000000000
Binary files a/frappe/public/images/icons/page.png and /dev/null differ
diff --git a/frappe/public/images/icons/paperclip.gif b/frappe/public/images/icons/paperclip.gif
deleted file mode 100644
index b6c6d62179..0000000000
Binary files a/frappe/public/images/icons/paperclip.gif and /dev/null differ
diff --git a/frappe/public/images/icons/plus.gif b/frappe/public/images/icons/plus.gif
deleted file mode 100755
index eb83daf7f6..0000000000
Binary files a/frappe/public/images/icons/plus.gif and /dev/null differ
diff --git a/frappe/public/images/icons/resultset_first.gif b/frappe/public/images/icons/resultset_first.gif
deleted file mode 100644
index e8c1a86ff0..0000000000
Binary files a/frappe/public/images/icons/resultset_first.gif and /dev/null differ
diff --git a/frappe/public/images/icons/resultset_last.gif b/frappe/public/images/icons/resultset_last.gif
deleted file mode 100644
index 8417c50e3f..0000000000
Binary files a/frappe/public/images/icons/resultset_last.gif and /dev/null differ
diff --git a/frappe/public/images/icons/resultset_next.gif b/frappe/public/images/icons/resultset_next.gif
deleted file mode 100644
index 534f12361e..0000000000
Binary files a/frappe/public/images/icons/resultset_next.gif and /dev/null differ
diff --git a/frappe/public/images/icons/resultset_previous.gif b/frappe/public/images/icons/resultset_previous.gif
deleted file mode 100644
index 7e0812a801..0000000000
Binary files a/frappe/public/images/icons/resultset_previous.gif and /dev/null differ
diff --git a/frappe/public/images/icons/sort_asc.gif b/frappe/public/images/icons/sort_asc.gif
deleted file mode 100644
index f9ddf4e7e1..0000000000
Binary files a/frappe/public/images/icons/sort_asc.gif and /dev/null differ
diff --git a/frappe/public/images/icons/sort_desc.gif b/frappe/public/images/icons/sort_desc.gif
deleted file mode 100644
index b16b69b6b9..0000000000
Binary files a/frappe/public/images/icons/sort_desc.gif and /dev/null differ
diff --git a/frappe/public/images/icons/wntoolbar-icons.png b/frappe/public/images/icons/wntoolbar-icons.png
deleted file mode 100644
index 1e17e11593..0000000000
Binary files a/frappe/public/images/icons/wntoolbar-icons.png and /dev/null differ
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 02490f6a62..a5c59141be 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -87,6 +87,9 @@ def get_website_settings():
 		if k in settings.fields:
 			context[k] = settings.fields.get(k)
 			
+	if not context.get("favicon"):
+		context["favicon"] = "/assets/frappe/images/favicon.ico"
+			
 	if settings.address:
 		context["footer_address"] = settings.address