diff --git a/media/css/font-awesome.css b/media/css/font-awesome.css
index 09d218f3fa..3be345b0f3 100644
--- a/media/css/font-awesome.css
+++ b/media/css/font-awesome.css
@@ -23,29 +23,6 @@
   vertical-align: baseline;
   speak: none;
 }
-li [class^="icon-"],
-.nav li [class^="icon-"],
-li [class*=" icon-"],
-.nav li [class*=" icon-"] {
-  display: inline-block;
-  width: 1.25em;
-  text-align: center;
-}
-li [class^="icon-"].icon-large,
-.nav li [class^="icon-"].icon-large,
-li [class*=" icon-"].icon-large,
-.nav li [class*=" icon-"].icon-large {
-  /* increased font size for icon-large */
-  width: 1.5625em;
-}
-[class^="icon-"].fleft,
-[class*=" icon-"].fleft {
-  margin-right: .3em;
-}
-[class^="icon-"].fright,
-[class*=" icon-"].fright {
-  margin-left: .3em;
-}
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
     readers do not read off random characters that represent icons */
 .icon-glass:before                { content: "\f000"; }
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 7d436ae929..39ce641dd8 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -36,7 +36,6 @@
     font-weight: normal;
     font-variant: normal;
     text-transform: none;
-    line-height: 1;
     vertical-align:baseline;
 
     /* Better Font Rendering =========== */
@@ -1688,6 +1687,13 @@ textarea:-moz-placeholder {/* for FF */
     font-size:18px;
     color:#FEAC74;
     margin-right:5px;
+    display:inline-block;
+    vertical-align:middle;
+    line-height:24px;
+    height:24px;
+}
+.group .fast .discuss {
+    margin-top:-2px; /* for vertical alignment */
 }
 .group .fast .a:hover {
     text-decoration:none;
diff --git a/seahub/group/templates/group/groups_right_panel.html b/seahub/group/templates/group/groups_right_panel.html
index c098c9d460..5f9abb1673 100644
--- a/seahub/group/templates/group/groups_right_panel.html
+++ b/seahub/group/templates/group/groups_right_panel.html
@@ -14,7 +14,7 @@
         <p><span class="item-name">{% trans "Time: "%}</span>{{ group.props.timestamp|tsstr_sec }}</p>
         <div class="fast vh">
             <a href="{% url 'group_info' group.props.id %}" title="{% trans "Libraries" %}" class="a"><span class="sf2-icon-archive"></span></a>
-            <a href="{% url 'group_discuss' group.props.id %}" title="{% trans "Discussion" %}" class="a"><span class="icon-comment"></span></a>
+            <a href="{% url 'group_discuss' group.props.id %}" title="{% trans "Discussion" %}" class="a discuss"><span class="icon-comment"></span></a>
             {% if group.wiki_enabled %}
             <a href="{% url 'group_wiki' group.props.id %}" title="{% trans "Wiki" %}" class="a"><span class="icon-book"></span></a>
             {% endif %}