diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
index fde5743fc9..c53418eae8 100644
--- a/app/views/notes/_comment.html.erb
+++ b/app/views/notes/_comment.html.erb
@@ -49,17 +49,14 @@
       -->
       <% end %>
 
+      <% if comment.comment_via == 1 %>
+        <i data-toggle="tooltip" title="This comment was posted by email." class="fa fa-envelope"></i>
+      <% end %>
       <% if current_user && comment.uid == current_user.uid %>
         <a class="btn btn-outline-secondary btn-sm" href="javascript:void(0)" onClick="$('#c<%= comment.cid %>edit').toggle();$('#c<%= comment.cid %>show').toggle();setInit(<%= comment.cid %>);">
           <i class="fa fa-pencil"></i>
         </a>
       <% end %>
-      <% if comment.comment_via == 1 %>
-        <a href="#" onclick="return false;" class="btn btn-outline-secondary btn-sm"><i class="fa fa-envelope"></i></a>
-      <% end %>
-      <% if params[:controller] == "questions" && logged_in_as(['admin', 'moderator']) || (current_user && (comment.uid == current_user.uid)) %>
-        <a class="btn btn-outline-secondary btn-sm" id="comment-<%= comment.id %>-reorder-btn" data-remote="true" data-confirm="Are you sure? <% if current_user && comment.uid != current_user.uid %>Please exercise caution in promoting others' comments; this cannot be undone.<% end %>" rel="tooltip" title="<%= t('questions._comment.promotion') %>" data-placement="left" href="/comment/make_answer/<%= comment.id %>"><i class="fa fa-plus"></i></a>
-      <% end %>
       <% if current_user &. can_moderate? %>
         <a rel="tooltip" title="Mark as spam" class="btn btn-sm btn-outline-secondary btn-flag-spam-<%= comment.id %>" data-confirm="Are you sure? The user will no longer be able to log in or publish, and their content will be hidden except comments." href="/admin/mark_comment_spam/<%= comment.id %>">
           <i class="fa fa-ban"></i>