diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template
index d106dc70d..286f121c0 100644
--- a/apps/common/main/lib/template/Comments.template
+++ b/apps/common/main/lib/template/Comments.template
@@ -70,16 +70,20 @@
 
         <!-- edit buttons -->
 
-        <% if (!editText && !lock && !scope.viewmode) { %>
+        <% if (!editText && !lock) { %>
             <div class="edit-ct">
-                <% if (editable) { %>
-                    <div class="btn-edit img-commonctrl"></div>
+                <% if (!scope.viewmode) { %>
+                    <% if (editable) { %>
+                        <div class="btn-edit img-commonctrl"></div>
+                    <% } %>
+                    <% if (removable) { %>
+                        <div class="btn-delete img-commonctrl"></div>
+                    <% } %>
                 <% } %>
-                <% if (removable) { %>
-                    <div class="btn-delete img-commonctrl"></div>
-                <% } %>
-                <% if (editable) { %>
-                <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
+                <% if (editable && !scope.viewmode) { %>
+                    <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
+                <% } else if ((!editable || scope.viewmode) && resolved) { %>
+                    <div class="icon-resolve i-comment-resolved"></div>
                 <% } %>
             </div>
         <% } %>
diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template
index f7cfc1e66..cf0d529ee 100644
--- a/apps/common/main/lib/template/CommentsPopover.template
+++ b/apps/common/main/lib/template/CommentsPopover.template
@@ -71,16 +71,20 @@
 
     <!-- edit buttons -->
 
-    <% if (!editTextInPopover && !lock && !hint) { %>
+    <% if (!editTextInPopover && !lock) { %>
         <div class="edit-ct">
-            <% if (editable) { %>
-                <div class="btn-edit img-commonctrl"></div>
+            <% if (!hint) { %>
+                <% if (editable) { %>
+                    <div class="btn-edit img-commonctrl"></div>
+                <% } %>
+                <% if (removable) { %>
+                    <div class="btn-delete img-commonctrl"></div>
+                <% } %>
             <% } %>
-            <% if (removable) { %>
-                <div class="btn-delete img-commonctrl"></div>
-            <% } %>
-            <% if (editable) { %>
-            <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
+            <% if (editable && !hint) { %>
+                <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
+            <% } else if ((!editable || hint) && resolved) { %>
+                <div class="icon-resolve i-comment-resolved"></div>
             <% } %>
         </div>
     <% } %>
diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less
index 12bb86df6..2a42718e1 100644
--- a/apps/common/main/resources/less/comments.less
+++ b/apps/common/main/resources/less/comments.less
@@ -277,13 +277,17 @@
         cursor: pointer;
     }
 
-    .btn-edit,.btn-delete, .btn-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto {
+    .btn-edit,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto {
         width: 16px;
         height: 16px;
         margin: 0 0 0 5px;
         background-color: transparent;
     }
 
+    .icon-resolve {
+        float: left;
+    }
+
     .btn-edit {
         background-position: -2px -232px;
     }
@@ -350,7 +354,7 @@
         }
     }
 
-    .btn-resolve,.btn-accept {
+    .btn-resolve, .btn-accept, .icon-resolve {
         position: relative;
 
         &:after {
@@ -366,7 +370,7 @@
             top: 0px;
         }
 
-        &.comment-resolved {
+        &.comment-resolved, &.i-comment-resolved {
             &:after {
                 border-color: @icon-success-ie;
                 border-color: @icon-success;