diff --git a/files/templates/comments.html b/files/templates/comments.html
index 5ee14eb3e..56bfe513e 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -502,8 +502,8 @@
 		{% endif %}
 
 	{% if request.path.startswith('/transfers') %}
-		<a href="{{c.log_link}}"><i class="far fa-link ml-1 text-muted"></i></a>
-		<button type="button" class="copy-link ml-3" data-clipboard-text="{{c.log_link}}"><i class="far fa-copy text-muted"></i></button>
+		<a href="{{c.log_link}}"><i class="fas fa-link ml-1 text-muted"></i></a>
+		<button type="button" class="copy-link ml-3" data-clipboard-text="{{c.log_link}}"><i class="fas fa-copy text-muted"></i></button>
 	{% endif %}
 
 	{% if render_replies %}
@@ -570,7 +570,7 @@
 			<div class="modal-header">
 				<h6 class="modal-title">More options</h6>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body">
@@ -598,9 +598,9 @@
 						{% if c.author_id == v.id %}
 							<button type="button" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="toggleEdit('{{c.id}}')" class="list-group-item"><i class="fas fa-edit mr-2"></i>Edit</button>
 
-							<button type="button" id="undelete2-{{c.id}}" class="{% if not c.deleted_utc %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/undelete/comment/{{c.id}}', 'delete2-{{c.id}}', 'undelete2-{{c.id}}','d-none')" data-toggleelement=".comment-{{c.id}}-only" data-toggleattr="deleted" data-bs-dismiss="modal"><i class="far fa-trash-alt text-success mr-2"></i>Undelete</button>
+							<button type="button" id="undelete2-{{c.id}}" class="{% if not c.deleted_utc %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/undelete/comment/{{c.id}}', 'delete2-{{c.id}}', 'undelete2-{{c.id}}','d-none')" data-toggleelement=".comment-{{c.id}}-only" data-toggleattr="deleted" data-bs-dismiss="modal"><i class="fas fa-trash-alt text-success mr-2"></i>Undelete</button>
 
-							<button type="button" id="delete2-{{c.id}}" class="{% if c.deleted_utc %}d-none{% endif %} list-group-item text-danger" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deleteCommentModal" data-nonce="{{g.nonce}}" data-onclick="delete_commentModal(this, '{{c.id}}')"><i class="far fa-trash-alt text-danger mr-2"></i>Delete</button>
+							<button type="button" id="delete2-{{c.id}}" class="{% if c.deleted_utc %}d-none{% endif %} list-group-item text-danger" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deleteCommentModal" data-nonce="{{g.nonce}}" data-onclick="delete_commentModal(this, '{{c.id}}')"><i class="fas fa-trash-alt text-danger mr-2"></i>Delete</button>
 						{% else %}
 							{% if c.body %}
 								<button type="button" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="expandMarkdown('{{c.fullname}}')" class="list-group-item"><i class="fas text-expand-icon-{{c.fullname}} fa-expand-alt mr-2"></i><span class="expand-text-{{c.fullname}}">View source</span></button>
@@ -654,7 +654,7 @@
 				<div class="modal-header">
 					<h6 class="modal-title">Admin options</h6>
 					<button type="button" class="close" data-bs-dismiss="modal">
-						<span><i class="far fa-times"></i></span>
+						<span><i class="fas fa-times"></i></span>
 					</button>
 				</div>
 				<div class="modal-body">
@@ -736,7 +736,7 @@
 			<div class="modal-header d-none d-md-flex">
 				<h5 class="modal-title">Delete comment?</h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body text-center">
@@ -765,7 +765,7 @@
 					<div class="modal-header">
 						<h5 class="modal-title">Report <span id="comment-author"></span>'s comment</h5>
 						<button type="button" class="close" data-bs-dismiss="modal">
-							<span><i class="far fa-times"></i></span>
+							<span><i class="fas fa-times"></i></span>
 						</button>
 					</div>
 					<div class="modal-body">
diff --git a/files/templates/log.html b/files/templates/log.html
index 33fc4f618..208ec6e84 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -84,8 +84,8 @@
 							</div>
 							<div class="text-gray-500">
 								<span class="log--item-age" id="{{ma.id}}-age" data-bs-toggle="tooltip" data-bs-placement="bottom" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{ma.created_utc}}')">{{ma.age_string}}</span>
-								<a href="{{ma.permalink}}"><i class="far fa-link ml-3 text-muted"></i></a>
-								<button type="button" class="copy-link ml-3" data-clipboard-text="{{ma.permalink}}"><i class="far fa-copy text-muted"></i></button>
+								<a href="{{ma.permalink}}"><i class="fas fa-link ml-3 text-muted"></i></a>
+								<button type="button" class="copy-link ml-3" data-clipboard-text="{{ma.permalink}}"><i class="fas fa-copy text-muted"></i></button>
 							</div>
 						</div>
 					</div>
diff --git a/files/templates/modals/award.html b/files/templates/modals/award.html
index 23d889f9a..4d7bbbd2a 100644
--- a/files/templates/modals/award.html
+++ b/files/templates/modals/award.html
@@ -6,7 +6,7 @@
 			<div class="modal-header">
 				<h5 class="modal-title">Give Award</h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div id="awardModalBody" class="modal-body pt-2 mb-3">
diff --git a/files/templates/modals/delete_post.html b/files/templates/modals/delete_post.html
index b0acc7e68..e6773fd04 100644
--- a/files/templates/modals/delete_post.html
+++ b/files/templates/modals/delete_post.html
@@ -4,7 +4,7 @@
 			<div class="modal-header d-none d-md-flex">
 				<h5 class="modal-title">Delete post?</h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body text-center">
diff --git a/files/templates/modals/punish.html b/files/templates/modals/punish.html
index 101670c67..8e4b3c781 100644
--- a/files/templates/modals/punish.html
+++ b/files/templates/modals/punish.html
@@ -4,7 +4,7 @@
 			<div class="modal-header pt-3">
 				<h5 id="banModalTitle"></h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body" id="ban-modal-body">
@@ -36,7 +36,7 @@
 			<div class="modal-header pt-3">
 				<h5 id="chudModalTitle"></h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body pt-0" id="chud-modal-body">
diff --git a/files/templates/modals/report_post.html b/files/templates/modals/report_post.html
index 07d4c703b..80247e761 100644
--- a/files/templates/modals/report_post.html
+++ b/files/templates/modals/report_post.html
@@ -4,7 +4,7 @@
 			<div class="modal-header">
 				<h5 class="modal-title">Report post</h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body">
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index 4a7d5358e..9ec436389 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -88,8 +88,8 @@
 							</div>
 							<div class="text-gray-500">
 								<span class="log--item-age" id="{{ma.id}}-age" data-bs-toggle="tooltip" data-bs-placement="bottom" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{ma.created_utc}}')">{{ma.age_string}}</span>
-								<a href="{{ma.permalink}}"><i class="far fa-link ml-3 text-muted"></i></a>
-								<button type="button" class="copy-link ml-3" data-clipboard-text="{{ma.permalink}}"><i class="far fa-copy text-muted"></i></button>
+								<a href="{{ma.permalink}}"><i class="fas fa-link ml-3 text-muted"></i></a>
+								<button type="button" class="copy-link ml-3" data-clipboard-text="{{ma.permalink}}"><i class="fas fa-copy text-muted"></i></button>
 							</div>
 						</div>
 					</div>
diff --git a/files/templates/post.html b/files/templates/post.html
index 3fa7c7c82..16bae2b80 100644
--- a/files/templates/post.html
+++ b/files/templates/post.html
@@ -37,7 +37,7 @@
 				<div class="modal-body">
 					<ul class="list-group post-actions">
 						{% if v.id==p.author_id %}
-							<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-2"></i>Edit</button>
+							<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="togglePostEdit('{{p.id}}')"><i class="fas fa-edit text-center text-muted mr-2"></i>Edit</button>
 						{% elif p.body and v.admin_level < PERMS['POST_COMMENT_EDITING'] %}
 							<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="expandMarkdown('{{p.fullname}}')"><i class="fas text-expand-icon-{{p.fullname}} fa-expand-alt text-center mr-2"></i><span class="expand-text-{{p.fullname}}">View source</span></button>
 						{% endif %}
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index 62e8988d7..46bc73cea 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -1,6 +1,6 @@
 {% if v and v.id==p.author_id and p.private %}
 	<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-areyousure="postToastReload(this,'/publish/{{p.id}}')" data-nonce="{{g.nonce}}" data-onclick="areyousure(this)" data-dismiss="modal">
-		<i class="far fa-globe text-center text-muted mr-2"></i>Publish
+		<i class="fas fa-globe text-center text-muted mr-2"></i>Publish
 	</button>
 {% endif %}
 
@@ -11,9 +11,9 @@
 	</a>
 {% endif %}
 
-<button type="button" data-bs-dismiss="modal" class="copy-link nobackground btn btn-link btn-block btn-lg text-left text-muted" data-clipboard-text="{% if SITE == 'rdrama.net' %}{{SITE_FULL}}{{p.shortlink}}{% else %}{{p.permalink}}{% endif %}"><i class="far fa-copy text-center text-muted mr-2"></i>Copy link</button>
+<button type="button" data-bs-dismiss="modal" class="copy-link nobackground btn btn-link btn-block btn-lg text-left text-muted" data-clipboard-text="{% if SITE == 'rdrama.net' %}{{SITE_FULL}}{{p.shortlink}}{% else %}{{p.permalink}}{% endif %}"><i class="fas fa-copy text-center text-muted mr-2"></i>Copy link</button>
 
-<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportPostModal" data-nonce="{{g.nonce}}" data-onclick="report_postModal('{{p.id}}')"><i class="far fa-flag text-center text-muted mr-2"></i>Report</button>
+<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportPostModal" data-nonce="{{g.nonce}}" data-onclick="report_postModal('{{p.id}}')"><i class="fas fa-flag text-center text-muted mr-2"></i>Report</button>
 
 {% if FEATURES['AWARDS'] -%}
 <button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#awardModal" data-url='/award/post/{{p.id}}' data-ghost="{{p.ghost}}" data-nonce="{{g.nonce}}" {% if p.author.immune_to_awards(v) %}disabled{% endif %}><i class="fas fa-gift text-center text-muted mr-2"></i>Give Award</button>
@@ -37,9 +37,9 @@
 {% endif %}
 
 {% if v.id==p.author_id %}
-	<button type="button" id="undelete-{{p.id}}" class="{% if not p.deleted_utc %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/undelete_post/{{p.id}}', 'delete-{{p.id}}', 'undelete-{{p.id}}','d-none')" data-toggleelement="#post-{{p.id}}" data-toggleattr="deleted" data-bs-dismiss="modal"><i class="far fa-trash-alt text-center mr-2"></i>Undelete</button>
+	<button type="button" id="undelete-{{p.id}}" class="{% if not p.deleted_utc %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/undelete_post/{{p.id}}', 'delete-{{p.id}}', 'undelete-{{p.id}}','d-none')" data-toggleelement="#post-{{p.id}}" data-toggleattr="deleted" data-bs-dismiss="modal"><i class="fas fa-trash-alt text-center mr-2"></i>Undelete</button>
 
-	<button type="button" id="delete-{{p.id}}" class="{% if p.deleted_utc %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deletePostModal" data-nonce="{{g.nonce}}" data-onclick="delete_postModal(this, '{{p.id}}')"><i class="far fa-trash-alt mr-2"></i>Delete</button>
+	<button type="button" id="delete-{{p.id}}" class="{% if p.deleted_utc %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deletePostModal" data-nonce="{{g.nonce}}" data-onclick="delete_postModal(this, '{{p.id}}')"><i class="fas fa-trash-alt mr-2"></i>Delete</button>
 {% else %}
 	{% if not p.ghost %}
 		<button type="button" id="unblock2-{{p.id}}" class="nobackground btn btn-link btn-block btn-lg text-success text-left {% if not p.is_blocking %}d-none{% endif %}" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/settings/unblock?username={{p.author_name}}','block2-{{p.id}}','unblock2-{{p.id}}','d-none')"><i class="fas fa-eye mr-2 text-success"></i>Unblock user</button>
@@ -52,8 +52,8 @@
 {% endif %}
 
 {% if FEATURES['NSFW_MARKING'] and (v.id==p.author_id or (p.sub and v.mods(p.sub))) %}
-	<button type="button" id="mark3-{{p.id}}" class="{% if p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/mark_post_nsfw/{{p.id}}','mark3-{{p.id}}','unmark3-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center mr-2"></i>Mark +18</button>
-	<button type="button" id="unmark3-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark3-{{p.id}}','unmark3-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center mr-2"></i>Unmark +18</button>
+	<button type="button" id="mark3-{{p.id}}" class="{% if p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/mark_post_nsfw/{{p.id}}','mark3-{{p.id}}','unmark3-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-center mr-2"></i>Mark +18</button>
+	<button type="button" id="unmark3-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark3-{{p.id}}','unmark3-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-center mr-2"></i>Unmark +18</button>
 {% endif %}
 
 {% if p.sub and v.mods(p.sub) %}
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index 3dbba727e..f3d7323ec 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -10,11 +10,11 @@
 			<div class="modal-body">
 				<ul class="list-group post-actions">
 					{% if v.admin_level >= PERMS['APPS_MODERATION'] and p.oauth_app %}
-						<a href="{{p.oauth_app.permalink}}/posts" class="nobackground btn btn-link btn-block btn-lg text-muted text-left text-info"><i class="far fa-code text-center text-info mr-2"></i>API App</a>
+						<a href="{{p.oauth_app.permalink}}/posts" class="nobackground btn btn-link btn-block btn-lg text-muted text-left text-info"><i class="fas fa-code text-center text-info mr-2"></i>API App</a>
 					{% endif %}
 
 					{% if (request.path.startswith('/post/') or request.path.startswith('/h/')) and v.admin_level >= PERMS['POST_COMMENT_EDITING'] and p.id %}
-						<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-2"></i>Edit</button>
+						<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" data-nonce="{{g.nonce}}" data-onclick="togglePostEdit('{{p.id}}')"><i class="fas fa-edit text-center text-muted mr-2"></i>Edit</button>
 					{% endif %}
 
 					{% if v.can_edit(p) %}
@@ -29,12 +29,12 @@
 					{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
 						<button type="button" id="pin2-{{p.id}}" class="{% if p.stickied and not p.stickied_utc %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" data-nonce="{{g.nonce}}" data-onclick="pinPost(this,'{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center text-primary mr-2"></i>Pin {% if p.stickied_utc %}permanently{% else %}for 1 hour{% endif %}</button>
 						<button type="button" id="unpin2-{{p.id}}" class="{% if not p.stickied %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" data-nonce="{{g.nonce}}" data-onclick="unpinPost(this,'{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center text-primary mr-2"></i>Unpin</button>
-						<button type="button" id="remove2-{{p.id}}" class="{% if p.is_banned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" data-nonce="{{g.nonce}}" data-onclick="removePost(this,'{{p.id}}','remove2-{{p.id}}','approve2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="far fa-ban text-center mr-2"></i>Remove</button>
-						<button type="button" id="approve2-{{p.id}}" class="{% if not p.is_banned and request.path != '/admin/reported/posts' %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" data-nonce="{{g.nonce}}" data-onclick="approvePost(this,'{{p.id}}','remove2-{{p.id}}','approve2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="far fa-check text-center mr-2"></i>Approve</button>
+						<button type="button" id="remove2-{{p.id}}" class="{% if p.is_banned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" data-nonce="{{g.nonce}}" data-onclick="removePost(this,'{{p.id}}','remove2-{{p.id}}','approve2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-ban text-center mr-2"></i>Remove</button>
+						<button type="button" id="approve2-{{p.id}}" class="{% if not p.is_banned and request.path != '/admin/reported/posts' %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" data-nonce="{{g.nonce}}" data-onclick="approvePost(this,'{{p.id}}','remove2-{{p.id}}','approve2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-check text-center mr-2"></i>Approve</button>
 					{% endif %}
 					{% if FEATURES['NSFW_MARKING'] and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
-						<button type="button" id="mark2-{{p.id}}" class="{% if p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/mark_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center text-danger mr-2"></i>Mark +18</button>
-						<button type="button" id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center text-success mr-2"></i>Unmark +18</button>
+						<button type="button" id="mark2-{{p.id}}" class="{% if p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/mark_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-center text-danger mr-2"></i>Mark +18</button>
+						<button type="button" id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-center text-success mr-2"></i>Unmark +18</button>
 					{% endif %}
 					{% if v.admin_level >= PERMS['PROGSTACK'] %}
 						<button type="button" id="progstack2-{{p.id}}" class="{% if p.is_approved == PROGSTACK_ID %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/admin/progstack/post/{{p.id}}','progstack2-{{p.id}}','unprogstack2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-bullhorn text-center text-danger mr-2"></i>Apply Progressive Stack</button>
diff --git a/files/templates/settings/blocks.html b/files/templates/settings/blocks.html
index cfd2bb3c1..5507b98e6 100644
--- a/files/templates/settings/blocks.html
+++ b/files/templates/settings/blocks.html
@@ -58,7 +58,7 @@
 			<div class="modal-header">
 				<h5 class="modal-title">Block user</h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body">
diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html
index f6166b02b..1ecbbca8e 100644
--- a/files/templates/settings/personal.html
+++ b/files/templates/settings/personal.html
@@ -300,7 +300,7 @@
 							<div class="input-group">
 								<input autocomplete="off" type="text" readonly class="form-control copy-link" id="referral_code" value="{{SITE_FULL}}/signup?ref={{v.username}}" data-clipboard-text="{{SITE_FULL}}/signup?ref={{v.username}}">
 								<span class="input-group-append" data-bs-toggle="tooltip" data-bs-placement="top" title="You have referred {{v.referral_count}} user{{'s' if v.referral_count != 1 else ''}} so far. {% if v.referral_count==0 %}¯\_(ツ)_/¯{% elif v.referral_count>10 %}Wow!{% endif %}">
-									<span class="input-group-text text-primary border-0"><i class="far fa-user mr-1"></i>{{v.referral_count}}</span>
+									<span class="input-group-text text-primary border-0"><i class="fas fa-user mr-1"></i>{{v.referral_count}}</span>
 								</span>
 							</div>
 							<div class="text-small text-muted mt-3">Share this link with a friend. {% if v.referral_count==0 %} When they sign up, you'll get the bronze recruitment badge. <a href="/badges">Learn more.</a>{% elif v.referral_count<10 %} When you refer 10 friends, you'll receive the silver recruitment badge. <a href="/badges">Learn more.</a>{% elif v.referral_count<100 %} When you refer 100 friends, you'll receive the gold recruitment badge. <a href="/badges">Learn more</a>.{% endif %}</div>
@@ -335,7 +335,7 @@
 				<div class="modal-header">
 					<h5 class="modal-title">Make {{friendly_name}} Permanent</h5>
 					<button type="button" class="close" data-bs-dismiss="modal">
-						<span><i class="far fa-times"></i></span>
+						<span><i class="fas fa-times"></i></span>
 					</button>
 				</div>
 				<div class="modal-body">
diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html
index 584774b09..d7f26eb20 100644
--- a/files/templates/settings/security.html
+++ b/files/templates/settings/security.html
@@ -142,7 +142,7 @@
 					{% endif %}
 				</h5>
 				<button type="button" class="close" data-bs-dismiss="modal">
-					<span><i class="far fa-times"></i></span>
+					<span><i class="fas fa-times"></i></span>
 				</button>
 			</div>
 			<form action="/settings/security" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHRReload(this)">
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index 8446d1124..826abc675 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -190,7 +190,7 @@
 	<i class="fas {% if error %}fa-exclamation-circle{% else %}fa-check-circle{% endif %} my-auto"></i>
 	<span>{{msg}}</span>
 	<button type="button" class="close" data-bs-dismiss="alert">
-		<span><i class="far fa-times"></i></span>
+		<span><i class="fas fa-times"></i></span>
 	</button>
 </div>
 {% endmacro %}
@@ -198,7 +198,7 @@
 {% macro reports(i, kind) %}
 {% if i.active_reports(v) %}
 <div id="reports-{{i.id}}" class="reports d-none">
-	<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
+	<strong><i class="fas fa-fw fa-flag"></i> Reported by:</strong>
 	<ul class="mt-1 mb-0" style="padding-left:20px;word-wrap:break-word">
 		{% for r in i.filtered_reports(v) %}
 			<li>
@@ -220,7 +220,7 @@
 {% macro chat_users_online() %}
 <div class="border-right pb-1 px-3">
 	<span id="online2" data-bs-html="true" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Users Online" class="text-muted">
-		<i class="far fa-user fa-sm mr-1"></i>
+		<i class="fas fa-user fa-sm mr-1"></i>
 		<span class="board-chat-count">0</span>
 	</span>
 </div>