diff --git a/media/css/seahub.css b/media/css/seahub.css
index 075b8bb2b5..e1ccae600a 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3585,6 +3585,9 @@ img.thumbnail {
     opacity:0;
     filter:alpha(opacity=0);
 }
+.web-setting-cur-img {
+    margin-bottom:5px;
+}
 /* view shared dir */
 .mode-link {
     display:inline-block;
diff --git a/media/img/favicon.ico b/media/img/favicon.ico
index 23d8953706..c2a2563f20 100644
Binary files a/media/img/favicon.ico and b/media/img/favicon.ico differ
diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 0b3ea11302..6396ec1be8 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -10,7 +10,7 @@
 {% block viewport %}
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 {% endblock %}
-<link rel="icon" href="{{ MEDIA_URL }}{{ favicon_path }}" />
+<link rel="shortcut icon" href="{{ MEDIA_URL }}{{ favicon_path }}" />
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/jstree_default_theme/style.min.css" />
 <link rel="stylesheet" type="text/css" href="{% static "css/magnific-popup.css" %}" />
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index abb69f992d..d8047dddb3 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -9,7 +9,7 @@
 <meta name="keywords" content="{% trans "File Collaboration Team Organization" %}" />
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 <meta http-equiv="x-ua-compatible" content="ie=edge">
-<link rel="icon" href="{{ MEDIA_URL }}{{ favicon_path }}" />
+<link rel="shortcut icon" href="{{ MEDIA_URL }}{{ favicon_path }}" />
 {% compress css %}
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/jstree_default_theme/style.min.css" />
diff --git a/seahub/templates/snippets/web_settings_form.html b/seahub/templates/snippets/web_settings_form.html
index 1befc79ec1..22dda8d6c5 100644
--- a/seahub/templates/snippets/web_settings_form.html
+++ b/seahub/templates/snippets/web_settings_form.html
@@ -31,7 +31,8 @@
 <form class="web-setting-form" action="">{% csrf_token %}
     <h5 class="web-setting-name">{{ setting_display_name }}</h5>
     <div class="web-setting-input web-setting-file-input">
-        <img src="{{ MEDIA_URL }}{{ file_path }}" alt="" />
+        <img src="{{ MEDIA_URL }}{{ file_path }}" alt="" width="{{ file_width }}" height="{{file_height}}" class="web-setting-cur-img" />
+        <p class="tip">{{ help_tip }}</p>
         <div class="web-setting-file-upload">
             <input type="file" name="{{ setting_name }}" class="web-setting-file-upload-input transparent-file-input" />
             <button type="button" class="web-setting-file-upload-btn">{% trans "Change" %}</button>
diff --git a/seahub/templates/sysadmin/settings.html b/seahub/templates/sysadmin/settings.html
index 6c421f979c..d5a20f4751 100644
--- a/seahub/templates/sysadmin/settings.html
+++ b/seahub/templates/sysadmin/settings.html
@@ -25,12 +25,12 @@
 
     <h4>{% trans "Logo" %}</h4>
 
-    {% with type="file" setting_name="logo" file_path=logo_path %}
+    {% with type="file" setting_name="logo" file_path=logo_path file_width=256 file_height=64 help_tip="logo.png, 256px * 64px" %}
         {% trans "Logo" as setting_display_name %}
         {% include "snippets/web_settings_form.html" %}
     {% endwith %}
 
-    {% with type="file" setting_name="favicon" file_path=favicon_path %}
+    {% with type="file" setting_name="favicon" file_path=favicon_path file_width=32 file_height=32 help_tip="favicon.ico, 32px * 32px" %}
         {% trans "Favicon" as setting_display_name %}
         {% include "snippets/web_settings_form.html" %}
     {% endwith %}
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index 851d9c360b..a858248281 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -9,7 +9,7 @@
 <meta name="keywords" content="{% trans "File Collaboration Team Organization" %}" />
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
-<link rel="icon" href="{{ MEDIA_URL }}{{ favicon_path }}" />
+<link rel="shortcut icon" href="{{ MEDIA_URL }}{{ favicon_path }}" />
 
 {% compress css %}
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>