diff --git a/files/templates/modals/ModalCommentActions.html b/files/templates/modals/ModalCommentActions.html
index 5ce8b1d71a..532a6aba33 100644
--- a/files/templates/modals/ModalCommentActions.html
+++ b/files/templates/modals/ModalCommentActions.html
@@ -76,50 +76,102 @@
 						</button>
 					</li>
 					{% endif %}
-					
+
 					{% endif %}
 
 					{% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %}
-						<a id="pin2-{{c.id}}" class="list-group-item {% if c.is_pinned %}hidden{% endif %} text-info" href="javascript:void(0)" data-bs-target="#actionsModal-{{c.id}}" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Pin</a>
-						<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.is_pinned %}hidden{% endif %} text-info" href="javascript:void(0)" data-bs-target="#actionsModal-{{c.id}}" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Unpin</a>
+					<li id="pin2-{{c.id}}" class="{% if c.is_pinned %}hidden{% endif %}">
+						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
+							<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Pin
+						</button>
+					</li>
+					<li id="unpin2-{{p.id}}" class="{% if not c.is_pinned %}hidden{% endif %}">
+						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
+							<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Unpin
+						</button>
+					</li>
 					{% endif %}
 
 					{% if v %}
 						{% if v.admin_level>=1 and v.id==c.author_id %}
-							<a id="distinguish2-{{c.id}}" class="list-group-item {% if c.distinguish_level %}hidden{% endif %} text-info" href="javascript:void(0)" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info"></i>Distinguish</a>
-							<a id="undistinguish2-{{c.id}}" class="list-group-item {% if not c.distinguish_level %}hidden{% endif %} text-info" href="javascript:void(0)" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info"></i>Undistinguish</a>
+						<li id="distinguish2-{{c.id}}" class="{% if c.distinguish_level %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')">
+								<i class="fas fa-id-badge fa-fw mr-4"></i>Distinguish
+							</button>
+						</li>
+						<li id="undistinguish2-{{c.id}}" class="{% if not c.distinguish_level %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')">
+								<i class="fas fa-id-badge fa-fw mr-4"></i>Undistinguish
+							</button>
+						</li>
 						{% endif %}
 						{% if v.admin_level>=3 %}
-							{% if "/reported/" in request.path %}
-								<a class="list-group-item text-danger" href="javascript:void(0)" onclick="removeComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger"></i>Remove</a>
-								<a class="list-group-item text-success" href="javascript:void(0)" onclick="approveComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success"></i>Approve</a>
-							{% else %}
-								<a id="remove2-{{c.id}}" class="{% if c.is_banned %}hidden{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="removeComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger"></i>Remove</a>
-								<a id="approve2-{{c.id}}" class="{% if not c.is_banned %}hidden{% endif %} list-group-item text-success" href="javascript:void(0)" onclick="approveComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success"></i>Approve</a>
-							{% endif %}
+						<li id="remove2-{{c.id}}" class="{% if c.is_banned %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="removeComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')">
+								<i class="fas fa-ban fa-fw mr-4"></i>Remove
+							</button>
+						</li>
+						<li id="approve2-{{c.id}}" class="{% if not c.is_banned %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="approveComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')">
+								<i class="fas fa-check fa-fw mr-4"></i>Approve
+							</button>
+						</li>
 						{% endif %}
 						{% if v.admin_level >=4 and c.oauth_app %}
-							<a href="{{c.oauth_app.permalink}}/comments" class="list-group-item text-info" ><i class="fas fa-code text-info"></i>API App</a>
+						<li>
+							<a href="{{c.oauth_app.permalink}}/comments" class="btn btn-gray w-full text-left">
+								<i class="fas fa-code fa-fw mr-4"></i>API App
+							</a>
+						</li>
 						{% endif %}
 
 						{% if not v.id==c.author_id and not (c.post and c.post.award_count("ghosts")) %}
-							<a id="unblock2-{{c.id}}" data-bs-dismiss="modal" class="text-success list-group-item {% if not c.is_blocking %}hidden{% endif %}" href="javascript:void(0)" onclick="post_toast2('/settings/unblock?username={{c.author.username}}','block2-{{c.id}}','unblock2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash text-success"></i>Unblock user</a>
 
-							<a id="prompt2-{{c.id}}" data-bs-dismiss="modal" class="blockuser list-group-item hidden text-danger" href="javascript:void(0)" onclick="post_toast2('/settings/block?username={{c.author.username}}','prompt2-{{c.id}}','unblock2-{{c.id}}')"><i class="fas fa-eye-slash fa-fw text-danger"></i>Are you sure?</a>
 
-							<a id="block2-{{c.id}}" class="{% if c.is_blocking %}hidden{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="document.getElementById('block2-{{c.id}}').classList.toggle('hidden');document.getElementById('prompt2-{{c.id}}').classList.toggle('hidden');"><i class="fas fa-eye-slash fa-fw text-danger"></i>Block user</a>
+						<li id="unblock2-{{c.id}}" class="{% if not c.is_blocking %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/settings/unblock?username={{c.author.username}}','block2-{{c.id}}','unblock2-{{c.id}}')">
+								<i class="fas fa-user-check fa-fw mr-4"></i>Unblock user
+							</button>
+						</li>
+						<li id="prompt2-{{c.id}}" class="blockuser hidden">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/settings/block?username={{c.author.username}}','prompt2-{{c.id}}','unblock2-{{c.id}}')">
+								<i class="fas fa-question-circle fa-fw mr-4"></i>Are you sure?
+							</button>
+						</li>
+						<li id="block2-{{c.id}}" class="{% if c.is_blocking %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="document.getElementById('block2-{{c.id}}').classList.toggle('hidden');document.getElementById('prompt2-{{c.id}}').classList.toggle('hidden');">
+								<i class="fas fa-user-slash fa-fw mr-4"></i>Block user
+							</button>
+						</li>
 						{% endif %}
 					{% endif %}
 
 					{% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
-						<a id="mark2-{{c.id}}" class="{% if c.over_18 %}hidden{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Mark +18</a>
-						<a id="unmark2-{{c.id}}" class="{% if not c.over_18 %}hidden{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Unmark +18</a>
+					<li id="mark2-{{c.id}}" class="{% if c.over_18 %}hidden{% endif %}">
+						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')">
+							<i class="fas fa-eye-evil fa-fw mr-4"></i>Mark +18
+						</button>
+					</li>
+					<li id="unmark2-{{c.id}}" class="{% if not c.over_18 %}hidden{% endif %}">
+						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')">
+							<i class="fas fa-eye-evil fa-fw mr-4"></i>Unmark +18
+						</button>
+					</li>
 					{% endif %}
 
 					{% if v and (c.post and v.admin_level == 6) %}
 						{% if c.author_id != v.id %}
-							<a id="ban2-{{c.id}}" class="{% if c.author.is_suspended %}hidden{% endif %} list-group-item text-danger" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{ c.author.id }}', '{{c.author.username}}')" href="javascript:void(0)"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
-							<a id="unban2-{{c.id}}" class="{% if not c.author.is_suspended %}hidden{% endif %} list-group-item text-success" href="javascript:void(0)" onclick="post_toast2('/unban_user/{{c.author_id}}','ban2-{{c.id}}','unban2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-user-minus fa-fw text-success"></i>Unban user</a>
+						<li id="ban2-{{c.id}}" class="{% if c.author.is_suspended %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{ c.author.id }}', '{{c.author.username}}')">
+								<i class="fas fa-user-minus fa-fw mr-4"></i>Ban user
+							</button>
+						</li>
+
+						<li id="unban2-{{c.id}}" class="{% if not c.author.is_suspended %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/unban_user/{{c.author_id}}','ban2-{{c.id}}','unban2-{{c.id}}')">
+								<i class="fas fa-user-minus fa-fw mr-4"></i>Unban user
+							</button>
+						</li>
 						{% endif %}
 					{% endif %}	
 
diff --git a/files/templates/modals/ModalSubmissionActions.html b/files/templates/modals/ModalSubmissionActions.html
index 3494adf4f4..0dc55c6b05 100644
--- a/files/templates/modals/ModalSubmissionActions.html
+++ b/files/templates/modals/ModalSubmissionActions.html
@@ -120,12 +120,12 @@
 					{% if v==p.author %}
 					<li id="distinguish2-{{p.id}}" class="{% if p.distinguish_level %}hidden{% endif %}">
 						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}')">
-							<i class="fas fa-crown fa-fw mr-4"></i>Distinguish
+							<i class="fas fa-id-badge fa-fw mr-4"></i>Distinguish
 						</button>
 					</li>
 					<li id="undistinguish2-{{p.id}}" class="{% if not p.distinguish_level %}hidden{% endif %}">
 						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}')">
-							<i class="fas fa-crown fa-fw mr-4"></i>Undistinguish
+							<i class="fas fa-id-badge fa-fw mr-4"></i>Undistinguish
 						</button>
 					</li>
 					{% endif %}
@@ -148,10 +148,9 @@
 						</a>
 					</li>
 					{% endif %}
-
 					{% endif %}
 
-					{% if v and v.id != p.author_id %}
+					{% if v and v.id != p.author_id and not p.award_count("ghosts") %}
 					<li id="unblock2-{{p.id}}" class="{% if not p.is_blocking %} hidden{% endif %}">
 						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block2-{{p.id}}','unblock2-{{p.id}}')">
 							<i class="fas fa-user-check fa-fw mr-4"></i>Unblock user