diff --git a/files/templates/comments.html b/files/templates/comments.html
index b775711d97..68e2f51f0b 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -263,80 +263,81 @@
 
 						{% endif %}
 
-						{% if v %}
-						<li class="list-inline-item text-muted"><a href="javascript:void(0)" onclick="document.getElementById('reply-to-{{c.id}}').classList.remove('d-none')"><i class="far fa-reply" aria-hidden="true"></i><span class="d-none d-md-inline-block">Reply</span></a></li>
-						{% endif %}
-
-						<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Votes"><a href="/votes?link={{c.fullname}}"><i class="fas fa-sort-alt"></i></a></li>
+						<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="/votes?link={{c.fullname}}"><i class="fas fa-arrows-v"></i>Votes</a></li>
 
 						{% if v %}
-							<li id="unsave-{{c.id}}" class="{% if c in v.saved_comment_idlist() %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Unsave comment"><a href="javascript:void(0)" onclick="post_toast3('/unsave_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-bookmark"></i></a></li>
+							<li id="unsave-{{c.id}}" class="{% if c in v.saved_comment_idlist() %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a href="javascript:void(0)" onclick="post_toast3('/unsave_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-save"></i>Unsave</a></li>
 
-							<li id="save-{{c.id}}" class="{% if not c in v.saved_comment_idlist() %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Save comment"><a href="javascript:void(0)" onclick="post_toast3('/save_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="far fa-bookmark"></i></a></li>
+							<li id="save-{{c.id}}" class="{% if not c in v.saved_comment_idlist() %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a href="javascript:void(0)" onclick="post_toast3('/save_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-save"></i>Save</a></li>
+
+							<li class="list-inline-item text-muted"><a href="javascript:void(0)" onclick="document.getElementById('reply-to-{{c.id}}').classList.remove('d-none')"><i class="fas fa-reply" aria-hidden="true"></i><span class="d-none d-md-inline-block">Reply</span></a></li>
 
 							{% if v.id!=c.author_id %}
-							<li class="list-inline-item text-muted"><a href="javascript:void(0)" data-toggle="modal" data-target="#awardModal" onclick="awardModal('/comment/{{c.id}}/awards')" data-toggle="tooltip" data-placement="bottom" data-original-title="Award comment"><i class="far fa-gift"
-								aria-hidden="true"></i><span class="d-none d-md-inline-block"></span></a></li>
+							<li class="list-inline-item text-muted"><a href="javascript:void(0)" data-toggle="modal" data-target="#awardModal" onclick="awardModal('/comment/{{c.id}}/awards')"><i class="fas fa-gift"
+								aria-hidden="true"></i><span class="d-none d-md-inline-block">Give Award</span></a></li>
 							{% endif %}
 						{% endif %}
 
-						<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Permalink"><a href="{{c.permalink}}?context=5#context" role="button"><i class="far fa-link"></i></a></li>
-						<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Context"><a {% if v %}href="{{c.permalink}}?context=5#context"{% else %}href="/logged_out{{c.permalink}}?context=5#context"{% endif %}><i class="far fa-book-open"></i></a></li>
-						<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Copy link"><a href="javascript:void(0);" role="button" class="copy-link" data-clipboard-text="{% if 'rdrama' in request.host %}https://taytay.life{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}?context=5#context"><i class="far fa-copy"></i></a></li>
-
-						<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Report"><a href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick="report_commentModal('{{c.id}}','{{c.author.username}}',)"><i class="far fa-flag"></i></a></li>
+						<li class="list-inline-item text-muted d-none d-md-inline-block"><a {% if v %}href="{{c.permalink}}?context=5#context"{% else %}href="/logged_out{{c.permalink}}?context=5#context"{% endif %}><i class="fas fa-book-open"></i>Context</a></li>
+						<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="javascript:void(0);" role="button" class="copy-link" data-clipboard-text="{% if 'rdrama' in request.host %}https://taytay.life{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}/?context=5#context"><i class="fas fa-copy"></i>Copy link</a></li>
+						
+						{% if v %}
+							<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick="report_commentModal('{{c.id}}','{{c.author.username}}',)"><i class="fas fa-flag fa-fw"></i>Report</a></li>
+						{% else %}
+							<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick=""><i class="fas fa-flag fa-fw"></i>Report</a></li>
+						{% endif %}
 
 
 						{% if v and c.parent_submission and c.author_id==v.id %}
 
-							<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Edit comment"><a href="javascript:void(0)" onclick="toggleEdit('{{c.id}}')"><i class="far fa-pencil fa-fw"></i></a></li>
+							<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="javascript:void(0)" onclick="toggleEdit('{{c.id}}')"><i class="fas fa-edit fa-fw"></i>Edit</a></li>
 
-							<li id="delete-{{c.id}}" class="{% if not c.deleted_utc %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Delete"><a href="javascript:void(0)" data-toggle="modal" data-target="#deleteCommentModal" onclick="delete_commentModal('{{c.id}}','delete-{{c.id}}','undelete-{{c.id}}')"><i class="far fa-trash-alt"></i></a></li>
+							<li id="delete-{{c.id}}" class="{% if not c.deleted_utc %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a href="javascript:void(0)" data-toggle="modal" data-target="#deleteCommentModal" onclick="delete_commentModal('{{c.id}}','delete-{{c.id}}','undelete-{{c.id}}')"><i class="fas fa-trash-alt fa-fw"></i>Delete</a></li>
 							
-							<li id="undelete-{{c.id}}" class="{% if c.deleted_utc %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Restore"><a href="javascript:void(0)" onclick="post_toast3('/undelete/comment/{{c.id}}','delete-{{c.id}}','undelete-{{c.id}}')"><i class="far fa-trash-undo-alt"></i></a></li>
+							<li id="undelete-{{c.id}}" class="{% if c.deleted_utc %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a href="javascript:void(0)" onclick="post_toast3('/undelete/comment/{{c.id}}','delete-{{c.id}}','undelete-{{c.id}}')"><i class="fas fa-trash-alt fa-fw"></i>Undelete</a></li>
 
 						{% endif %}
 
 						{% if v and v.admin_level==6 and v.id==c.author_id %}
-							<li id="undistinguish-{{c.id}}" class="list-inline-item d-none {% if c.distinguish_level %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Undistinguish"><a class="text-info"  href="javascript:void(0)" onclick="admin_comment('{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','no')"><i class="fas fa-broom text-danger"></i></a></li>
-							<li id="distinguish-{{c.id}}" class="list-inline-item d-none {% if not c.distinguish_level %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Distinguish"><a class="text-info" href="javascript:void(0)" onclick="admin_comment('{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','yes')"><i class="far fa-broom text-success"></i></a></li>
+							<li id="undistinguish-{{c.id}}" class="list-inline-item d-none {% if c.distinguish_level %}d-md-inline-block{% endif %}"><a class="text-info"  href="javascript:void(0)" onclick="admin_comment('{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','no')"><i class="fas fa-id-badge text-info fa-fw"></i>Undistinguish</a></li>
+							<li id="distinguish-{{c.id}}" class="list-inline-item d-none {% if not c.distinguish_level %}d-md-inline-block{% endif %}"><a class="text-info" href="javascript:void(0)" onclick="admin_comment('{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','yes')"><i class="fas fa-id-badge text-info fa-fw"></i>Distinguish</a></li>
 						{% endif %}
 
 								
 						{% if v and not v.id==c.author_id and v.admin_level == 0 %}
-							<li id="unblock-{{c.id}}" class="{% if c.is_blocked %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Unblock user"><a href="javascript:void(0)" onclick="post_toast3('/settings/block?username={{c.author.username}}','block-{{c.id}}','unblock-{{c.id}}')"><i class="fas text-danger fa-eye-slash"></i></a></li>
-							<li id="block-{{c.id}}" class="{% if not c.is_blocked %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Block user"><a href="javascript:void(0)" onclick="post_toast3('/settings/block?username={{c.author.username}}','block-{{c.id}}','unblock-{{c.id}}')"><i class="far fa-eye-slash"></i></a></li>
+							<li id="unblock-{{c.id}}" class="{% if c.is_blocked %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a href="javascript:void(0)" onclick="post_toast3('/settings/block?username={{c.author.username}}','block-{{c.id}}','unblock-{{c.id}}')"><i class="fas fa-eye-slash fa-fw"></i>Unblock user</a></li>
+							<li id="block-{{c.id}}" class="{% if not c.is_blocked %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a href="javascript:void(0)" onclick="post_toast3('/settings/block?username={{c.author.username}}','block-{{c.id}}','unblock-{{c.id}}')"><i class="fas fa-eye-slash fa-fw"></i>Block user</a></li>
 						{% endif %}
 
 						{% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %}
-							<li id="unpin-{{c.id}}" class="{% if c.is_pinned %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Unpin comment"><a class="text-danger"  href="javascript:void(0)" data-dismiss="modal" data-target="#actionsModal-{{c.id}}" onclick="post_toast3('/comment_pin/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}')"><i class="fas fa-thumbtack fa-rotate--45 text-danger"></i></a></li>
+							<li id="unpin-{{c.id}}" class="{% if c.is_pinned %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a class="text-info"  href="javascript:void(0)" data-dismiss="modal" data-target="#actionsModal-{{c.id}}" onclick="post_toast3('/comment_pin/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}')"><i class="fas fa-thumbtack fa-rotate--45 text-info fa-fw"></i>Unpin</a></li>
 
-							<li id="pin-{{c.id}}" class="{% if not c.is_pinned %}d-md-inline-block{% endif %} list-inline-item text-muted d-none" data-toggle="tooltip" data-placement="bottom" data-original-title="Pin comment"><a class="text-info" href="javascript:void(0)" data-dismiss="modal" data-target="#actionsModal-{{c.id}}" onclick="post_toast3('/comment_pin/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}')"><i class="far fa-thumbtack fa-rotate--45 text-info"></i></a></li>
+							<li id="pin-{{c.id}}" class="{% if not c.is_pinned %}d-md-inline-block{% endif %} list-inline-item text-muted d-none"><a class="text-info" href="javascript:void(0)" data-dismiss="modal" data-target="#actionsModal-{{c.id}}" onclick="post_toast3('/comment_pin/{{c.id}}','pin-{{c.id}}','unpin-{{c.id}}')"><i class="fas fa-thumbtack fa-rotate--45 text-info fa-fw"></i>Pin</a></li>
 						{% endif %}
 
 
 						{% if v and v.admin_level>=3 %}
 							{% if "/flagged/" in request.path %}
-								<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Approve"><a class="text-success" href="javascript:void(0)" onclick="approveComment('{{c.id}}')"><i class="far fa-check text-success"></i></a></li>
-								<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="Remove"><a class="text-danger" href="javascript:void(0)" onclick="removeComment('{{c.id}}')"><i class="far fa-trash-alt text-danger"></i></a></li>
+								<li class="list-inline-item text-muted d-none d-md-inline-block"><a class="text-success" href="javascript:void(0)" onclick="approveComment('{{c.id}}')"><i class="fas fa-check text-success fa-fw"></i>Approve</a></li>
+								<li class="list-inline-item text-muted d-none d-md-inline-block"><a class="text-danger" href="javascript:void(0)" onclick="removeComment('{{c.id}}')"><i class="fas fa-ban text-danger fa-fw"></i>Remove</a></li>
 							{% else %}
-								<li id="approve-{{c.id}}" class="list-inline-item text-muted d-none {% if c.is_banned %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Approve"><a class="text-success" href="javascript:void(0)" onclick="approveComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}')"><i class="far fa-check text-success"></i></a></li>
-								<li id="remove-{{c.id}}" class="list-inline-item text-muted d-none {% if not c.is_banned %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Remove"><a class="text-danger" href="javascript:void(0)" onclick="removeComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}')"><i class="far fa-trash-alt text-danger"></i></a></li>
+								<li id="approve-{{c.id}}" class="list-inline-item text-muted d-none {% if c.is_banned %}d-md-inline-block{% endif %}"><a class="text-success" href="javascript:void(0)" onclick="approveComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}')"><i class="fas fa-check text-success fa-fw"></i>Approve</a></li>
+								<li id="remove-{{c.id}}" class="list-inline-item text-muted d-none {% if not c.is_banned %}d-md-inline-block{% endif %}"><a class="text-danger" href="javascript:void(0)" onclick="removeComment('{{c.id}}','approve-{{c.id}}','remove-{{c.id}}')"><i class="fas fa-ban text-danger fa-fw"></i>Remove</a></li>
 							{% endif %}
 						{% endif %}
 
 						{% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
-							<li id="unmark-{{c.id}}" class="list-inline-item d-none {% if c.over_18 %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Unmark +18"><a class="text-danger" href="javascript:void(0)" onclick="post_toast3('/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}')"><i class="fas fa-eye-evil text-danger"></i></a></li>
-							<li id="mark-{{c.id}}" class="list-inline-item d-none {% if not c.over_18 %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Mark +18"><a class="text-danger" href="javascript:void(0)" onclick="post_toast3('/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}')"><i class="far fa-eye-evil text-danger"></i></a></li>
+							<li id="unmark-{{c.id}}" class="list-inline-item d-none {% if c.over_18 %}d-md-inline-block{% endif %}"><a class="text-danger" href="javascript:void(0)" onclick="post_toast3('/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}')"><i class="fas fa-eye-evil text-danger fa-fw"></i>Unmark +18</a></li>
+							<li id="mark-{{c.id}}" class="list-inline-item d-none {% if not c.over_18 %}d-md-inline-block{% endif %}"><a class="text-danger" href="javascript:void(0)" onclick="post_toast3('/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}')"><i class="fas fa-eye-evil text-danger fa-fw"></i>Mark +18</a></li>
 						{% endif %}
 
 						{% if v and v.admin_level==6 and v.id != c.author_id %}
-							<li id="unban-{{c.id}}" class="list-inline-item d-none {% if c.author.is_suspended %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Unban @{{c.author.username}}"><a class="text-success" id="unexile-comment-{{c.id}}" href="javascript:void(0)" onclick="post_toast3('/unban_user/{{c.author_id}}','ban-{{c.id}}','unban-{{c.id}}')"><i class="far fa-user-check text-success"></i></a></li>
-							<li id="ban-{{c.id}}" class="list-inline-item d-none {% if not c.author.is_suspended %}d-md-inline-block{% endif %}" data-toggle="tooltip" data-placement="bottom" data-original-title="Ban @{{c.author.username}}"><a class="text-danger" id="exile-comment-{{c.id}}" href="javascript:void(0)" onclick="post_toast3('/ban_user/{{c.author_id}}?reason={{c.permalink}}','ban-{{c.id}}','unban-{{c.id}}')"><i class="far fa-user-slash text-danger"></i></a></li>
+							<li id="unban-{{c.id}}" class="list-inline-item d-none {% if c.author.is_suspended %}d-md-inline-block{% endif %}"><a class="text-success" id="unexile-comment-{{c.id}}" href="javascript:void(0)" onclick="post_toast3('/unban_user/{{c.author_id}}','ban-{{c.id}}','unban-{{c.id}}')"><i class="fas fa-user-slash text-success fa-fw"></i>Unban user</a></li>
+							<li id="ban-{{c.id}}" class="list-inline-item d-none {% if not c.author.is_suspended %}d-md-inline-block{% endif %}"><a class="text-danger" id="exile-comment-{{c.id}}" href="javascript:void(0)" onclick="post_toast3('/ban_user/{{c.author_id}}?reason={{c.permalink}}','ban-{{c.id}}','unban-{{c.id}}')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a></li>
 						{% endif %}
 
 						{% if v and v.admin_level >=4 and c.oauth_app %}
-							<li class="list-inline-item text-muted d-none d-md-inline-block" data-toggle="tooltip" data-placement="bottom" data-original-title="API App"><a href="{{c.oauth_app.permalink}}/comments"><i class="far fa-code"></i></a></li>
+							<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="{{c.oauth_app.permalink}}/comments"><i class="fas fa-code fa-fw"></i>API App</a></li>
 						{% endif %}
 
 						<li class="list-inline-item d-inline-block d-md-none"><a href="#" data-toggle="modal" data-target="#actionsModal-{{c.id}}" data-focus="false"><i class="fas fa-ellipsis-h"></i></a></li>