diff --git a/media/css/seahub.css b/media/css/seahub.css
index e046a79687..7fb5bd418d 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -2597,7 +2597,7 @@ textarea:-moz-placeholder {/* for FF */
     position:fixed;
     right:0;
 }
-#fileview-toolbar .item {
+.fileview-toolbar .item {
     width:59px;
     height:40px;
     padding-top:18px;
@@ -2608,11 +2608,11 @@ textarea:-moz-placeholder {/* for FF */
     border-right:0;
     border-top:0;
 }
-#fileview-toolbar .item:first-child {
+.fileview-toolbar .item:first-child {
     border-top:1px solid #c0c0c0;
     border-top-left-radius:3px;
 }
-#fileview-toolbar .item:last-child {
+.fileview-toolbar .item:last-child {
     border-bottom-left-radius:3px;
 }
 /* shareadmin & useradmin */
diff --git a/media/img/top.png b/media/img/top.png
new file mode 100644
index 0000000000..43dc2a1ed9
Binary files /dev/null and b/media/img/top.png differ
diff --git a/seahub/templates/view_file_base.html b/seahub/templates/view_file_base.html
index e276f2a257..2c9ad7142e 100644
--- a/seahub/templates/view_file_base.html
+++ b/seahub/templates/view_file_base.html
@@ -9,6 +9,7 @@
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/file_view_extra.css" />
 <style type="text/css">                                                
 #header, #footer { display:none; }
+#view-hd { margin-top: 4px; }
 #star {
     vertical-align:middle;
     margin-left:3px;
@@ -116,18 +117,20 @@
 
     {% include "snippets/file_share_popup.html" %} 
 
-    <ul id="fileview-toolbar">
-        {% if groups %}
-        <li class="item" id="file-discuss-icon"><img src="{{MEDIA_URL}}img/discuss.png" alt="{% trans "discuss" %}" /></li>
-        <li id="file-group-icon" class="item"><img src="{{MEDIA_URL}}img/groups.png" alt="{% trans "group" %}" /></li>
-        {% endif %}
-        {% if not repo.encrypted %}
-        <li id="share" class="item" data-link="{{ file_shared_link }}" data-token="{{ fileshare.token }}"><img src="{{MEDIA_URL}}img/share.png" alt="{% trans "share"%}" /></li>
-        {% endif %}
-        {% if user_perm == 'rw' %}
-        <li id="history" class="item" data-url="{% url 'file_revisions' repo.id %}?p={{ path|urlencode }}"><img src="{{MEDIA_URL}}img/history.png" alt="{% trans "history"%}" />
-        {% endif %}
-    </ul>
+    <div id="fileview-toolbar">
+        <ul class="fileview-toolbar">
+            {% if groups %}
+            <li class="item" id="file-discuss-icon"><img src="{{MEDIA_URL}}img/discuss.png" alt="{% trans "discuss" %}" /></li>
+            <li id="file-group-icon" class="item"><img src="{{MEDIA_URL}}img/groups.png" alt="{% trans "group" %}" /></li>
+            {% endif %}
+            {% if not repo.encrypted %}
+            <li id="share" class="item" data-link="{{ file_shared_link }}" data-token="{{ fileshare.token }}"><img src="{{MEDIA_URL}}img/share.png" alt="{% trans "share"%}" /></li>
+            {% endif %}
+            {% if user_perm == 'rw' %}
+            <li id="history" class="item" data-url="{% url 'file_revisions' repo.id %}?p={{ path|urlencode }}"><img src="{{MEDIA_URL}}img/history.png" alt="{% trans "history"%}" />
+            {% endif %}
+        </ul>
+    <div>
 
     {% if groups %}
     <div id="discuss-to-group" class="hide">
@@ -228,12 +231,30 @@ $('#star').click(function() {
 // set 'side toolbar' & 'groups' popup position
 function setToolbarPos() {
     var toolbar = $('#fileview-toolbar');
+
+    // set toolbar pos
     toolbar.css({'top': ($(window).height() - toolbar.outerHeight())/2});
 
     // set 'groups' popup position
     $('#to-group').css({'top': parseInt(toolbar.css('top')) + 59});
 }
-$(window).load(setToolbarPos).resize(setToolbarPos);
+$(window).load(function() {
+    // if page needs scroll, show 'back-to-top' icon
+    if ($(document).height() > $(window).height()) {
+        var to_top = $('<ul class="fileview-toolbar hide" style="margin-top:3px;"><li class="item"><img src="{{MEDIA_URL}}img/top.png" alt="{% trans "top" %}" /></li></ul>');
+        to_top.click(function() {
+            $(window).scrollTop(0);
+        }).appendTo($('#fileview-toolbar'));
+        $(window).scroll(function() {
+            if ($(window).scrollTop() > 0) {
+                to_top.show();
+            } else {
+                to_top.hide();
+            }
+        });
+    }
+    setToolbarPos();
+}).resize(setToolbarPos);
 
 // handle discussions after fetch them
 function handleDiscussions(html) {