diff --git a/files/templates/comments/CommentEditForm.html b/files/templates/comments/CommentEditForm.html
index 7029a3c9a..7a232e43c 100644
--- a/files/templates/comments/CommentEditForm.html
+++ b/files/templates/comments/CommentEditForm.html
@@ -5,32 +5,32 @@
 			<textarea {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" id="comment-edit-body-{{c.id}}" data-id="{{c.id}}" name="body" form="comment-edit-form-{{c.id}}" class="w-full rounded-t-md p-3 bg-transparent focus:bg-white shadow-inner resize-y focus:outline-none" aria-label="With textarea" placeholder="Add your comment..." rows="3">{{c.body}}</textarea> 
 			<ul class="-mt-1 flex space-x-4 px-3 py-2 border-t border-dashed border-gray-400 mb-0">
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeBold('comment-edit-body-{{c.id}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeBold('comment-edit-body-{{c.id}}')">
 						<i class="fas fa-bold fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeItalics('comment-edit-body-{{c.id}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeItalics('comment-edit-body-{{c.id}}')">
 						<i class="fas fa-italic fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Italicize"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeQuote('comment-edit-body-{{c.id}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeQuote('comment-edit-body-{{c.id}}')">
 						<i class="fas fa-quote-right fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Quote"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="commentForm('comment-edit-body-{{c.id}}');getGif()">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="commentForm('comment-edit-body-{{c.id}}');getGif()">
 						<span class="font-bold text-sm text-uppercase" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add GIF">GIF</span>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="loadEmojis('comment-edit-body-{{c.id}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="loadEmojis('comment-edit-body-{{c.id}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
 					</button>
 				</li>
 				{% if v %}
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600">
+					<button type="button" class="text-gray-400 hover:text-gray-500">
 						<div id="filename-edit-reply-{{c.id}}">
 							<i class="fas fa-camera fa-fw fa-sm"></i>
 						</div>
@@ -45,7 +45,7 @@
 				Formatting help
 			</a>
 			<div class="ml-auto flex">
-				<button type="button" id="cancel-edit-{{c.id}}" class="px-4 py-2 text-sm font-bold text-gray-500 hover:text-gray-600" onclick="toggleEdit('{{c.id}}')">
+				<button type="button" id="cancel-edit-{{c.id}}" class="px-4 py-2 text-sm font-bold text-gray-400 hover:text-gray-500" onclick="toggleEdit('{{c.id}}')">
 					Cancel
 				</button>
 				<button type="button" form="comment-edit-form-{{c.id}}" class="ml-2 btn btn-green" onclick="comment_edit('{{c.id}}')">
diff --git a/files/templates/comments/CommentForm.html b/files/templates/comments/CommentForm.html
index c3347b8a0..bfbf58048 100644
--- a/files/templates/comments/CommentForm.html
+++ b/files/templates/comments/CommentForm.html
@@ -7,32 +7,32 @@
 		<textarea maxlength="10000" id="reply-form-body-{{p.fullname}}" data-fullname="{{p.fullname}}" class="w-full rounded-t-md p-3 bg-transparent focus:bg-white shadow-inner resize-y focus:outline-none" id="comment-form" name="body" form="reply-to-{{p.fullname}}" aria-label="With textarea" placeholder="Add your comment..." rows="3" oninput="charLimit('reply-form-body-{{p.fullname}}','charcount-reply')"></textarea>
 		<ul class="-mt-1 flex space-x-4 px-3 py-2 border-t border-dashed border-gray-400 mb-0">
 			<li>
-				<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeBold('reply-form-body-{{p.fullname}}')">
+				<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeBold('reply-form-body-{{p.fullname}}')">
 					<i class="fas fa-bold fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i>
 				</button>
 			</li>
 			<li>
-				<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeItalics('reply-form-body-{{p.fullname}}')">
+				<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeItalics('reply-form-body-{{p.fullname}}')">
 					<i class="fas fa-italic fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Italicize"></i>
 				</button>
 			</li>
 			<li>
-				<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeQuote('reply-form-body-{{p.fullname}}')">
+				<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeQuote('reply-form-body-{{p.fullname}}')">
 					<i class="fas fa-quote-right fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Quote"></i>
 				</button>
 			</li>
 			<li>
-				<button type="button" id="gif-reply-btn-{{p.fullname}}" class="text-gray-500 hover:text-gray-600" onclick="commentForm('reply-form-body-{{p.fullname}}');getGif()">
+				<button type="button" id="gif-reply-btn-{{p.fullname}}" class="text-gray-400 hover:text-gray-500" onclick="commentForm('reply-form-body-{{p.fullname}}');getGif()">
 					<span class="font-bold text-sm text-uppercase" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add GIF">GIF</span>
 				</button>
 			</li>
 			<li>
-				<button type="button" id="emoji-reply-btn-{{p.fullname}}" class="text-gray-500 hover:text-gray-600" onclick="loadEmojis('reply-form-body-{{p.fullname}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
+				<button type="button" id="emoji-reply-btn-{{p.fullname}}" class="text-gray-400 hover:text-gray-500" onclick="loadEmojis('reply-form-body-{{p.fullname}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
 				</button>
 			</li>
 			{% if v %}
 			<li>
-				<label for="file-upload-reply-{{p.fullname}}" class="text-gray-500 hover:text-gray-600">
+				<label for="file-upload-reply-{{p.fullname}}" class="text-gray-400 hover:text-gray-500">
 					<div id="filename-show-reply-{{p.fullname}}">
 						<i class="fas fa-camera fa-fw fa-sm"></i>
 					</div>
diff --git a/files/templates/comments/CommentReplyForm.html b/files/templates/comments/CommentReplyForm.html
index 94620cffb..37dcbff6f 100644
--- a/files/templates/comments/CommentReplyForm.html
+++ b/files/templates/comments/CommentReplyForm.html
@@ -7,32 +7,32 @@
 			<textarea {% if v.longpost %}minlength="280"{% endif %} maxlength="{% if v.bird %}140{% else %}10000{% endif %}" id="reply-form-body-{{c.fullname}}" data-fullname="{{c.fullname}}" name="body" form="reply-to-t3_{{c.id}}" class="w-full rounded-t-md p-3 bg-transparent focus:bg-white shadow-inner resize-y focus:outline-none" aria-label="With textarea" placeholder="Add your reply..." rows="3" oninput="charLimit('reply-form-body-{{c.fullname}}','charcount-{{c.id}}')"></textarea>
 			<ul class="-mt-1 flex space-x-4 px-3 py-2 border-t border-dashed border-gray-400 mb-0">
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeBold('reply-form-body-{{c.fullname}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeBold('reply-form-body-{{c.fullname}}')">
 						<i class="fas fa-bold fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeItalics('reply-form-body-{{c.fullname}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeItalics('reply-form-body-{{c.fullname}}')">
 						<i class="fas fa-italic fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Italicize"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeQuote('reply-form-body-{{c.fullname}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeQuote('reply-form-body-{{c.fullname}}')">
 						<i class="fas fa-quote-right fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Quote"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="commentForm('reply-form-body-{{c.fullname}}');getGif()">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="commentForm('reply-form-body-{{c.fullname}}');getGif()">
 						<span class="font-bold text-sm text-uppercase" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add GIF">GIF</span>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-600" onclick="loadEmojis('reply-form-body-{{c.fullname}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="loadEmojis('reply-form-body-{{c.fullname}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
 					</button>
 				</li>
 				{% if v %}
 				<li>
-					<label for="file-upload-reply-{{c.fullname}}" class="text-gray-500 hover:text-gray-600">
+					<label for="file-upload-reply-{{c.fullname}}" class="text-gray-400 hover:text-gray-500">
 						<div id="filename-show-reply-{{c.fullname}}">
 							<i class="fas fa-camera fa-fw fa-sm"></i>
 						</div>
@@ -48,7 +48,7 @@
 				Formatting help
 			</a>
 			<div class="ml-auto flex">
-				<button type="button" class="px-4 py-2 text-sm font-bold text-gray-500 hover:text-gray-600" onclick="document.getElementById('reply-to-{{c.id}}').classList.add('hidden')">
+				<button type="button" class="px-4 py-2 text-sm font-bold text-gray-400 hover:text-gray-500" onclick="document.getElementById('reply-to-{{c.id}}').classList.add('hidden')">
 					Cancel
 				</button>
 				<button type="button" id="save-reply-to-{{c.fullname}}" class="ml-2 btn btn-green" onclick="post_comment('{{c.fullname}}', '{{c.post.id}}');">
diff --git a/files/templates/submission/SubmissionEditForm.html b/files/templates/submission/SubmissionEditForm.html
index 921ced340..8ca198c95 100644
--- a/files/templates/submission/SubmissionEditForm.html
+++ b/files/templates/submission/SubmissionEditForm.html
@@ -7,27 +7,27 @@
 			<textarea name="body" maxlength="10000" id="post-edit-box-{{p.id}}" form="post-edit-form-{{p.id}}" class="p-2 shadow-inner w-full" aria-label="With textarea" placeholder="Add text to your post..." rows="10">{{p.body}}</textarea>
 			<ul class="-mt-1 flex space-x-4 px-3 py-2 border-t border-dashed border-gray-300 mb-0">
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-400" onclick="makeBold('post-edit-box-{{p.id}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeBold('post-edit-box-{{p.id}}')">
 						<i class="fas fa-bold fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-400" onclick="makeItalics('post-edit-box-{{p.id}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeItalics('post-edit-box-{{p.id}}')">
 						<i class="fas fa-italic fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Italicize"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-400" onclick="makeQuote('post-edit-box-{{p.id}}')">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeQuote('post-edit-box-{{p.id}}')">
 						<i class="fas fa-quote-right fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Quote"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-400" onclick="commentForm('post-edit-box-{{p.id}}');getGif()">
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="commentForm('post-edit-box-{{p.id}}');getGif()">
 						<span class="font-bold text-sm text-uppercase" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add GIF">GIF</span>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="text-gray-500 hover:text-gray-400" onclick="loadEmojis('post-edit-box-{{p.id}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
+					<button type="button" class="text-gray-400 hover:text-gray-500" onclick="loadEmojis('post-edit-box-{{p.id}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">	<i class="fas fa-smile-beam fa-fw fa-sm"></i>
 					</button>
 				</li>
 			</ul>
@@ -37,7 +37,7 @@
 				Formatting help
 			</a>
 			<div class="ml-auto flex">
-				<button type="button" class="px-4 py-2 text-sm font-bold text-gray-500 hover:text-gray-400" onclick="togglePostEdit('{{p.id}}')">
+				<button type="button" class="px-4 py-2 text-sm font-bold text-gray-400 hover:text-gray-500" onclick="togglePostEdit('{{p.id}}')">
 					Cancel
 				</button>
 				<button form="post-edit-form-{{p.id}}" class="ml-2 btn btn-green">
diff --git a/files/templates/submit.html b/files/templates/submit.html
index a4d26f4fb..56d2672ee 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -41,7 +41,7 @@
 				<!-- Input field -->
 				<input class="form-input" id="post-title" aria-describedby="titleHelpRegister" type="text" name="title" placeholder="rdrama.net is one of the most malevolent, cruel, coldhearted online communities you'll ever find" value="{{title}}" minlength="1" maxlength="500" required oninput="checkForRequired()">
 				<!-- Add emoji button -->
-				<button type="button" class="mt-1 text-sm text-gray-500 hover:text-gray-600" onclick="loadEmojis('post-title')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">
+				<button type="button" class="mt-1 text-sm text-gray-400 hover:text-gray-500" onclick="loadEmojis('post-title')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji">
 					Add emoji
 				</button>
 			</div>
@@ -97,27 +97,27 @@
 				<textarea form="submitform" id="post-text" class="p-2 shadow-inner w-full" aria-label="With textarea" placeholder="Optional if you have a link or an image." rows="7" name="body" oninput="markdown();charLimit('post-text','character-count-submit-text-form');checkForRequired()" maxlength="10000" required></textarea>
 				<ul class="flex space-x-4 px-3 py-2 border-t border-dashed border-gray-300 mb-0">
 					<li>
-						<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeBold('post-text')">
+						<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeBold('post-text')">
 							<i class="fas fa-bold fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Bold"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeItalics('post-text')">
+						<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeItalics('post-text')">
 							<i class="fas fa-italic fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Italicize"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="text-gray-500 hover:text-gray-600" onclick="makeQuote('post-text')">
+						<button type="button" class="text-gray-400 hover:text-gray-500" onclick="makeQuote('post-text')">
 							<i class="fas fa-quote-right fa-fw fa-sm" data-bs-toggle="tooltip" data-bs-placement="bottom"  title="" data-bs-original-title="Quote"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="text-gray-500 hover:text-gray-600" onclick="commentForm('post-text');getGif()">
+						<button type="button" class="text-gray-400 hover:text-gray-500" onclick="commentForm('post-text');getGif()">
 							<span class="font-bold text-sm text-uppercase" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add GIF">GIF</span>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="text-gray-500 hover:text-gray-600" onclick="loadEmojis('post-text')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji"><i class="fas fa-smile-beam fa-fw fa-sm"></i>
+						<button type="button" class="text-gray-400 hover:text-gray-500" onclick="loadEmojis('post-text')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="Add Emoji"><i class="fas fa-smile-beam fa-fw fa-sm"></i>
 						</button>
 					</li>
 				</ul>