diff --git a/media/css/seahub.css b/media/css/seahub.css
index 43d2f76a6a..95812ac8e0 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -785,12 +785,6 @@ textarea:-moz-placeholder {/* for FF */
 .checkbox-option {
     vertical-align:middle;
 }
-#simplemodal-container .checkbox-option {
-    font-weight:normal;
-}
-#simplemodal-container .checkbox-label {
-    margin:4px 0;
-}
 .checkbox-label {
     display:block;
 }
@@ -1043,6 +1037,12 @@ textarea:-moz-placeholder {/* for FF */
 #simplemodal-container label {
     margin:8px 0 4px;
 }
+#simplemodal-container .checkbox-option {
+    font-weight:normal;
+}
+#simplemodal-container .checkbox-label {
+    margin:4px 0;
+}
 .simplemodal-close {
     margin-left:5px;
 }
diff --git a/media/img/folder-icon-24.png b/media/img/folder-icon-24.png
deleted file mode 100644
index 239a9d43cc..0000000000
Binary files a/media/img/folder-icon-24.png and /dev/null differ
diff --git a/seahub/api2/templates/api2/discussion.html b/seahub/api2/templates/api2/discussion.html
deleted file mode 100644
index cd15fb4e4b..0000000000
--- a/seahub/api2/templates/api2/discussion.html
+++ /dev/null
@@ -1,89 +0,0 @@
-{% extends "api2/base.html" %}
-
-{% load seahub_tags avatar_tags i18n %}
-{% load url from future %}
-
-{% block sub_title %}{% trans "Discussion" %} - {% endblock %}
-
-{% block main_panel %}
-
-<div class="msg msg-page">
-        <div class="msg-top ovhd">
-        {% avatar msg.from_email 48 %}
-        <div class="txt">
-            <div class="msg-main">
-                <div class="msg-hd ovhd">
-                    <span class="author">{{ msg.from_email|email2nickname }}</span>
-                    <span class="time">{{ msg.timestamp|translate_seahub_time }}</span>
-                </div>
-                <p class="msg-con">{{ msg.message|seahub_urlize|find_at|linebreaksbr }}</p>
-                {% if msg.attachment %}
-                {% with ma=msg.attachment %}
-                <div class="msg-attachment">
-                    {% if ma.src == 'recommend' %}
-                    {% if ma.attach_type == 'file' %}
-                        {% if ma.filetype != 'Image'%}
-                        <img src="{{ MEDIA_URL }}img/file/{{ ma.name|file_icon_filter }}" alt="{% trans "File"%}" height="18" class="vam" />
-                        <span class="name vam">{{ ma.name }}</span>
-                        {% else %}
-                            {% if ma.err %}
-                            <p class="error">{{ma.err}}</p>
-                            {% else %}
-                            <img src="{{ma.img_url}}" alt="{{ma.name}}" class="img" />
-                            {% endif %}
-                        {% endif %}
-                    {% else %}
-                    <img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
-                    <span class="name vam">{{ ma.name }}</span>
-                    {% endif %}
-                    {% endif %}
-
-                    {% if ma.src == 'filecomment' %} {# compatible with comments already exist #}
-                    <img src="{{ MEDIA_URL }}img/file/{{ ma.name|file_icon_filter }}" alt="{% trans "File"%}" height="18" class="vam" />
-                    <span class="name vam">{{ ma.name }}</span>
-                    {% endif %}
-                </div>
-                {% endwith %}
-                {% endif %}
-            </div>
-        </div>
-    </div>
-
-    {% if msg.reply_cnt > 0 %}
-    <div class="msg-op">
-    {% else %}
-    <div class="msg-op hide">
-    {% endif %}
-        <ul class="reply-list" id="reply-list">
-            {% for r in msg.replies %}
-            <li class="reply ovhd reply-at">
-            {% avatar r.from_email 48 %}
-            <div class="txt">
-                <span class="author">{{ r.from_email|email2nickname }}</span>
-                <span class="time">{{ r.timestamp|translate_seahub_time }}</span>
-                <p class="reply-con">{{ r.message|seahub_urlize|find_at }}</p>
-            </div>
-            </li>
-            {% endfor %}
-        </ul>
-        <div class="outer-caret"><div class="inner-caret"></div></div>
-    </div>
-
-</div>
-{% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript">
-var g_token = "TOKEN";
-function setToken(token) {
-    g_token = token;
-}
-function getToken() {
-    return g_token;
-}
-function addMessage(html) {
-    $('#reply-list').append(html);
-    $('.msg-op').removeClass('hide');
-}
-</script>
-{% endblock %}
diff --git a/seahub/api2/templates/api2/discussion_posted.html b/seahub/api2/templates/api2/discussion_posted.html
deleted file mode 100644
index a3df26f78a..0000000000
--- a/seahub/api2/templates/api2/discussion_posted.html
+++ /dev/null
@@ -1,64 +0,0 @@
-{% load seahub_tags avatar_tags i18n %}
-{% load url from future %}
-
- <li class="msg ovhd" data-msgid="{{msg.id}}">
-        {% avatar msg.from_email 48 %}
-        <div class="txt">
-            <div class="msg-main">
-                <div class="msg-hd ovhd">
-                    <span class="author">{{ msg.from_email|email2nickname }}</span>
-                    <span class="time">{{ msg.timestamp|translate_seahub_time }}</span>
-                </div>
-                <p class="msg-con">{{ msg.message|seahub_urlize|find_at|linebreaksbr }}</p>
-                {% if msg.attachment %}
-                {% with ma=msg.attachment %}
-                <div class="msg-attachment">
-                    {% if ma.src == 'recommend' %}
-                    {% if ma.attach_type == 'file' %}
-                        {% if ma.filetype != 'Image'%}
-                        <img src="{{ MEDIA_URL }}img/file/{{ ma.name|file_icon_filter }}" alt="{% trans "File"%}" height="18" class="vam" />
-                        <span class="name vam">{{ ma.name }}</span>
-                        {% else %}
-                            {% if ma.err %}
-                            <p class="error">{{ma.err}}</p>
-                            {% else %}
-                            <img src="{{ma.img_url}}" alt="{{ma.name}}" class="img" />
-                            {% endif %}
-                        {% endif %}
-                    {% else %}
-                    <img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
-                    <span class="name vam">{{ ma.name }}</span>
-                    {% endif %}
-                    {% endif %}
-
-                    {% if ma.src == 'filecomment' %} {# compatible with comments already exist #}
-                    <img src="{{ MEDIA_URL }}img/file/{{ ma.name|file_icon_filter }}" alt="{% trans "File"%}" height="18" class="vam" />
-                    <span class="name vam">{{ ma.name }}</span>
-                    {% endif %}
-                </div>
-                {% endwith %}
-                {% endif %}
-            </div>
-
-            {% if msg.reply_cnt > 0 %}
-            <div class="msg-op">
-                {% if msg.reply_cnt > 3 %}
-                <span class="replies-num">{% blocktrans with amount=msg.reply_cnt %}{{ amount }} replies{% endblocktrans %}</span>
-                {% endif %}
-                <ul class="reply-list">
-                    {% for r in msg.replies %}
-                    <li class="reply w100 ovhd reply-at">
-                    {% avatar r.from_email 28 %}
-                    <div class="txt">
-                        <span class="author">{{ r.from_email|email2nickname  }}</span>
-                        <span class="time">{{ r.timestamp|translate_seahub_time }}</span>
-                        <p class="reply-con">{{ r.message|seahub_urlize|find_at }}</p>
-                    </div>
-                    </li>
-                    {% endfor %}
-                </ul>
-                <div class="outer-caret"><div class="inner-caret"></div></div>
-            </div>
-            {% endif %}
-        </div>
-        </li>
diff --git a/seahub/api2/templates/api2/new_msg_reply.html b/seahub/api2/templates/api2/new_msg_reply.html
deleted file mode 100644
index 5b745c0e5d..0000000000
--- a/seahub/api2/templates/api2/new_msg_reply.html
+++ /dev/null
@@ -1,88 +0,0 @@
-{% extends "api2/base.html" %}
-
-{% load seahub_tags avatar_tags i18n %}
-{% load url from future %}
-
-{% block sub_title %}{% trans "New Replies" %} - {% endblock %}
-
-{% block main_panel %}
-
-{% for msg in group_msgs %}
-
-<div class="msg ovhd">
-        {% avatar msg.from_email 48 %}
-        <div class="txt">
-            <div class="msg-main">
-                <div class="msg-hd ovhd">
-                    <span class="author">{{ msg.from_email|email2nickname }}</span>
-                    <span class="time">{{ msg.timestamp|translate_seahub_time }}</span>
-                </div>
-                <p class="msg-con">{{ msg.message|seahub_urlize|find_at|linebreaksbr }}</p>
-                {% if msg.attachment %}
-                {% with ma=msg.attachment %}
-                <div class="msg-attachment">
-                    {% if ma.src == 'recommend' %}
-                    {% if ma.attach_type == 'file' %}
-                        {% if ma.filetype != 'Image'%}
-                        <img src="{{ MEDIA_URL }}img/file/{{ ma.name|file_icon_filter }}" alt="{% trans "File"%}" height="18" class="vam" />
-                        <span class="name vam">{{ ma.name }}</span>
-                        {% else %}
-                            {% if ma.err %}
-                            <p class="error">{{ma.err}}</p>
-                            {% else %}
-                            <img src="{{ma.img_url}}" alt="{{ma.name}}" class="img" />
-                            {% endif %}
-                        {% endif %}
-                    {% else %}
-                    <img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" height="20" class="vam" />
-                    <span class="name vam">{{ ma.name }}</span>
-                    {% endif %}
-                    {% endif %}
-
-                    {% if ma.src == 'filecomment' %} {# compatible with comments already exist #}
-                    <img src="{{ MEDIA_URL }}img/file/{{ ma.name|file_icon_filter }}" alt="{% trans "File"%}" height="18" class="vam" />
-                    <span class="name vam">{{ ma.name }}</span>
-                    {% endif %}
-                </div>
-                {% endwith %}
-                {% endif %}
-            </div>
-    {% if msg.reply_cnt > 0 %}
-    <div class="msg-op">
-    {% else %}
-    <div class="msg-op hide">
-    {% endif %}
-        <ul class="reply-list">
-            {% for r in msg.replies %}
-            <li class="reply w100 ovhd reply-at">
-            {% avatar r.from_email 28 %}
-            <div class="txt">
-                <span class="author">{{ r.from_email|email2nickname }}</span>
-                <span class="time">{{ r.timestamp|translate_seahub_time }}</span>
-                <p class="reply-con">{{ r.message|seahub_urlize|find_at }}</p>
-            </div>
-            </li>
-            {% endfor %}
-        </ul>
-        <div class="outer-caret"><div class="inner-caret"></div></div>
-        </div>
-    </div>
-</div>
-{% endfor %}
-{% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript">
-var g_token = "TOKEN";
-function setToken(token) {
-    g_token = token;
-}
-function getToken() {
-    return g_token;
-}
-function addMessage(html) {
-    $('#reply-list').append(html);
-    $('.msg-op').removeClass('hide');
-}
-</script>
-{% endblock %}
diff --git a/seahub/api2/templates/api2/reply.html b/seahub/api2/templates/api2/reply.html
deleted file mode 100644
index 34607a620d..0000000000
--- a/seahub/api2/templates/api2/reply.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load seahub_tags avatar_tags i18n %}
-
-<li class="reply ovhd reply-at">
-  {% avatar r.from_email 48 %}
-  <div class="txt">
-    <span class="author">{{ r.from_email|email2nickname }}</span>
-    <span class="time">{{ r.timestamp|translate_seahub_time }}</span>
-    <p class="reply-con">{{ r.message|seahub_urlize|find_at }}</p>
-  </div>
-</li>
-
diff --git a/seahub/share/templates/share/links.html b/seahub/share/templates/share/links.html
index 1a305ab0a4..4e922710b5 100644
--- a/seahub/share/templates/share/links.html
+++ b/seahub/share/templates/share/links.html
@@ -29,7 +29,7 @@
                 <td class="alc"><img src="{{ MEDIA_URL }}img/file/{{ fs.filename|file_icon_filter }}" alt="{% trans "File"%}" /></td>
                 <td><a href="{% url 'view_lib_file' fs.repo.id fs.path %}">{{ fs.filename }}</a></td>
                 {% else %}
-                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                 <td><a href="{% url 'view_common_lib_dir' fs.repo.id fs.path|strip_slash %}">{{ fs.filename }}</a></td>
                 {% endif %}
                 <td><a href="{% url 'view_common_lib_dir' fs.repo.id '' %}">{{ fs.repo.name }}</a></td>
@@ -70,7 +70,7 @@
             </tr>
             {% for link in uploadlinks %}
             <tr>
-                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                 <td><a href="{% url 'view_common_lib_dir' link.repo.id link.path|strip_slash %}">{{ link.dir_name }}</a></td>
                 <td><a href="{% url 'view_common_lib_dir' link.repo.id '' %}">{{ link.repo.name }}</a></td>
                 <td>{{ link.view_cnt }}</td>
@@ -162,7 +162,7 @@ $('.by-name, .by-time').click(function() {
 
     // define 'sort by' functions
     var by_name_up = function (a, b) {
-        var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name 
+        var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name
         var b_name_code = b.name.charCodeAt(0);
         if ((a_name_code >= 19968 && a_name_code <= 40869) &&
             (b_name_code >= 19968 && b_name_code <= 40869)) {
@@ -179,7 +179,7 @@ $('.by-name, .by-time').click(function() {
         }
     };
     var by_name_down = function (a, b) {
-        var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name 
+        var a_name_code = a.name.charCodeAt(0); // get the first character code from a.name
         var b_name_code = b.name.charCodeAt(0);
         if ((a_name_code >= 19968 && a_name_code <= 40869) &&
             (b_name_code >= 19968 && b_name_code <= 40869)) {
diff --git a/seahub/share/templates/share/list_priv_shared_folders.html b/seahub/share/templates/share/list_priv_shared_folders.html
index 99b221b340..fccc8d1b1b 100644
--- a/seahub/share/templates/share/list_priv_shared_folders.html
+++ b/seahub/share/templates/share/list_priv_shared_folders.html
@@ -19,7 +19,7 @@
     </tr>
     {% for repo in shared_folders %}
     <tr data="{{repo.props.share_type}}">
-        <td><img src="{{MEDIA_URL}}img/folder-icon-24.png" title="{% trans "Read-Write"%}" alt="{% trans "directory icon" %}" /></td>
+        <td><img src="{{MEDIA_URL}}img/folder-24.png" title="{% trans "Read-Write"%}" alt="{% trans "directory icon" %}" /></td>
         <td data="{{ repo.props.repo_id }}"><a href="{% url 'view_common_lib_dir' repo.origin_repo_id repo.origin_path|strip_slash %}">{{ repo.props.repo_name }}</a></td>
         <td data="{{repo.props.user_info}}" title="{{ repo.props.user }}">{{ repo.props.user | email2nickname }}</td>
         <td>
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 929ac71bc7..1079d94d4f 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -1218,7 +1218,7 @@
 </script>
 <script type="text/template" id="repo-shared-link-tmpl">
     <% if (share_type == 'd') { %>
-    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
     <td><a href="#my-libs/lib/<%= repo_id %><%= encoded_path %>"><%- name %></a></td>
     <% } else { %>
     <td class="alc"><img src="{{ MEDIA_URL }}img/file/file.png" alt="{% trans "File"%}" /></td>
diff --git a/seahub/templates/repo_history.html b/seahub/templates/repo_history.html
index 1923d4addb..c8d88e2293 100644
--- a/seahub/templates/repo_history.html
+++ b/seahub/templates/repo_history.html
@@ -13,10 +13,10 @@
 
         <table class="commit-list">
             <tr>
-                <th width="40%">{% trans "Description"%}</th>
-                <th width="19%">{% trans "Time" %}</th>
-                <th width="22%">{% trans "Modifier"%}</th>
-                <th width="19%">{% trans "Operations" %}</th>
+                <th width="52%">{% trans "Description"%}</th>
+                <th width="15%">{% trans "Time" %}</th>
+                <th width="15%">{% trans "Modifier"%}</th>
+                <th width="18%">{% trans "Operations" %}</th>
             </tr>
 
             {% for commit in commits %}
@@ -32,7 +32,6 @@
                 <td>
                 {% if commit.creator_name %}
                     {% if not commit.second_parent_id %}
-                    {% avatar commit.creator_name 16 %}
                     <a href="{% url 'user_profile' commit.creator_name %}" class="vam">{{ commit.creator_name|email2nickname }}</a>
                     {% else %}
                     {% trans "None"%}
@@ -76,7 +75,7 @@
             <a href="?per_page=50" class="per-page">50</a>
             {% endif %}
             {% if per_page == 100 %}
-            <span> 100 </span> 
+            <span> 100 </span>
             {% else %}
             <a href="?per_page=100" class="per-page">100</a>
             {% endif %}
diff --git a/seahub/templates/repo_history_view.html b/seahub/templates/repo_history_view.html
index bc378d8824..8d2ca1c482 100644
--- a/seahub/templates/repo_history_view.html
+++ b/seahub/templates/repo_history_view.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block main_panel %}
-<h2 class="repo-snapshot-hd">{% blocktrans with repo_name=repo.props.name %}<span class="op-target">{{repo_name}}</span> Snapshot{% endblocktrans %}<span class="commit-time">({{ current_commit.props.ctime|tsstr_sec }})</span></h2>
+<h2 class="repo-snapshot-hd">{% blocktrans with repo_name=repo.props.name %}<span class="op-target">{{repo_name}}</span> Snapshot{% endblocktrans %} <span class="commit-time">({{ current_commit.props.ctime|tsstr_sec }})</span></h2>
 
 <a href="{% url 'repo_history' repo.props.id %}" class="go-back" title="{% trans "Back to modification history"%}">
     <span class="icon-chevron-left"></span>
@@ -23,8 +23,8 @@
                 <span class="meta-info split">
                     <span class="author">
                         {% if current_commit.props.creator_name %}
-                        {% avatar current_commit.props.creator_name 20 %}
-                        <a class="name" href="{% url 'user_profile' current_commit.props.creator_name %}">{{ current_commit.props.creator_name|short_email }}</a>
+                        <img src="{% avatar_url current_commit.props.creator_name 20 %}" width="20" class="avatar" />
+                        <a class="name" href="{% url 'user_profile' current_commit.props.creator_name %}">{{ current_commit.props.creator_name|email2nickname }}</a>
                         {% else %}
                         {% trans "Unknown"%}
                         {% endif %}
@@ -39,7 +39,7 @@
                 {% trans "Current path: "%}
                 {% for name, link in zipped %}
                 {% if not forloop.last %}
-                <a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ link|urlencode }}">{{ name }}</a> /                 
+                <a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ link|urlencode }}">{{ name }}</a> /
                 {% else %}
                 {{ name }}
                 {% endif %}
@@ -61,8 +61,8 @@
 
                 {% for dirent in dir_list %}
                 <tr>
-                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory"%}" /></td>
-                    <td><a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a></td>              
+                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory"%}" /></td>
+                    <td><a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a></td>
                     <td></td>
                     <td><a class="op vh restore-dir" href="#" data-url="{% url 'repo_revert_dir' repo.id %}?commit={{ current_commit.id }}&p={{ path|urlencode }}{{dirent.obj_name|urlencode}}">{% trans "Restore" %}</a></td>
                 </tr>
@@ -71,7 +71,7 @@
                 {% for dirent in file_list %}
                 <tr>
                     <td class="alc"><img src="{{ MEDIA_URL }}img/file/{{ dirent.obj_name|file_icon_filter }}" alt="{% trans "File"%}" /></td>
-                    <td><a class="normal" href="{% url 'view_snapshot_file' repo.props.id %}?obj_id={{ dirent.props.obj_id }}&commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" target="_blank">{{ dirent.props.obj_name }}</a></td>              
+                    <td><a class="normal" href="{% url 'view_snapshot_file' repo.props.id %}?obj_id={{ dirent.props.obj_id }}&commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" target="_blank">{{ dirent.props.obj_name }}</a></td>
                     <td>{{ dirent.file_size|filesizeformat }}</td>
                     <td>
                         <a class="op vh restore-file" data-url="{% url 'repo_revert_file' repo.id %}?commit={{ current_commit.id }}&p={{ path|urlencode }}{{dirent.obj_name|urlencode}}" href="#">{% trans "Restore" %}</a>
diff --git a/seahub/templates/snippets/repo_dir_trash_tr.html b/seahub/templates/snippets/repo_dir_trash_tr.html
index 5b8245fd88..841921a38e 100644
--- a/seahub/templates/snippets/repo_dir_trash_tr.html
+++ b/seahub/templates/snippets/repo_dir_trash_tr.html
@@ -3,7 +3,7 @@
 {% for dirent in dir_entries %}
 {% if dirent.is_dir %}
 <tr>
-    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory" %}" /></td>
+    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory" %}" /></td>
     {% if show_recycle_root %}
     <td><a href="?commit_id={{ dirent.commit_id }}&base={{ dirent.basedir|urlencode }}&p=/{{ dirent.obj_name|urlencode }}&dir_path={{dir_path|urlencode}}">{{ dirent.obj_name }}</a></td>
     <td>{{ dirent.delete_time|translate_seahub_time }}</td>
diff --git a/seahub/templates/sysadmin/userinfo.html b/seahub/templates/sysadmin/userinfo.html
index 1e54461b95..58d284c9a7 100644
--- a/seahub/templates/sysadmin/userinfo.html
+++ b/seahub/templates/sysadmin/userinfo.html
@@ -171,7 +171,7 @@
                     <td>{{ link.filename }}</td>
                     <td>{{ link.file_size|filesizeformat}}</td>
                     {% else %}
-                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                     <td>{{ link.filename }}</td>
                     <td>{{ link.dir_size|filesizeformat}}</td>
                     {% endif %}
@@ -181,7 +181,7 @@
                         <a class="op vh rm-link" href="#" data-url="{% url 'sys_publink_remove' %}" data-token="{{ link.token }}">{% trans "Remove"%}</a>
                     </td>
                 {% else %}
-                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                    <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                     <td>{{ link.dir_name }}</td>
                     <td>--</td>
                     <td>{% trans "Upload" %}</td>
diff --git a/seahub/templates/view_shared_dir.html b/seahub/templates/view_shared_dir.html
index 1107f30b0f..ea748cce2c 100644
--- a/seahub/templates/view_shared_dir.html
+++ b/seahub/templates/view_shared_dir.html
@@ -57,7 +57,7 @@
         <tbody>
             {% for dirent in dir_list %}
             <tr>
-                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory icon"%}" /></td>
+                <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
                 <td>
                     <a href="?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}&mode={{mode}}" class="normal">{{ dirent.obj_name }}</a>
                 </td>
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index 75ef6ba0dc..559193b666 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -654,10 +654,10 @@ def repo_history(request, repo_id):
 
     try:
         current_page = int(request.GET.get('page', '1'))
-        per_page = int(request.GET.get('per_page', '25'))
+        per_page = int(request.GET.get('per_page', '100'))
     except ValueError:
         current_page = 1
-        per_page = 25
+        per_page = 100
 
     commits_all = get_commits(repo_id, per_page * (current_page -1),
                               per_page + 1)