From 4791e7b14b8bb604aeb6d207645d99214c2a522d Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 8 Sep 2022 19:24:00 +0200
Subject: [PATCH] revert icon change

---
 files/templates/admin/awards.html              |  4 ++--
 files/templates/admin/badge_grant.html         |  4 ++--
 files/templates/admin/badge_remove.html        |  4 ++--
 files/templates/authforms.html                 |  4 ++--
 files/templates/award_modal.html               |  2 +-
 files/templates/ban_modal.html                 |  2 +-
 files/templates/category_modal.html            |  2 +-
 files/templates/chat.html                      |  2 +-
 files/templates/comments.html                  | 18 +++++++++---------
 files/templates/contact.html                   |  2 +-
 files/templates/delete_post_modal.html         |  2 +-
 files/templates/header.html                    | 12 ++++++------
 files/templates/log.html                       |  4 ++--
 files/templates/notifications.html             |  4 ++--
 files/templates/post_actions_mobile.html       | 12 ++++++------
 files/templates/post_admin_actions_mobile.html | 16 ++++++++--------
 files/templates/report_post_modal.html         |  2 +-
 files/templates/settings.html                  |  6 +++---
 files/templates/settings_blocks.html           |  4 ++--
 files/templates/settings_profile.html          |  2 +-
 files/templates/settings_security.html         |  2 +-
 files/templates/sub/settings.html              |  4 ++--
 files/templates/submission.html                |  4 ++--
 files/templates/submission_listing.html        |  2 +-
 files/templates/userpage.html                  |  4 ++--
 25 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/files/templates/admin/awards.html b/files/templates/admin/awards.html
index 47868e62f..fe9c4bc2f 100644
--- a/files/templates/admin/awards.html
+++ b/files/templates/admin/awards.html
@@ -15,7 +15,7 @@
 			{{error}}
 		</span>
 		<button class="close" data-bs-dismiss="alert" aria-label="Close">
-			<span aria-hidden="true"><i class="fas fa-times"></i></span>
+			<span aria-hidden="true"><i class="far fa-times"></i></span>
 		</button>
 	</div>
 	{% endif %}
@@ -26,7 +26,7 @@
 			{{msg}}
 		</span>
 		<button class="close" data-bs-dismiss="alert" aria-label="Close">
-			<span aria-hidden="true"><i class="fas fa-times"></i></span>
+			<span aria-hidden="true"><i class="far fa-times"></i></span>
 		</button>
 	</div>
 	{% endif %}
diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html
index b90e1268d..a6b2f8e13 100644
--- a/files/templates/admin/badge_grant.html
+++ b/files/templates/admin/badge_grant.html
@@ -15,7 +15,7 @@
 				{{error}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 		{% endif %}
@@ -26,7 +26,7 @@
 				{{msg}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 		{% endif %}
diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html
index 7101ec415..98556ee4e 100644
--- a/files/templates/admin/badge_remove.html
+++ b/files/templates/admin/badge_remove.html
@@ -15,7 +15,7 @@
 				{{error}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 		{% endif %}
@@ -26,7 +26,7 @@
 				{{msg}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 		{% endif %}
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 7cde21e41..c774ad8ae 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -76,7 +76,7 @@
 													{{error}}
 													</span>
 													<button class="close" data-bs-dismiss="alert" aria-label="Close">
-														<span aria-hidden="true"><i class="fas fa-times"></i></span>
+														<span aria-hidden="true"><i class="far fa-times"></i></span>
 												</button>
 								</div>
 			{% endif %}
@@ -87,7 +87,7 @@
 													{{msg}}
 													</span>
 													<button class="close" data-bs-dismiss="alert" aria-label="Close">
-														<span aria-hidden="true"><i class="fas fa-times"></i></span>
+														<span aria-hidden="true"><i class="far fa-times"></i></span>
 												</button>
 								</div>
 			{% endif %}
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index 8054f5e08..73468f32a 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -4,7 +4,7 @@
 			<div class="modal-header">
 				<h5 class="modal-title">Give Award</h5>
 				<button class="close" data-bs-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="fas fa-times"></i></span>
+					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
 			<div id="awardModalBody" class="modal-body mb-3">
diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html
index ce75ef148..12c79fde9 100644
--- a/files/templates/ban_modal.html
+++ b/files/templates/ban_modal.html
@@ -5,7 +5,7 @@
 			<div class="modal-header pt-3">
 				<h5 id="banModalTitle"></h5>
 				<button class="close" data-bs-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="fas fa-times"></i></span>
+					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body" id="ban-modal-body">
diff --git a/files/templates/category_modal.html b/files/templates/category_modal.html
index 37415c83d..85a91878b 100644
--- a/files/templates/category_modal.html
+++ b/files/templates/category_modal.html
@@ -4,7 +4,7 @@
 			<div class="modal-header pt-3">
 				<h5 id="category-modal-title"></h5>
 				<button class="close" data-bs-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="fas fa-times"></i></span>
+					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body" id="category-modal-body">
diff --git a/files/templates/chat.html b/files/templates/chat.html
index d8ba08b7f..4a3a252e1 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -129,7 +129,7 @@
 
 			<div class="border-right pb-1 pt-2 px-3">
 				<span id="online2" data-bs-html="true" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Users in chat right now" class="text-muted">
-					<i class="fas fa-user fa-sm mr-1"></i>
+					<i class="far fa-user fa-sm mr-1"></i>
 					<span class="board-chat-count">0</span>
 				</span>
 			</div>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 3c727cd86..56aa56f22 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -215,7 +215,7 @@
 			</div>
 			{% if c.active_flags(v) %}
 			<div id="flaggers-{{c.id}}" class="flaggers d-none">
-				<strong><i class="fas fa-fw fa-flag"></i> Reported by:</strong>
+				<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
 				<pre></pre>
 				<ul style="padding-left:20px; margin-bottom: 0;word-wrap:break-word">
 					{% for f in c.filtered_flags(v) %}
@@ -549,8 +549,8 @@
 		</div>
 
 	{% if request.path.startswith('/transfers') %}
-		<a href="{{c.log_link}}"><i class="fas fa-link ml-1 text-muted"></i></a>
-		<a role="button" class="copy-link" role="button" data-clipboard-text="{{c.log_link}}"><i class="fas fa-copy ml-1 text-muted"></i></a>
+		<a href="{{c.log_link}}"><i class="far fa-link ml-1 text-muted"></i></a>
+		<a role="button" class="copy-link" role="button" data-clipboard-text="{{c.log_link}}"><i class="far fa-copy ml-1 text-muted"></i></a>
 	{% endif %}
 
 	{% if render_replies %} 
@@ -608,7 +608,7 @@
 			<div class="modal-header">
 				<h5 class="modal-title h6">More options</h5>
 				<button class="close" data-bs-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="fas fa-times"></i></span>
+					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body">
@@ -634,9 +634,9 @@
 						{% if c.author_id == v.id %}
 							<a role="button" data-bs-dismiss="modal" onclick="toggleEdit('{{c.id}}')" class="list-group-item"><i class="fas fa-edit mr-2"></i>Edit</a>
 							
-							<a id="undelete2-{{c.id}}" class="{% if not c.deleted_utc %}d-none{% endif %} list-group-item text-success" role="button" onclick="post_toast(this,'/undelete/comment/{{c.id}}', 'delete2-{{c.id}}', 'undelete2-{{c.id}}','d-none');document.getElementById('comment-{{c.id}}').classList.remove('deleted')" data-bs-dismiss="modal"><i class="fas fa-trash-alt text-success mr-2"></i>Undelete</a>
+							<a id="undelete2-{{c.id}}" class="{% if not c.deleted_utc %}d-none{% endif %} list-group-item text-success" role="button" onclick="post_toast(this,'/undelete/comment/{{c.id}}', 'delete2-{{c.id}}', 'undelete2-{{c.id}}','d-none');document.getElementById('comment-{{c.id}}').classList.remove('deleted')" data-bs-dismiss="modal"><i class="far fa-trash-alt text-success mr-2"></i>Undelete</a>
 
-							<a id="delete2-{{c.id}}" class="{% if c.deleted_utc %}d-none{% endif %} list-group-item text-danger" role="button" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deleteCommentModal" onclick="delete_commentModal('{{c.id}}')"><i class="fas fa-trash-alt text-danger mr-2"></i>Delete</a>
+							<a id="delete2-{{c.id}}" class="{% if c.deleted_utc %}d-none{% endif %} list-group-item text-danger" role="button" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deleteCommentModal" onclick="delete_commentModal('{{c.id}}')"><i class="far fa-trash-alt text-danger mr-2"></i>Delete</a>
 
 							<a id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" role="button" onclick="post_toast(this,'/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger mr-2"></i>Mark +18</a>
 							<a id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-danger" role="button" onclick="post_toast(this,'/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger mr-2"></i>Unmark +18</a>
@@ -688,7 +688,7 @@
 				<div class="modal-header">
 					<h5 class="modal-title h6">Admin options</h5>
 					<button class="close" data-bs-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true"><i class="fas fa-times"></i></span>
+						<span aria-hidden="true"><i class="far fa-times"></i></span>
 					</button>
 				</div>
 				<div class="modal-body">
@@ -767,7 +767,7 @@
 			<div class="modal-header d-none d-md-flex">
 				<h5 class="modal-title">Delete comment?</h5>
 				<button class="close" data-bs-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="fas fa-times"></i></span>
+					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body text-center">
@@ -796,7 +796,7 @@
 					<div class="modal-header">
 						<h5 class="modal-title">Report <span id="comment-author"></span>'s comment</h5>
 						<button class="close" data-bs-dismiss="modal" aria-label="Close">
-							<span aria-hidden="true"><i class="fas fa-times"></i></span>
+							<span aria-hidden="true"><i class="far fa-times"></i></span>
 						</button>
 					</div>
 					<div class="" id="reportCommentFormBefore">
diff --git a/files/templates/contact.html b/files/templates/contact.html
index ffe145cdc..11c5617f7 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -14,7 +14,7 @@
 				{{msg}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 	{% endif %}
diff --git a/files/templates/delete_post_modal.html b/files/templates/delete_post_modal.html
index ef897be57..15dcbd994 100644
--- a/files/templates/delete_post_modal.html
+++ b/files/templates/delete_post_modal.html
@@ -4,7 +4,7 @@
 			<div class="modal-header d-none d-md-flex">
 				<h5 class="modal-title">Delete post?</h5>
 				<button class="close" data-bs-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="fas fa-times"></i></span>
+					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
 			<div class="modal-body text-center">
diff --git a/files/templates/header.html b/files/templates/header.html
index ad5cab068..74aec29d3 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -232,17 +232,17 @@
 							</div>
 							<div class="px-2">
 								{% if has_app -%}
-								<a class="dropdown-item" href="/assets/app_{{SITE_NAME}}_v2.4.apk"><i class="fas fa-android fa-fw mr-3"></i>Android app</a>
+								<a class="dropdown-item" href="/assets/app_{{SITE_NAME}}_v2.4.apk"><i class="fab fa-android fa-fw mr-3"></i>Android app</a>
 								{%- endif %}
 
 								<a class="dropdown-item" href="https://rdrama.net/h/changelog"><i class="fas fa-clipboard fa-fw mr-3"></i>Changelog</a>
 
-								<a class="dropdown-item" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/rDrama"><i class="fas fa-github fa-fw mr-3"></i>Source code</a>
+								<a class="dropdown-item" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/rDrama"><i class="fab fa-github fa-fw mr-3"></i>Source code</a>
 
 								<a class="dropdown-item" rel="nofollow noopener noreferrer" href="https://rdrama.net/post/18459"><i class="fas fa-bug fa-fw mr-3"></i>Bugs/Suggestions</a>
 
 								{% if SITE_NAME == 'rDrama' %}
-									<a class="dropdown-item" href="/discord"><i class="fas fa-discord fa-fw mr-3"></i>Discord</a>
+									<a class="dropdown-item" href="/discord"><i class="fab fa-discord fa-fw mr-3"></i>Discord</a>
 								{% endif %}
 
 								{% if FEATURES['PROCOINS'] %}
@@ -297,17 +297,17 @@
 				{% endif %}
 				
 				{% if has_app -%}
-					<a class="nav-item nav-link" href="/assets/app_{{SITE_NAME}}_v2.4.apk"><i class="fas fa-android fa-fw mr-3"></i>Android app</a>
+					<a class="nav-item nav-link" href="/assets/app_{{SITE_NAME}}_v2.4.apk"><i class="fab fa-android fa-fw mr-3"></i>Android app</a>
 				{%- endif %}
 
 				<a class="nav-item nav-link" href="https://rdrama.net/h/changelog"><i class="fas fa-clipboard fa-fw mr-3"></i>Changelog</a>
 
-				<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/rDrama"><i class="fas fa-github fa-fw mr-3"></i>Source code</a>
+				<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/rDrama"><i class="fab fa-github fa-fw mr-3"></i>Source code</a>
 
 				<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="https://rdrama.net/post/18459"><i class="fas fa-bug fa-fw mr-3"></i>Bugs/Suggestions</a>
 
 				{% if SITE_NAME == 'rDrama' %}
-					<a class="nav-item nav-link" href="/discord"><i class="fas fa-discord fa-fw mr-3"></i>Discord</a>
+					<a class="nav-item nav-link" href="/discord"><i class="fab fa-discord fa-fw mr-3"></i>Discord</a>
 				{% endif %}
 
 				{% if FEATURES['PROCOINS'] %}
diff --git a/files/templates/log.html b/files/templates/log.html
index da6b343df..b5698963a 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -116,8 +116,8 @@
 
 						<div class="text-gray-500">
 							<span class="log--item-age" id="{{ma.id}}-age" data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('{{ma.id}}-age','{{ma.created_utc}}')">{{ma.age_string}}</span>
-							<a href="{{ma.permalink}}"><i class="fas fa-link ml-1 text-muted"></i></a>
-							<a role="button" class="copy-link" role="button" data-clipboard-text="{{ma.permalink}}"><i class="fas fa-copy ml-1 text-muted"></i></a>
+							<a href="{{ma.permalink}}"><i class="far fa-link ml-1 text-muted"></i></a>
+							<a role="button" class="copy-link" role="button" data-clipboard-text="{{ma.permalink}}"><i class="far fa-copy ml-1 text-muted"></i></a>
 						</div>
 
 					</div>
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index fae00ae51..4b274bf4a 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -91,8 +91,8 @@
 
 						<div class="text-gray-500">
 							<span class="log--item-age" id="{{ma.id}}-age" data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('{{ma.id}}-age','{{ma.created_utc}}')">{{ma.age_string}}</span>
-							<a href="{{ma.permalink}}"><i class="fas fa-link ml-1 text-muted"></i></a>
-							<a role="button" class="copy-link" role="button" data-clipboard-text="{{ma.permalink}}"><i class="fas fa-copy ml-1 text-muted"></i></a>
+							<a href="{{ma.permalink}}"><i class="far fa-link ml-1 text-muted"></i></a>
+							<a role="button" class="copy-link" role="button" data-clipboard-text="{{ma.permalink}}"><i class="far fa-copy ml-1 text-muted"></i></a>
 						</div>
 
 					</div>
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index 7e4a634d1..e53da1b77 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -8,9 +8,9 @@
 
 {% if v and ((not p.ghost and v.admin_level >= PERMS['VOTES_VISIBLE']) or v.id == AEVANN_ID) %}<a class="btn-block" href="/votes/{{p.fullname}}"><button class="nobackground btn btn-link btn-block btn-lg text-left text-muted"><i class="fas fa-arrows-v text-center text-muted mr-2"></i>Votes</button></a>{% endif %}
 
-<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' %}https://rdrama.org{{p.shortlink}}{% else %}{{p.permalink}}{% endif %}"><i class="fas fa-copy text-center text-muted mr-2"></i>Copy link</button>
+<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' %}https://rdrama.org{{p.shortlink}}{% else %}{{p.permalink}}{% endif %}"><i class="far fa-copy text-center text-muted mr-2"></i>Copy link</button>
 
-<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" onclick="report_postModal('{{p.id}}')"><i class="fas fa-flag text-center text-muted mr-2"></i>Report</button>
+<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" onclick="report_postModal('{{p.id}}')"><i class="far fa-flag text-center text-muted mr-2"></i>Report</button>
 
 {% if FEATURES['AWARDS'] -%}
 <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}}'><i class="fas fa-gift text-center text-muted mr-2"></i>Give Award</button>
@@ -34,9 +34,9 @@
 	{% endif %}
 
 
-	<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" role="button" onclick="post_toast(this,'/undelete_post/{{p.id}}', 'delete-{{p.id}}', 'undelete-{{p.id}}','d-none');document.getElementById('post-{{p.id}}').classList.remove('deleted')" data-bs-dismiss="modal"><i class="fas fa-trash-alt text-center mr-2"></i>Undelete</button>
+	<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" role="button" onclick="post_toast(this,'/undelete_post/{{p.id}}', 'delete-{{p.id}}', 'undelete-{{p.id}}','d-none');document.getElementById('post-{{p.id}}').classList.remove('deleted')" data-bs-dismiss="modal"><i class="far fa-trash-alt text-center mr-2"></i>Undelete</button>
 
-	<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" onclick="delete_postModal('{{p.id}}')"><i class="fas fa-trash-alt mr-2"></i>Delete</button>
+	<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" onclick="delete_postModal('{{p.id}}')"><i class="far fa-trash-alt mr-2"></i>Delete</button>
 
 
 	{% if FEATURES['COUNTRY_CLUB'] -%}
@@ -44,8 +44,8 @@
 	<button id="unclub3-{{p.id}}" class="{% if not p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast(this,'/toggle_club/{{p.id}}','club3-{{p.id}}','unclub3-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye mr-2"></i>Unmark club</button>
 	{%- endif %}
 
-	<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" onclick="post_toast(this,'/toggle_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 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" onclick="post_toast(this,'/toggle_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>
+	<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" onclick="post_toast(this,'/toggle_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 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" onclick="post_toast(this,'/toggle_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>
 {% else %}
 
 	{% if not p.ghost %}
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index 97e51fa90..b7547b2b8 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -10,7 +10,7 @@
 			<div class="modal-body">
 				<ul class="list-group post-actions">
 					{% if (request.path.startswith('/post/') or request.path.startswith('/h/')) and v.admin_level > 2 and p.id %}
-						<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="fas fa-edit text-center text-muted mr-2"></i>Edit</button>
+						<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-2"></i>Edit</button>
 					{% endif %}
 
 					{% if FEATURES['COUNTRY_CLUB'] -%}
@@ -31,19 +31,19 @@
 					<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" role="button" onclick="post_toast(this,'/unsticky/{{p.id}}','pin2-{{p.id}}','unpin2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center text-primary mr-2"></i>Unpin</button>
 
 					{% if "/reported/" in request.path %}
-						<button class="nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button" onclick="post_toast(this,'/remove_post/{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-center mr-2"></i>Remove</button>
-						<button class="nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast(this,'/approve_post/{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-center mr-2"></i>Approve</button>
+						<button class="nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button" onclick="post_toast(this,'/remove_post/{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-ban text-center mr-2"></i>Remove</button>
+						<button class="nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast(this,'/approve_post/{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-check text-center mr-2"></i>Approve</button>
 					{% else %}
-						<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" role="button" onclick="post_toast(this,'/remove_post/{{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 id="approve2-{{p.id}}" class="{% if not p.is_banned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast(this,'/approve_post/{{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>
+						<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" role="button" onclick="post_toast(this,'/remove_post/{{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 id="approve2-{{p.id}}" class="{% if not p.is_banned %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast(this,'/approve_post/{{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>
 					{% endif %}
 
 					{% if p.oauth_app %}
-						<a href="{{p.oauth_app.permalink}}"><button class="nobackground btn btn-link btn-block btn-lg text-muted text-left"><i class="fas fa-code text-center text-info mr-2"></i>API App</button></a>
+						<a href="{{p.oauth_app.permalink}}"><button class="nobackground btn btn-link btn-block btn-lg text-muted text-left"><i class="far fa-code text-center text-info mr-2"></i>API App</button></a>
 					{% endif %}
 
-					<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" onclick="post_toast(this,'/toggle_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 id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast(this,'/toggle_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>Unmark +18</button>
+					<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" onclick="post_toast(this,'/toggle_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 id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast(this,'/toggle_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>Unmark +18</button>
 
 					{% if v.id != p.author_id %}
 						<button id="ban2-{{p.id}}" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/post/{{p.id}}', '{{p.author.id}}', '{{p.author_name}}')" class="{% if p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button"><i class="fas fa-user-minus mr-2"></i>Ban user</button>
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index 1e7bf0be0..ee61cccba 100644
--- a/files/templates/report_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -4,7 +4,7 @@
 			<div class="modal-header">
 				<h5 class="modal-title">Report post</h5>
 				<button class="close" data-bs-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="fas fa-times"></i></span>
+					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
 			<div id="reportPostFormBefore">
diff --git a/files/templates/settings.html b/files/templates/settings.html
index a1925f4ec..75627ad30 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -76,7 +76,7 @@
 				{{error}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 		{% endif %}
@@ -87,7 +87,7 @@
 				{{msg}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 		{% endif %}
@@ -173,7 +173,7 @@
 				<div class="modal-header">
 					<h5 class="modal-title">{% if mfa_secret %}Setup two-step login{% elif mfa_secret and not v.email %}Email required for two-step login{% else %}Disable two-step login{% endif %}</h5>
 					<button class="close" data-bs-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true"><i class="fas fa-times"></i></span>
+						<span aria-hidden="true"><i class="far fa-times"></i></span>
 					</button>
 				</div>
 				{% if mfa_secret %}
diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html
index f60a418a1..ce49b4e90 100644
--- a/files/templates/settings_blocks.html
+++ b/files/templates/settings_blocks.html
@@ -15,7 +15,7 @@
 				{{error}}
 			</span>
 			<button class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="fas fa-times"></i></span>
+				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
 		{% endif %}
@@ -89,7 +89,7 @@
 				<div class="modal-header">
 					<h5 class="modal-title">Block users</h5>
 					<button class="close" data-bs-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true"><i class="fas fa-times"></i></span>
+						<span aria-hidden="true"><i class="far fa-times"></i></span>
 					</button>
 				</div>
 				<div class="modal-body">
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 5e72d02da..969b0c8bf 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -295,7 +295,7 @@
 
 							<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="fas fa-user mr-1" aria-hidden="true"></i>{{v.referral_count}}</span>
+									<i class="far fa-user mr-1" aria-hidden="true"></i>{{v.referral_count}}</span>
 								</span>
 
 							</div>
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index 5eb3a9a2d..f2d108543 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -226,7 +226,7 @@
 <div class="modal-header">
 	<h5 class="modal-title">Delete your {{SITE_NAME}} account</h5>
 	<button class="close" data-bs-dismiss="modal" aria-label="Close">
-		<span aria-hidden="true"><i class="fas fa-times"></i></span>
+		<span aria-hidden="true"><i class="far fa-times"></i></span>
 	</button>
 </div>
 <div class="" id="deleteFormContainer">
diff --git a/files/templates/sub/settings.html b/files/templates/sub/settings.html
index a23921ccc..11b414e29 100644
--- a/files/templates/sub/settings.html
+++ b/files/templates/sub/settings.html
@@ -11,7 +11,7 @@
 		{{error}}
 	</span>
 	<button class="close" data-bs-dismiss="alert" aria-label="Close">
-		<span aria-hidden="true"><i class="fas fa-times"></i></span>
+		<span aria-hidden="true"><i class="far fa-times"></i></span>
 	</button>
 </div>
 {% endif %}
@@ -23,7 +23,7 @@
 			{{msg}}
 		</span>
 		<button class="close" data-bs-dismiss="alert" aria-label="Close">
-			<span aria-hidden="true"><i class="fas fa-times"></i></span>
+			<span aria-hidden="true"><i class="far fa-times"></i></span>
 		</button>
 	</div>
 {% endif %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 812c50a93..2d8e98bd2 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -580,7 +580,7 @@
 				<div class="modal-body">
 					<ul class="list-group post-actions">
 						{% if v.id==p.author_id %}
-							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="fas fa-edit text-center text-muted mr-2"></i>Edit</button>
+							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-2"></i>Edit</button>
 						{% elif p.body %}
 							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="expandMarkdown('{{p.id}}','p')"><i class="fas text-expand-icon-{{p.id}} fa-expand-alt text-center mr-2"></i><span class="expand-text-p-{{p.id}}">View source</span></button>
 						{% endif %}
@@ -699,7 +699,7 @@
 					</div>
 					{% if p.active_flags(v) %}
 					<div id="flaggers" class="flaggers d-none">
-						<strong><i class="fas fa-fw fa-flag"></i> Reported by:</strong>
+						<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
 						<pre></pre>
 						<ul style="padding-left:20px; margin-bottom: 0;word-wrap:break-word">
 							{% for f in p.filtered_flags(v) %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 63818b2c0..451f893c6 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -33,7 +33,7 @@
 
 {% if p.active_flags(v) %}
 	<div id="flaggers-{{p.id}}" class="flaggers d-none">
-		<strong><i class="fas fa-fw fa-flag"></i> Reported by:</strong>
+		<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
 		<pre></pre>
 		<ul style="padding-left:20px; margin-bottom: 0;word-wrap:break-word">
 			{% for f in p.filtered_flags(v) %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 549b7da88..dcb940da8 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -91,7 +91,7 @@
 								<div class="dropdown show d-none">
 									<a role="button" data-bs-toggle="dropdown"
 									aria-haspopup="true" aria-expanded="false">
-									<i class="fas fa-ellipsis-h text-lg align-middle text-gray-600"></i>
+									<i class="far fa-ellipsis-h text-lg align-middle text-gray-600"></i>
 								</a>
 							</div>
 							{% endif %}
@@ -99,7 +99,7 @@
 							<div class="dropdown show d-none">
 								<a role="button" id="dropdownProfileActionsLink" data-bs-toggle="dropdown"
 								aria-haspopup="true" aria-expanded="false">
-								<i class="fas fa-ellipsis-h text-lg align-middle text-gray-600"></i>
+								<i class="far fa-ellipsis-h text-lg align-middle text-gray-600"></i>
 							</a>
 
 							<div class="dropdown-menu dropdown-menu-right border-0 shadow" aria-labelledby="dropdownMoreLink">