diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 1ab3ffb03..5ca58d273 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -3601,6 +3601,7 @@ small, .small {
 .post-actions .fa, .post-actions .fas, .post-actions .far {
 	font-size: 12px;
 	margin-right: 0.5rem;
+	margin-left: 0.5rem;
 	width: 1rem;
 }
 .post-actions .voting .fa, .post-actions .voting .fas, .post-actions .voting .far {
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 4ef60a556..d530276fe 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -288,9 +288,9 @@
 							<ul class="list-inline text-right d-flex">
 								<li class="list-inline-item mr-auto">
 									{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
-										<a role="button" data-bs-toggle="modal" data-bs-target="#adminModal-{{c.id}}">
+										<button data-bs-toggle="modal" data-bs-target="#adminModal-{{c.id}}">
 											<i class="fas fa-broom"></i>
-										</a>
+										</button>
 									{% endif %}
 								</li>
 																
@@ -299,9 +299,9 @@
 								{% endif %}
 								
 								<li class="list-inline-item">
-									<a role="button" data-bs-toggle="modal" data-bs-target="#actionsModal-{{c.id}}">
+									<button data-bs-toggle="modal" data-bs-target="#actionsModal-{{c.id}}">
 										<i class="fas fa-ellipsis-h mt-1"></i>
-									</a>
+									</button>
 								</li>
 					
 								{% if v and request.path.startswith('/@') and v.admin_level < PERMS['VIEW_VOTE_BUTTONS_ON_USER_PAGE'] %}
@@ -648,8 +648,8 @@
 						{% if c.post %}
 							{% set sub = c.post.sub %}
 							{% if sub and v.mods(sub) and not c.author.mods(sub) %}
-								<a data-bs-dismiss="modal" id="exile2-{{c.id}}" class="{% if c.author.exiled_from(sub) %}d-none{% endif %} list-group-item text-danger" onclick="post_toast(this,'/exile/comment/{{c.id}}','exile2-{{c.id}}','unexile2-{{c.id}}','d-none')"><i class="fas fa-campfire text-danger mr-2"></i>Exile user</a>
-								<a data-bs-dismiss="modal" id="unexile2-{{c.id}}" class="{% if not c.author.exiled_from(sub) %}d-none{% endif %} list-group-item text-success" onclick="post_toast(this,'/h/{{sub}}/unexile/{{c.author_id}}','exile2-{{c.id}}','unexile2-{{c.id}}','d-none')"><i class="fas fa-campfire text-success mr-2"></i>Unexile user</a>
+								<button data-bs-dismiss="modal" id="exile2-{{c.id}}" class="{% if c.author.exiled_from(sub) %}d-none{% endif %} list-group-item text-danger" onclick="post_toast(this,'/exile/comment/{{c.id}}','exile2-{{c.id}}','unexile2-{{c.id}}','d-none')"><i class="fas fa-campfire text-danger mr-2"></i>Exile user</button>
+								<button data-bs-dismiss="modal" id="unexile2-{{c.id}}" class="{% if not c.author.exiled_from(sub) %}d-none{% endif %} list-group-item text-success" onclick="post_toast(this,'/h/{{sub}}/unexile/{{c.author_id}}','exile2-{{c.id}}','unexile2-{{c.id}}','d-none')"><i class="fas fa-campfire text-success mr-2"></i>Unexile user</button>
 							{% endif %}
 						{% endif %}
 					{% endif %}
diff --git a/files/templates/header.html b/files/templates/header.html
index 96ca10300..7da067049 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -102,7 +102,7 @@
 			{% endif %}
 
 			{% if g.webview %}
-				<a class="mobile-nav-icon d-md-none" onclick="location.reload()"><i class="fas fa-arrow-rotate-right align-middle text-gray-500 black"></i></a>
+				<button class="mobile-nav-icon d-md-none" onclick="location.reload()"><i class="fas fa-arrow-rotate-right align-middle text-gray-500 black"></i></button>
 			{% endif %}
 			
 			{% if SITE_NAME == 'PCM' %}
@@ -304,7 +304,7 @@
 
 				{% if not g.webview %}
 					<li class="nav-item">
-						<a class="nav-link copy-link" data-clipboard-text="{{SITE_FULL}}/signup?ref={{v.username}}"><i class="fas fa-user-friends fa-fw mr-3"></i>Invite friends</a>
+						<button class="nav-link copy-link" data-clipboard-text="{{SITE_FULL}}/signup?ref={{v.username}}"><i class="fas fa-user-friends fa-fw mr-3"></i>Invite friends</button>
 					</li>
 				{% endif %}
 				
diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html
index 6acd1ee2b..7b4fb4d2d 100644
--- a/files/templates/leaderboard.html
+++ b/files/templates/leaderboard.html
@@ -24,7 +24,7 @@
 {% endmacro %}
 
 {% macro leaderboard_table(lb) %}
-<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-{{lb.html_id}}">Top {{lb.limit}} by {{lb.table_header_name}}</a></h5>
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><span id="leaderboard-{{lb.html_id}}">Top {{lb.limit}} by {{lb.table_header_name}}</span></h5>
 <div class="overflow-x-auto">
 {# TODO: check at some point if the nesting divs are intentional #}
 <table class="table table-striped mb-5">
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 85f56292f..538bf58a3 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -898,9 +898,9 @@
 					</a>
 
 					{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION_TOOLS_VISIBLE'] %}
-						<a class="ml-2" role="button" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
+						<button class="ml-2" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
 							<i class="fas fa-broom"></i>
-						</a>
+						</button>
 					{% endif %}
 				</li>
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index cbfdf901a..85a54f55d 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -222,14 +222,14 @@
 		<ul class="list-inline text-right d-flex">
 			<li class="list-inline-item mr-auto">
 				<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}">
-					<i class="fas fa-comment-dots"></i>{{p.comment_count}}
+					<i class="fas fa-comment-dots ml-0"></i>{{p.comment_count}}
 					<span class="text-info d-none {{p.id}}-new-comments"></span>
 				</a>
 
 				{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
-					<a class="ml-2" role="button" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
+					<button class="ml-2" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
 						<i class="fas fa-broom"></i>
-					</a>
+					</button>
 				{% endif %}
 
 			</li>
@@ -240,9 +240,9 @@
 
 			{% if v %}
 				<li class="list-inline-item">
-					<a role="button" data-bs-toggle="modal" data-bs-target="#actionsModal-{{p.id}}">
+					<button data-bs-toggle="modal" data-bs-target="#actionsModal-{{p.id}}">
 						<i class="fas fa-ellipsis-h"></i>
-					</a>
+					</button>
 				</li>
 			{% endif %}
 			{% if v and request.path.startswith('/@') and v.admin_level < PERMS['VIEW_VOTE_BUTTONS_ON_USER_PAGE'] %}
diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html
index 72bd36788..6fa9fcf97 100644
--- a/files/templates/userpage_admintools.html
+++ b/files/templates/userpage_admintools.html
@@ -23,7 +23,7 @@
 {% macro userAdminToolsUpper(deviceType) %}
 	{% if v and v.id != u.id and v.admin_level >= PERMS['USER_MODERATION_TOOLS_VISIBLE'] %}
 		{% if v.admin_level >= PERMS['ADMIN_ADD'] %}
-			<a id="add-admin-{{deviceType}}" class="{% if u.admin_level >= PERMS['ADMIN_ADD_PERM_LEVEL'] %}d-none{% endif %} btn btn-primary" onclick="post_toast(this,'/@{{u.username}}/make_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Make admin</a>
+			<button id="add-admin-{{deviceType}}" class="{% if u.admin_level >= PERMS['ADMIN_ADD_PERM_LEVEL'] %}d-none{% endif %} btn btn-primary" onclick="post_toast(this,'/@{{u.username}}/make_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Make admin</button>
 		{% endif %}
 		{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
 			<button id="remove-admin-{{deviceType}}" class="{% if u.admin_level < 1 %}d-none{% endif %} btn btn-danger" onclick="post_toast(this,'/@{{u.username}}/remove_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Remove admin</button>