diff --git a/media/favicons/favicon.ico b/media/favicons/favicon.ico
deleted file mode 100644
index c2a2563f20..0000000000
Binary files a/media/favicons/favicon.ico and /dev/null differ
diff --git a/media/favicons/favicon.png b/media/favicons/favicon.png
new file mode 100644
index 0000000000..a2d10eb33e
Binary files /dev/null and b/media/favicons/favicon.png differ
diff --git a/media/favicons/favicon.svg b/media/favicons/favicon.svg
deleted file mode 100644
index ff434014cb..0000000000
--- a/media/favicons/favicon.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
diff --git a/media/favicons/icon-192.png b/media/favicons/icon-192.png
deleted file mode 100644
index 4386a94489..0000000000
Binary files a/media/favicons/icon-192.png and /dev/null differ
diff --git a/media/favicons/icon-512.png b/media/favicons/icon-512.png
deleted file mode 100644
index d22a735ff9..0000000000
Binary files a/media/favicons/icon-512.png and /dev/null differ
diff --git a/media/favicons/manifest.webmanifest b/media/favicons/manifest.webmanifest
deleted file mode 100644
index a74304ae33..0000000000
--- a/media/favicons/manifest.webmanifest
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "icons": [
- { "src": "/favicon.svg", "type": "image/svg+xml", "sizes": "32x32" }
- ]
-}
diff --git a/seahub/base/context_processors.py b/seahub/base/context_processors.py
index 18711f2f1a..46bda2a51a 100644
--- a/seahub/base/context_processors.py
+++ b/seahub/base/context_processors.py
@@ -20,8 +20,7 @@ import seaserv
from seahub.settings import SEAFILE_VERSION, SITE_DESCRIPTION, \
MAX_FILE_NAME, LOGO_PATH, BRANDING_CSS, LOGO_WIDTH, LOGO_HEIGHT,\
SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \
- FAVICON_PATH, FAVICON_SVG_PATH, APPLE_TOUCH_ICON_PATH, \
- MANIFEST_WEBMANIFEST_PATH, THUMBNAIL_SIZE_FOR_ORIGINAL, \
+ FAVICON_PATH, APPLE_TOUCH_ICON_PATH, THUMBNAIL_SIZE_FOR_ORIGINAL, \
MEDIA_ROOT, SHOW_LOGOUT_ICON, CUSTOM_LOGO_PATH, CUSTOM_FAVICON_PATH, \
ENABLE_SEAFILE_DOCS, LOGIN_BG_IMAGE_PATH, \
CUSTOM_LOGIN_BG_PATH, ENABLE_SHARE_LINK_REPORT_ABUSE, \
@@ -109,9 +108,7 @@ def base(request):
'branding_css': BRANDING_CSS,
'enable_branding_css': config.ENABLE_BRANDING_CSS,
'favicon_path': favicon_path,
- 'favicon_svg_path': FAVICON_SVG_PATH,
'apple_touch_icon_path': APPLE_TOUCH_ICON_PATH,
- 'manifest_webmanifest_path': MANIFEST_WEBMANIFEST_PATH,
'login_bg_path': login_bg_path,
'logo_path': logo_path,
'logo_width': LOGO_WIDTH,
diff --git a/seahub/settings.py b/seahub/settings.py
index 46a1077c9d..e4f045b3b8 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -564,10 +564,8 @@ LOGIN_BG_IMAGE_PATH = 'img/login-bg.jpg'
# Path to the favicon file (relative to the media path)
# tip: use a different name when modify it.
-FAVICON_PATH = 'favicons/favicon.ico'
-FAVICON_SVG_PATH = 'favicons/favicon.svg'
-APPLE_TOUCH_ICON_PATH = 'favicons/favicon.svg'
-MANIFEST_WEBMANIFEST_PATH = 'favicons/manifest.webmanifest'
+FAVICON_PATH = 'favicons/favicon.png'
+APPLE_TOUCH_ICON_PATH = 'favicons/favicon.png'
# Path to the Logo Imagefile (relative to the media path)
LOGO_PATH = 'img/seafile-logo.png'
diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 7d75fec9fa..bf671eaced 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -12,9 +12,7 @@
{% endblock %}
-
-
{% block extra_base_style %}
{% endblock %}
diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html
index 4b0c5fad16..ed63a5d7ea 100644
--- a/seahub/templates/base_for_react.html
+++ b/seahub/templates/base_for_react.html
@@ -14,9 +14,7 @@
{% block extra_ogp_tags %}{% endblock %}
-
-