diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template
index 345f41e569..eec227f93a 100644
--- a/apps/common/main/lib/template/Comments.template
+++ b/apps/common/main/lib/template/Comments.template
@@ -59,7 +59,7 @@
                         <% if (!scope.viewmode) { %>
                             <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>
-                                <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
+                                <div class="btn-edit-common img-commonctrl" data-value="<%=item.get("id")%>"></div>
                             <% } %>
                             <% if (item.get("removable")) { %>
                                 <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
@@ -94,7 +94,7 @@
             <div class="edit-ct">
                 <% if (!scope.viewmode) { %>
                     <% if (editable) { %>
-                        <div class="btn-edit img-commonctrl"></div>
+                        <div class="btn-edit-common img-commonctrl"></div>
                     <% } %>
                     <% if (removable) { %>
                         <div class="btn-delete img-commonctrl"></div>
diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template
index e09499a79f..1fb1734c2e 100644
--- a/apps/common/main/lib/template/CommentsPopover.template
+++ b/apps/common/main/lib/template/CommentsPopover.template
@@ -58,7 +58,7 @@
                     <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
                         <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>
-                                <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
+                                <div class="btn-edit-common img-commonctrl" data-value="<%=item.get("id")%>"></div>
                             <%}%>
                             <% if (item.get("removable")) { %>
                                <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
@@ -93,7 +93,7 @@
         <div class="edit-ct">
             <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
                 <% if (editable) { %>
-                    <div class="btn-edit img-commonctrl"></div>
+                    <div class="btn-edit-common img-commonctrl"></div>
                 <% } %>
                 <% if (removable) { %>
                     <div class="btn-delete img-commonctrl"></div>
diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js
index 31fd74a4d2..4d5314c727 100644
--- a/apps/common/main/lib/view/Comments.js
+++ b/apps/common/main/lib/view/Comments.js
@@ -204,7 +204,7 @@ define([
                 commentId = record.get('uid');
                 replyId =  btn.attr('data-value');
 
-                if (btn.hasClass('btn-edit')) {
+                if (btn.hasClass('btn-edit-common')) {
                     if (!_.isUndefined(replyId)) {
                         me.fireEvent('comment:closeEditing', [commentId]);
                         me.fireEvent('comment:editReply', [commentId, replyId]);
diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js
index adc90a529f..a2fc67a327 100644
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@@ -293,7 +293,7 @@ define([
                         btns.each(function (idx, item) {
                             arr.push($(item).data('bs.tooltip').tip());
                         });
-                        btns = $(view.el).find('.btn-edit');
+                        btns = $(view.el).find('.btn-edit-common');
                         btns.tooltip({title: me.txtEditTip, placement: 'cursor'});
                         btns.each(function (idx, item) {
                             arr.push($(item).data('bs.tooltip').tip());
@@ -345,7 +345,7 @@ define([
                                     return;
                             }
 
-                            if (btn.hasClass('btn-edit')) {
+                            if (btn.hasClass('btn-edit-common')) {
                                 var tip = btn.data('bs.tooltip');
                                 if (tip) tip.dontShow = true;
 
diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less
index f473694cc8..0a9acef287 100644
--- a/apps/common/main/resources/less/comments.less
+++ b/apps/common/main/resources/less/comments.less
@@ -351,7 +351,7 @@
         cursor: pointer;
     }
 
-    .btn-edit,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto {
+    .btn-edit-common,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto {
         width: 16px;
         height: 16px;
         margin: 1px 0 0 5px;
@@ -366,7 +366,7 @@
         float: left;
     }
 
-    .btn-edit {
+    .btn-edit-common {
         background-position: 0px -4px;
     }