diff --git a/media/css/seahub.css b/media/css/seahub.css
index 08bf6b3ce1..b7f0ad2bb7 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -101,7 +101,7 @@
 .sf2-icon-activities:before { content:"\e002"; }
 .sf2-icon-bell:before { content:"\e003"; }
 .sf2-icon-contacts:before { content:"\e004"; }
-.sf2-icon-trash:before { content:"\e005"; }
+.sf2-icon-recycle:before { content:"\e005"; }
 .sf2-icon-delete:before { content:"\e006"; }
 .sf2-icon-devices:before { content:"\e007"; }
 .sf2-icon-download:before { content:"\e008"; }
@@ -116,6 +116,12 @@
 .sf2-icon-share:before { content:"\e011"; }
 .sf2-icon-starred:before { content:"\e012"; }
 .sf2-icon-wiki:before { content:"\e013"; }
+.sf2-icon-history:before { content:"\e014"; }
+.sf2-icon-settings:before { content:"\e015"; }
+.sf2-icon-trash:before { content:"\e016"; }
+.sf2-icon-anti-virus:before { content:"\e017"; }
+.sf2-icon-edit:before { content:"\e018"; }
+.sf2-icon-eye:before { content:"\e019"; }
 
 /******* tags **********/
 html { background:#fff; }
@@ -3348,33 +3354,22 @@ textarea:-moz-placeholder {/* for FF */
     font-size: 14px;
 }
 /* multi repo operation */
-.repo-setting-icon,
-.repo-trash-icon,
-.repo-history-icon {
+.repo-op .op-link {
     width:30px;
     height:30px;
-    background-image: url('../img/multi-repo-op.png');
-    background-repeat: no-repeat;
-    display:inline-block;
+    text-align:center;
     margin-right:10px;
+    color:#8a8a8a;
     outline:none; /* removing the dotted outline for FireFox */
 }
-.repo-setting-icon:hover {
-    background-position: 0 -30px;
+.repo-op .op-link:hover {
+    color:#eb8205;
+    text-decoration:none;
 }
-.repo-trash-icon {
-    background-position: 0 -60px;
+.repo-op .op-link [class^="sf2-icon-"] {
+    font-size:22px;
+    line-height:31px;
 }
-.repo-trash-icon:hover {
-    background-position: 0 -90px;
-}
-.repo-history-icon {
-    background-position: 0 -120px;
-}
-.repo-history-icon:hover {
-    background-position: 0 -150px;
-}
-
 /* multi dirents operation */
 #multi-dirents-op {
     padding: 0 10px;
diff --git a/media/css/sf_font2/seafile-font2.eot b/media/css/sf_font2/seafile-font2.eot
index 61eb5f6ed3..ea055b7d04 100644
Binary files a/media/css/sf_font2/seafile-font2.eot and b/media/css/sf_font2/seafile-font2.eot differ
diff --git a/media/css/sf_font2/seafile-font2.ttf b/media/css/sf_font2/seafile-font2.ttf
index 001b85cd42..e133b2f3bd 100644
Binary files a/media/css/sf_font2/seafile-font2.ttf and b/media/css/sf_font2/seafile-font2.ttf differ
diff --git a/media/css/sf_font2/seafile-font2.woff b/media/css/sf_font2/seafile-font2.woff
index 5ae162c14a..cb31b79d63 100644
Binary files a/media/css/sf_font2/seafile-font2.woff and b/media/css/sf_font2/seafile-font2.woff differ
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 7326ebcc40..6ad165c107 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -134,12 +134,12 @@
     <button class="op-btn" id="share-cur-dir">{% trans "Share" %}</button>
     <% } %>
     <% if (path == '/') { %>
-    <a class="repo-history-icon fright" href="<%= site_root %>repo/history/<%- repo_id %>/" target="_blank" title="{% trans 'History' %}"></a>
+    <a class="op-link fright" href="<%= site_root %>repo/history/<%- repo_id %>/" target="_blank" title="{% trans 'History' %}"><span class="sf2-icon-history"></span></a>
     <% if (user_perm == 'rw') { %>
-    <a class="repo-trash-icon fright" href="<%= site_root %>repo/recycle/<%- repo_id %>/" target="_blank" title="{% trans 'Trash' %}"></a>
+    <a class="op-link fright" href="<%= site_root %>repo/recycle/<%- repo_id %>/" target="_blank" title="{% trans 'Trash' %}"><span class="sf2-icon-trash"></span></a>
     <% } %>
     <% if (is_repo_owner && !is_virtual) { %>
-    <a class="repo-setting-icon fright" href="<%= site_root %>repo/<%- repo_id %>/settings/" target="_blank" title="{% trans 'Settings' %}"></a>
+    <a class="op-link fright" href="<%= site_root %>repo/<%- repo_id %>/settings/" target="_blank" title="{% trans 'Settings' %}"><span class="sf2-icon-settings"></span></a>
     <% } %>
     <% } %>
 </script>