diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 63a87d8ac..1b2eb9b92 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -32,10 +32,10 @@
 					.nav-item .text-small.font-weight-bold::after {
 						content: ")))"
 					}
-					.nav-item .text-small-extra.text-primary {
+					.nav-item .text-small.text-primary {
 						font-size: 0 !important
 					}
-					.nav-item .text-small-extra.text-primary i {
+					.nav-item .text-small.text-primary i {
 						font-size: 11px !important
 					}
 				</style>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index cd8d2f4ff..6f1deba93 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -124,7 +124,7 @@
 
 {% if standalone and level==1 %}
 <div class="post-info mb-1 mr-2 {% if request.path == '/notifications' %}mt-5{% else %}mt-3{% endif %}">
-	{% if c.post and c.post.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
+	{% if c.post and c.post.over_18 %}<span class="badge badge-danger text-small mr-1">+18</span>{% endif %}
 	<span class="align-top">
 	{% if c.post %}
 		{% if c.author_id==v.id and replies and is_notification_page%}
@@ -187,7 +187,7 @@
 					<i class="fas fa-hammer-crash text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User was banned for this comment{% if c.author.banned_by %} by @{{c.author.banned_by.username}}{% endif %} for {{c.bannedfor}}"></i>
 				{% endif %}
 				{% if c.active_flags(v) %}<a class="btn btn-primary" style="padding:1px 5px; font-size:10px"role="button" onclick="document.getElementById('flaggers-{{c.id}}').classList.toggle('d-none')">{{c.active_flags(v)}} Report{{ help.plural(c.active_flags(v)) }}</a>{% endif %}
-				{% if c.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
+				{% if c.over_18 %}<span class="badge badge-danger text-small mr-1">+18</span>{% endif %}
 				{% if v and v.admin_level > 1 and c.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shadowbanned by @{{c.author.shadowbanned}}"></i>{% endif %}
 				{% if c.stickied %}
 					<i id='pinned-{{c.id}}'class="fas fa-thumbtack fa-rotate--45 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{c.stickied}}" {% if c.stickied_utc %}onmouseover="pinned_timestamp('pinned-{{c.id}}')" data-timestamp={{c.stickied_utc}} {% endif %}></i>
diff --git a/files/templates/default.html b/files/templates/default.html
index b22eec9b7..7c792a7c5 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -28,10 +28,10 @@
 				.nav-item .text-small.font-weight-bold::after {
 					content: ")))"
 				}
-				.nav-item .text-small-extra.text-primary {
+				.nav-item .text-small.text-primary {
 					font-size: 0 !important
 				}
-				.nav-item .text-small-extra.text-primary i {
+				.nav-item .text-small.text-primary i {
 					font-size: 11px !important
 				}
 			</style>
diff --git a/files/templates/header.html b/files/templates/header.html
index 82f8ab0d3..1cf24fb0a 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -170,9 +170,9 @@
 							</div>
 							<div class="text-left pl-2">
 								<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}}"{% endif %}>{{v.username}}</span></div>
-								<div class="text-small-extra"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/i/{{SITE_NAME}}/coins.webp?v=2000" title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span> Coin{{ help.plural(v.coins) }}</div>
+								<div class="text-small"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/i/{{SITE_NAME}}/coins.webp?v=2000" title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span> Coin{{ help.plural(v.coins) }}</div>
 								{% if SITE_NAME not in ('Cringetopia', 'WPD') %}
-									<div class="text-small-extra"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" width="30" src="/i/marseybux.webp?v=2000" title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span> Marseybux</div>
+									<div class="text-small"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" width="30" src="/i/marseybux.webp?v=2000" title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span> Marseybux</div>
 								{% endif %}
 							</div>
 						</div>
diff --git a/files/templates/log.html b/files/templates/log.html
index 1bdbaca66..c03e85907 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -19,10 +19,10 @@
 			.nav-item .text-small.font-weight-bold::after {
 				content: ")))"
 			}
-			.nav-item .text-small-extra.text-primary {
+			.nav-item .text-small.text-primary {
 				font-size: 0 !important
 			}
-			.nav-item .text-small-extra.text-primary i {
+			.nav-item .text-small.text-primary i {
 				font-size: 11px !important
 			}
 		</style>
diff --git a/files/templates/settings.html b/files/templates/settings.html
index aaf417530..76479ee1c 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -48,10 +48,10 @@
 			.nav-item .text-small.font-weight-bold::after {
 				content: ")))"
 			}
-			.nav-item .text-small-extra.text-primary {
+			.nav-item .text-small.text-primary {
 				font-size: 0 !important
 			}
-			.nav-item .text-small-extra.text-primary i {
+			.nav-item .text-small.text-primary i {
 				font-size: 11px !important
 			}
 		</style>
diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html
index 9134a65fe..a2b50c111 100644
--- a/files/templates/settings_filters.html
+++ b/files/templates/settings_filters.html
@@ -26,7 +26,7 @@
 							<label class="custom-control-label" for="poorcel"></label>
 						</div>
 
-						<span class="text-small-extra text-muted">Makes the site much faster for low-end devices.</span>
+						<span class="text-small text-muted">Makes the site much faster for low-end devices.</span>
 
 					</div>
 
@@ -138,7 +138,7 @@
 							<label class="custom-control-label" for="newtab"></label>
 						</div>
 
-						<span class="text-small-extra text-muted">Enable if you would like to automatically open links to other pages in the site in new tabs.</span>
+						<span class="text-small text-muted">Enable if you would like to automatically open links to other pages in the site in new tabs.</span>
 
 					</div>
 
@@ -158,7 +158,7 @@
 							<label class="custom-control-label" for="newtabexternal"></label>
 						</div>
 
-						<span class="text-small-extra text-muted">Enable if you would like to automatically open links to other sites in new tabs.</span>
+						<span class="text-small text-muted">Enable if you would like to automatically open links to other sites in new tabs.</span>
 
 					</div>
 
@@ -179,7 +179,7 @@
 							<input autocomplete="off" type="checkbox" class="custom-control-input" id="can_gamble" name="can_gamble"{% if v.can_gamble %} checked{% endif %} onchange="post_toast(this,'/settings/profile?can_gamble='+document.getElementById('can_gamble').checked);">
 							<label class="custom-control-label" for="can_gamble"></label>
 						</div>
-						<span class="text-small-extra text-muted">Disable to prevent use of blackjack, slots, treasure chests, the lottery, and betting polls.</span>
+						<span class="text-small text-muted">Disable to prevent use of blackjack, slots, treasure chests, the lottery, and betting polls.</span>
 					</div>
 				</div>
 			</div>
@@ -202,7 +202,7 @@
 							<label class="custom-control-label" for="nitter"></label>
 						</div>
 
-						<span class="text-small-extra text-muted">Enable if you would like to automatically convert twitter.com links to nitter.net links.</span>
+						<span class="text-small text-muted">Enable if you would like to automatically convert twitter.com links to nitter.net links.</span>
 
 					</div>
 
@@ -247,7 +247,7 @@
 							<label class="custom-control-label" for="controversial"></label>
 						</div>
 
-						<span class="text-small-extra text-muted">Enable if you would like to automatically sort reddit.com links by controversial.</span>
+						<span class="text-small text-muted">Enable if you would like to automatically sort reddit.com links by controversial.</span>
 
 					</div>
 
@@ -272,7 +272,7 @@
 								<label class="custom-control-label" for="sigs_disabled"></label>
 							</div>
 
-							<span class="text-small-extra text-muted">Hide user signatures.</span>
+							<span class="text-small text-muted">Hide user signatures.</span>
 
 						</div>
 
@@ -293,7 +293,7 @@
 								<label class="custom-control-label" for="over18"></label>
 							</div>
 
-							<span class="text-small-extra text-muted">Enable if you would like to not get a warning before viewing +18 content.</span>
+							<span class="text-small text-muted">Enable if you would like to not get a warning before viewing +18 content.</span>
 
 						</div>
 
@@ -314,7 +314,7 @@
 								<label class="custom-control-label" for="slurreplacer"></label>
 							</div>
 
-							<span class="text-small-extra text-muted">Enable if you would like to automatically replace slurs.</span>
+							<span class="text-small text-muted">Enable if you would like to automatically replace slurs.</span>
 
 						</div>
 
@@ -334,7 +334,7 @@
 								<label class="custom-control-label" for="hidevotedon"></label>
 							</div>
 
-							<span class="text-small-extra text-muted">Enable if you would like to automatically hide posts you have voted on from your frontpage.</span>
+							<span class="text-small text-muted">Enable if you would like to automatically hide posts you have voted on from your frontpage.</span>
 
 						</div>
 
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 887a333bc..ba4f92e0c 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -92,7 +92,7 @@
 								<label class="custom-control-label" for="cardview"></label>
 							</div>
 
-							<span class="text-small-extra text-muted">Enable if you would like to display images and videos in full size on the frontpage.</span>
+							<span class="text-small text-muted">Enable if you would like to display images and videos in full size on the frontpage.</span>
 
 						</div>
 
@@ -112,7 +112,7 @@
 								<label class="custom-control-label" for="highlightcomments"></label>
 							</div>
 
-							<span class="text-small-extra text-muted">Enable if you would like to highlight comments made after the last time you visited a thread.</span>
+							<span class="text-small text-muted">Enable if you would like to highlight comments made after the last time you visited a thread.</span>
 
 						</div>
 
@@ -235,7 +235,7 @@
 
 						</div>
 
-						<div class="text-small-extra text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
+						<div class="text-small text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
 
 					</div>
 
@@ -268,7 +268,7 @@
 
 						</div>
 
-						<div class="text-small-extra text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
+						<div class="text-small text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
 
 					</div>
 
@@ -301,7 +301,7 @@
 
 							</div>
 
-							<div class="text-small-extra 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>
+							<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>
 
 							</div>
 
@@ -331,10 +331,10 @@
 									<input type="submit" onclick="disable(this)" class="btn btn-secondary text-capitalize mr-2 mb-0 mt-2" value="Disconnect Discord">
 									</form>
 
-									<div class="text-small-extra text-muted mt-3">Disconnecting your Discord account will remove you from the {{SITE_NAME}} Discord server.</div>
+									<div class="text-small text-muted mt-3">Disconnecting your Discord account will remove you from the {{SITE_NAME}} Discord server.</div>
 								{% else %}
 									<a href="/discord" class="btn btn-primary">Link Discord</a>
-									<div class="text-small-extra text-muted mt-3">Link your Discord account to join the {{SITE_NAME}} Discord server.</div>
+									<div class="text-small text-muted mt-3">Link your Discord account to join the {{SITE_NAME}} Discord server.</div>
 								{% endif %}
 
 							</div>
@@ -357,7 +357,7 @@
 
 								<input autocomplete="off" type="text" readonly="" class="form-control copy-link" id="rss_feed" value="{{SITE_FULL}}/rss/hot/all" data-clipboard-text="{{SITE_FULL}}/rss/hot/all">
 
-								<div class="text-small-extra text-muted mt-3">You can change the feed by replacing "hot" with whatever sorting you want and "all" with whatever time filter you want.</div>
+								<div class="text-small text-muted mt-3">You can change the feed by replacing "hot" with whatever sorting you want and "all" with whatever time filter you want.</div>
 
 							</div>
 
@@ -701,7 +701,7 @@
 									<label class="custom-control-label" for="privateswitch"></label>
 								</div>
 
-								<span class="text-small-extra text-muted">This will hide your post and comment history from others. We will also ask search engines to not index your profile page. (Your content will still be accessible via direct link.)</span>
+								<span class="text-small text-muted">This will hide your post and comment history from others. We will also ask search engines to not index your profile page. (Your content will still be accessible via direct link.)</span>
 
 							</div>
 
@@ -719,7 +719,7 @@
 									<label class="custom-control-label" for="nofollowswitch"></label>
 								</div>
 
-								<span class="text-small-extra text-muted">Prevent other users from following you.</span>
+								<span class="text-small text-muted">Prevent other users from following you.</span>
 
 							</div>
 
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index be9b3f0cc..73eaf727d 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -27,9 +27,9 @@
 							<input autocomplete="off" class="form-control" id="new_email" {% if v.email %}placeholder="{{v.email}}"{% else %}placeholder="Your email"{% endif %}
 							aria-describedby="new_email" type="email" pattern='([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+' name="new_email" required>
 							{% if v.email and not v.is_activated %}
-								<div class="text-danger text-small-extra mt-1" id="email-verify-text">Email not verified. You will not be able to recover your account with this email until you verify it. <u><a role="button" onclick="post_toast(this,'/verify_email');emailVerifyText()"class="text-danger">Verify now.</a></u></div>
+								<div class="text-danger text-small mt-1" id="email-verify-text">Email not verified. You will not be able to recover your account with this email until you verify it. <u><a role="button" onclick="post_toast(this,'/verify_email');emailVerifyText()"class="text-danger">Verify now.</a></u></div>
 							{% elif not v.email %}
-								<div class="text-danger text-small-extra mt-1" id="email-verify-text">Add an email to secure your account in case you forget your password.</div>
+								<div class="text-danger text-small mt-1" id="email-verify-text">Add an email to secure your account in case you forget your password.</div>
 							{% endif %}
 						</div>
 					</div>
@@ -54,7 +54,7 @@
 					{% endif %}
 				</div>
 				{% if SITE_NAME not in ('Cringetopia', 'WPD') %}
-					<span class="text-small-extra text-muted pl-1">Must be same email as gumroad</span>
+					<span class="text-small text-muted pl-1">Must be same email as gumroad</span>
 				{% endif %}
 			</div>
 		</form>
@@ -159,7 +159,7 @@
 		<label class="custom-control-label" for="2faToggle"></label>
 		</div>
 
-		<span class="text-small-extra text-muted">This requires entering a randomly-generated, 6-digit code and your password to login. See <a role="button">Google Authenticator</a> or <a role="button">Authy</a> for more details.</span>
+		<span class="text-small text-muted">This requires entering a randomly-generated, 6-digit code and your password to login. See <a role="button">Google Authenticator</a> or <a role="button">Authy</a> for more details.</span>
 
 	</div>
 
diff --git a/files/templates/sub/settings.html b/files/templates/sub/settings.html
index 8850b9de3..296bfc2d1 100644
--- a/files/templates/sub/settings.html
+++ b/files/templates/sub/settings.html
@@ -54,7 +54,7 @@
 
 			</div>
 
-			<div class="text-small-extra text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
+			<div class="text-small text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
 
 		</div>
 
@@ -90,7 +90,7 @@
 
 			</div>
 
-			<div class="text-small-extra text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
+			<div class="text-small text-muted mt-3">JPG, PNG, GIF files are supported. Max file size is {% if v and v.patron %}8{% else %}4{% endif %} MB.</div>
 
 		</div>
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 10b36b462..b9c5b3efe 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -733,8 +733,8 @@
 						{% if p.is_pinned %}<i class="fas fa-thumbtack fa-rotate--45 fa-fw text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned to profile"></i>{% endif %}
 						{% if p.distinguish_level %} <i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>{% endif %}
 						{% if p.is_bot %} <i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom"	title="Bot"></i>{% endif %}
-						{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
-						{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
+						{% if p.over_18 %}<span class="badge badge-danger text-small mr-1">+18</span>{% endif %}
+						{% if p.private %}<span class="badge border-warning border-1 text-small">Draft</span>{% endif %}
 						{% if p.active_flags(v) %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers').classList.toggle('d-none')">{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}</a>{% endif %}
 
 						{% if p.ghost %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 1756573c5..6fe0e0979 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -179,11 +179,11 @@
 
 				{% if p.distinguish_level %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>{% endif %}
 				{% if p.is_pinned and request.path.startswith('/@') %}<i class="fas fa-thumbtack fa-rotate--45 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned to profile"></i>{% endif %}
-				{% if p.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
+				{% if p.over_18 %}<span class="badge badge-danger text-small mr-1">+18</span>{% endif %}
 				{% if p.is_bot %} <i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom"	title="Bot"></i>{% endif %}
 				{% if p.is_blocking %}<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user, but you can see this post because you're an admin."></i>{% endif %}
 				{% if p.is_blocked %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>{% endif %}
-				{% if p.private %}<span class="badge border-warning border-1 text-small-extra">Draft</span>{% endif %}
+				{% if p.private %}<span class="badge border-warning border-1 text-small">Draft</span>{% endif %}
 				{% if p.active_flags(v) %}<a class="btn btn-primary" role="button" style="padding:1px 5px; font-size:10px"onclick="document.getElementById('flaggers-{{p.id}}').classList.toggle('d-none')">{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}</a>{% endif %}
 				
 				{% if p.ghost %}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index b79a3dca9..40757adaf 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -41,10 +41,10 @@
 					.nav-item .text-small.font-weight-bold::after {
 						content: ")))"
 					}
-					.nav-item .text-small-extra.text-primary {
+					.nav-item .text-small.text-primary {
 						font-size: 0 !important
 					}
-					.nav-item .text-small-extra.text-primary i {
+					.nav-item .text-small.text-primary i {
 						font-size: 11px !important
 					}
 				</style>