diff --git a/media/img/favicon.ico b/media/img/favicon.ico
new file mode 100644
index 0000000000..23d8953706
Binary files /dev/null and b/media/img/favicon.ico differ
diff --git a/media/img/favicon.png b/media/img/favicon.png
deleted file mode 100644
index 379988d7e8..0000000000
Binary files a/media/img/favicon.png and /dev/null differ
diff --git a/seahub/base/context_processors.py b/seahub/base/context_processors.py
index 10ac828b3b..5b1b086266 100644
--- a/seahub/base/context_processors.py
+++ b/seahub/base/context_processors.py
@@ -15,7 +15,8 @@ from constance import config
from seahub.settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, \
MAX_FILE_NAME, BRANDING_CSS, LOGO_PATH, LOGO_WIDTH, LOGO_HEIGHT,\
- SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION
+ SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \
+ FAVICON_PATH
try:
from seahub.settings import SEACLOUD_MODE
@@ -60,6 +61,7 @@ def base(request):
'seafile_version': SEAFILE_VERSION,
'site_title': SITE_TITLE,
'branding_css': BRANDING_CSS,
+ 'favicon_path': FAVICON_PATH,
'logo_path': LOGO_PATH,
'logo_width': LOGO_WIDTH,
'logo_height': LOGO_HEIGHT,
diff --git a/seahub/settings.py b/seahub/settings.py
index 5dbd3bd194..8f46f72162 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -390,6 +390,10 @@ SITE_TITLE = 'Private Seafile'
# Base name used in email sending
SITE_NAME = 'Seafile'
+# Path to the favicon file (relative to the media path)
+# tip: use a different name when modify it.
+FAVICON_PATH = 'img/favicon.ico'
+
# Path to the Logo Imagefile (relative to the media path)
LOGO_PATH = 'img/seafile-logo.png'
# logo size. the unit is 'px'
diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 0a69d42da1..9e84bbba22 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -10,10 +10,7 @@
{% block viewport %}
{% endblock %}
-
-
+
{% block extra_style %}{% endblock %}
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index e5759d4969..fe8d6d063a 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -9,11 +9,7 @@
-
-
-
+
{% compress css %}
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index 3a5b95aff6..db04ca0a37 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -8,11 +8,7 @@
-
-
-
+
{% compress css %}