diff --git a/media/css/seahub.css b/media/css/seahub.css
index 91220fbd2d..a228746d92 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -466,9 +466,6 @@ p { margin:0.5em 0; }
 .no-deco:hover {
     text-decoration:none;
 }
-.non-text-link:hover {
-    text-decoration:none;
-}
 .input-disabled {/* for type="password/text" etc*/
     background:#ebebe4;
 }
diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 4e309937e4..52b33f1ac0 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -47,7 +47,7 @@
                 {% endif %}
 
                 <div data-url="{% url 'unseen_notices_count' %}" id="msg-count" class="fleft">
-                    <a href="#" class="non-text-link" id="notice-icon" title="{% trans "Notifications" %}">
+                    <a href="#" class="no-deco" id="notice-icon" title="{% trans "Notifications" %}">
                         <span class="sf2-icon-bell"></span>
                         <span class="num hide">0</span>
                     </a>
@@ -64,7 +64,7 @@
                 </div>
 
                 <div id="account" class="fright">
-                    <a id="my-info" href="#" class="non-text-link">
+                    <a id="my-info" href="#" class="no-deco">
                         {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
                     </a>
                     <div id="user-info-popup" class="top-info-popup hide">
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index 88d9fd0b81..3e058e7501 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -58,7 +58,7 @@
                 {% endif %}
 
                 <div id="msg-count" class="fleft">
-                    <a href="#" class="non-text-link" id="notice-icon" title="{% trans "Notifications" %}">
+                    <a href="#" class="no-deco" id="notice-icon" title="{% trans "Notifications" %}">
                         <span class="sf2-icon-bell"></span>
                         <span class="num hide">0</span>
                     </a>
@@ -75,7 +75,7 @@
                 </div>
 
                 <div id="account" class="fright">
-                    <a id="my-info" href="#" class="non-text-link">
+                    <a id="my-info" href="#" class="no-deco">
                         {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
                     </a>
                     <div id="user-info-popup" class="top-info-popup hide">
diff --git a/seahub/templates/view_file_base.html b/seahub/templates/view_file_base.html
index 4be13811fd..074f876ddb 100644
--- a/seahub/templates/view_file_base.html
+++ b/seahub/templates/view_file_base.html
@@ -11,7 +11,7 @@
 {% block main_panel %}
     <div id="view-hd">
         <h2>{{ filename }}
-            <a id="file-star" class="non-text-link {% if is_starred %}icon-star{% else %}icon-star-empty{% endif %}" href="#"></a>
+            <a id="file-star" class="no-deco {% if is_starred %}icon-star{% else %}icon-star-empty{% endif %}" href="#"></a>
             {% if is_pro %}
             <img class="file-locked-icon cspt vam {% if not file_locked %}hide{% endif %}" width="16" src="{{ MEDIA_URL }}img/file-locked-32.png" alt="{% trans "locked" %}" title="{% trans "locked" %}" />
             {% endif %}