diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template
index cf458d5e3..8fac3d9ad 100644
--- a/apps/common/main/lib/template/Comments.template
+++ b/apps/common/main/lib/template/Comments.template
@@ -36,8 +36,8 @@
                             <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>
                                 <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
+                                <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
                             <% } %>
-                            <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
                             </div>
                         <%}%>
                     <% } else { %>
@@ -67,8 +67,8 @@
             <div class="edit-ct">
                 <% if (editable) { %>
                     <div class="btn-edit img-commonctrl"></div>
+                    <div class="btn-delete img-commonctrl"></div>
                 <% } %>
-                <div class="btn-delete img-commonctrl"></div>
                 <% if (resolved) { %>
                 <div class="btn-resolve-check img-commonctrl" data-toggle="tooltip"></div>
                 <% } else { %>
diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template
index 7eb3b8933..b08d83abd 100644
--- a/apps/common/main/lib/template/CommentsPopover.template
+++ b/apps/common/main/lib/template/CommentsPopover.template
@@ -36,8 +36,8 @@
                         <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>
                                 <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
+                                <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
                             <%}%>
-                            <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
                         </div>
                     <%}%>
                 <% } else { %>
@@ -68,8 +68,8 @@
         <div class="edit-ct">
             <% if (editable) { %>
                 <div class="btn-edit img-commonctrl"></div>
+                <div class="btn-delete img-commonctrl"></div>
             <% } %>
-            <div class="btn-delete img-commonctrl"></div>
             <% if (resolved) { %>
             <div class="btn-resolve-check img-commonctrl" data-toggle="tooltip"></div>
             <% } else { %>