diff --git a/files/helpers/config/modaction_types.py b/files/helpers/config/modaction_types.py
index a3b28a67e..d6d0fbdc1 100644
--- a/files/helpers/config/modaction_types.py
+++ b/files/helpers/config/modaction_types.py
@@ -292,12 +292,12 @@ MODACTION_TYPES = {
 		"color": 'bg-primary'
 	},
 	'set_nsfw': {
-		"str": 'set {self.target_link} as +18',
+		"str": 'set {self.target_link} as 18+',
 		"icon": 'fa-eye-evil',
 		"color": 'bg-danger'
 	},
 	'set_nsfw_comment': {
-		"str": 'set {self.target_link} as +18',
+		"str": 'set {self.target_link} as 18+',
 		"icon": 'fa-eye-evil',
 		"color": 'bg-danger'
 	},
@@ -362,12 +362,12 @@ MODACTION_TYPES = {
 		"color": 'bg-muted'
 	},
 	'unset_nsfw': {
-		"str": 'unset {self.target_link} as +18',
+		"str": 'unset {self.target_link} as 18+',
 		"icon": 'fa-eye-evil',
 		"color": 'bg-success'
 	},
 	'unset_nsfw_comment': {
-		"str": 'unset {self.target_link} as +18',
+		"str": 'unset {self.target_link} as 18+',
 		"icon": 'fa-eye-evil',
 		"color": 'bg-success'
 	},
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 4092841c6..4e1ce0f81 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -637,8 +637,8 @@ def toggle_comment_nsfw(cid, v):
 				)
 			g.db.add(ma)
 
-	if comment.over_18: return {"message": "Comment has been marked as +18!"}
-	else: return {"message": "Comment has been unmarked as +18!"}
+	if comment.over_18: return {"message": "Comment has been marked as 18+!"}
+	else: return {"message": "Comment has been unmarked as 18+!"}
 
 @app.post("/edit_comment/<int:cid>")
 @limiter.limit('1/second', scope=rpath)
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 1ec52524c..c0eb7b765 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -800,9 +800,9 @@ def mark_post_nsfw(pid, v):
 					target_post_id = p.id,
 				)
 			g.db.add(ma)
-		send_repeatable_notification(p.author_id, f"@{v.username} (a site admin) has marked [{p.title}](/post/{p.id}) as +18")
+		send_repeatable_notification(p.author_id, f"@{v.username} (a site admin) has marked [{p.title}](/post/{p.id}) as 18+")
 
-	return {"message": "Post has been marked as +18!"}
+	return {"message": "Post has been marked as 18+!"}
 
 @app.post("/unmark_post_nsfw/<int:pid>")
 @feature_required('NSFW_MARKING')
@@ -839,9 +839,9 @@ def unmark_post_nsfw(pid, v):
 					target_post_id = p.id,
 				)
 			g.db.add(ma)
-		send_repeatable_notification(p.author_id, f"@{v.username} (a site admin) has unmarked [{p.title}](/post/{p.id}) as +18")
+		send_repeatable_notification(p.author_id, f"@{v.username} (a site admin) has unmarked [{p.title}](/post/{p.id}) as 18+")
 
-	return {"message": "Post has been unmarked as +18!"}
+	return {"message": "Post has been unmarked as 18+!"}
 
 @app.post("/save_post/<int:pid>")
 @limiter.limit('1/second', scope=rpath)
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 7af46c6b0..6069c229f 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -30,7 +30,7 @@
 			<div id="comment-{{c.id}}-only" class="{% if c.award_count('glowie', v) %}glow{% endif %} {% if c.award_count('ectoplasm', v) %}ectoplasm{% endif %} comment-{{c.id}}-only">
 				<div class="user-info">
 					<span class="comment-collapse-icon" data-nonce="{{g.nonce}}" data-onclick="collapse_comment('{{c.id}}')"></span>
-					{% if standalone and c.over_18 %}<span class="badge badge-danger">+18</span> {% endif %}
+					{% if standalone and c.over_18 %}<span class="badge badge-danger">18+</span> {% endif %}
 					{% if c.is_banned %}Removed by @{{c.ban_reason}} (Site Admin){% elif c.deleted_utc %}Deleted by author{% endif %}
 				</div>
 			</div>
@@ -64,7 +64,7 @@
 {% if standalone and level==1 %}
 <div id="post-info-{{c.id}}" class="text-break post-info mb-1 mr-2 {% if request.path.startswith('/notifications') %}mt-5{% elif request.path == '/search/messages' %}mt-6{% else %}mt-3{% endif %}">
 	{% if c.parent_post and c.post.over_18 %}
-		<span class="badge badge-danger text-small-extra mr-1">+18</span>
+		<span class="badge badge-danger text-small-extra mr-1">18+</span>
 	{% endif %}
 	<span class="align-top">
 	{% if c.parent_post %}
@@ -135,7 +135,7 @@
 				{% endif %}
 
 				{% if c.active_reports(v) %}<button type="button" class="btn btn-primary mr-1" style="padding:1px 5px; font-size:10px" data-toggleelement="#reports-{{c.id}}" data-toggleattr="d-none">{{c.active_reports(v)}} Report{{macros.plural(c.active_reports(v))}}</button>{% 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-extra mr-1">18+</span>{% endif %}
 				{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] 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.shadowbanner}} for "{{c.author.ban_reason}}"' data-bs-html="true"></i>{% endif %}
 				{% if c.stickied %}
 					<i id='pinned-{{c.id}}'class="fas fa-thumbtack fa-rotate--45 pr-1 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{c.stickied}}" {% if c.stickied_utc %}data-onmouseover="pinned_timestamp('pinned-{{c.id}}')" data-timestamp={{c.stickied_utc}} data-nonce="{{g.nonce}}"{% endif %}></i>
@@ -471,8 +471,8 @@
 								{% endif %}
 
 								{% if FEATURES['NSFW_MARKING'] and (c.parent_post or c.wall_user_id) and (c.author_id==v.id or v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (c.post.sub and v.mods(c.post.sub))) %}
-									<button type="button" id="mark-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.over_18 %}d-md-block{% endif %} text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}','d-md-block')"><i class="fas fa-eye-evil text-danger fa-fw"></i>Mark +18</button>
-									<button type="button" id="unmark-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.over_18 %}d-md-block{% endif %} text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}','d-md-block')"><i class="fas fa-eye-evil text-success fa-fw"></i>Unmark +18</button>
+									<button type="button" id="mark-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.over_18 %}d-md-block{% endif %} text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}','d-md-block')"><i class="fas fa-eye-evil text-danger fa-fw"></i>Mark 18+</button>
+									<button type="button" id="unmark-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.over_18 %}d-md-block{% endif %} text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}','d-md-block')"><i class="fas fa-eye-evil text-success fa-fw"></i>Unmark 18+</button>
 								{% endif %}
 
 								{% if v.admin_level >= PERMS['USER_BAN'] and v.id != c.author_id %}
@@ -625,9 +625,9 @@
 						{% endif %}
 
 						{% if FEATURES['NSFW_MARKING'] and (c.author_id == v.id or (c.post.sub and v.mods(c.post.sub))) %}
-							<button type="button" id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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</button>
+							<button type="button" id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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+</button>
 
-							<button type="button" id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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-success mr-2"></i>Unmark +18</button>
+							<button type="button" id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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-success mr-2"></i>Unmark 18+</button>
 						{% endif %}
 
 						{% if v.admin_level < PERMS['POST_COMMENT_MODERATION'] %}
@@ -691,8 +691,8 @@
 							<button type="button" id="unpin2-{{c.id}}" class="list-group-item {% if not c.stickied %}d-none{% endif %} text-info" data-bs-target="#adminModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unsticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Unpin</button>
 
 							{% if FEATURES['NSFW_MARKING'] %}
-								<button type="button" id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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</button>
-								<button type="button" id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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-success mr-2"></i>Unmark +18</button>
+								<button type="button" id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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+</button>
+								<button type="button" id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(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-success mr-2"></i>Unmark 18+</button>
 							{% endif %}
 						{% endif %}
 
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html
index 0a4cd002e..d912c180f 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -1,5 +1,5 @@
 {% extends "default.html" %}
-{% block pagetitle %}+18{% endblock %}
+{% block pagetitle %}18+{% endblock %}
 {% block pagetype %}error-451{% endblock %}
 {% block content %}
 <div class="row justify-content-center">
@@ -7,11 +7,11 @@
 		<div class="text-center px-3 mt-3">
 			<img alt=":#marseytwerking:" loading="lazy" src="{{SITE_FULL_IMAGES}}/e/marseytwerking.webp">
 			<h5>Are you over 18?</h5>
-			<p class="mb-3">This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?</p>
+			<p class="mb-3">This post is rated 18+ (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?</p>
 			<div class="btn-toolbar justify-content-center mb-4">
 				<form action="/allow_nsfw" method="post" data-nonce="{{g.nonce}}" data-onsubmit="sendFormXHRReload(this)">
 					<input hidden name="redir" value="{{request.full_path}}">
-					<input type="submit" class="btn btn-danger mr-2" value="Yes, I am +18">
+					<input type="submit" class="btn btn-danger mr-2" value="Yes, I am 18+">
 				</form>
 				<div class="mt-3"><a href="/" class="btn btn-secondary">No</a></div>
 				<div class="mt-5"><a href="/settings/advanced#over_18_toggle" class="btn btn-secondary">Never show me this warning again</a></div>
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index 3dd82d99f..54e4a0369 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -75,8 +75,8 @@
 			{% endif %}
 		{% endif %}
 		{% if FEATURES['NSFW_MARKING'] and (v.id==p.author_id or v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (p.sub and v.mods(p.sub))) %}
-			<button type="button" id="mark-{{p.id}}" class="dropdown-item {% if p.over_18 %}d-none{% endif %} list-inline-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/mark_post_nsfw/{{p.id}}','mark-{{p.id}}','unmark-{{p.id}}','d-none')"><i class="fas fa-eye-evil"></i>Mark +18</button>
-			<button type="button" id="unmark-{{p.id}}" class="dropdown-item {% if not p.over_18 %}d-none{% endif %} list-inline-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark-{{p.id}}','unmark-{{p.id}}','d-none')"><i class="fas fa-eye-evil"></i>Unmark +18</button>
+			<button type="button" id="mark-{{p.id}}" class="dropdown-item {% if p.over_18 %}d-none{% endif %} list-inline-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/mark_post_nsfw/{{p.id}}','mark-{{p.id}}','unmark-{{p.id}}','d-none')"><i class="fas fa-eye-evil"></i>Mark 18+</button>
+			<button type="button" id="unmark-{{p.id}}" class="dropdown-item {% if not p.over_18 %}d-none{% endif %} list-inline-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark-{{p.id}}','unmark-{{p.id}}','d-none')"><i class="fas fa-eye-evil"></i>Unmark 18+</button>
 		{% endif %}
 		{% if v.admin_level >= PERMS['PROGSTACK'] %}
 			<button type="button" id="progstack-{{p.id}}" class="dropdown-item {% if p.is_approved == PROGSTACK_ID %}d-none{% endif %} list-inline-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/admin/progstack/post/{{p.id}}','progstack-{{p.id}}','unprogstack-{{p.id}}','d-none')"><i class="fas fa-bullhorn"></i>Apply Progressive Stack</button>
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index 57525e052..14533af01 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -51,8 +51,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="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>
+	<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 d9c7a2770..0b561eb56 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -34,8 +34,8 @@
 						<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="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>
+						<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/post_banned.html b/files/templates/post_banned.html
index e1e2daba1..b8116e2a2 100644
--- a/files/templates/post_banned.html
+++ b/files/templates/post_banned.html
@@ -23,9 +23,9 @@
 	<div class="col-12">
 		<div id="post-{{p.id}}" class="banned {% if p.award_count('glowie', v) %}glow{% endif %} card d-flex flex-row-reverse flex-nowrap justify-content-end border-0 p-0 {% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
 			<div class="card-block my-md-auto">
-				<div class="post-meta text-left d-md-none mb-1">{% if p.over_18 %}<span class="badge badge-danger">+18</span> {% endif %}{% if p.is_banned %}Removed by @{{p.ban_reason}} (Site Admin){% else %}[Deleted by user]{% endif %}</div>
+				<div class="post-meta text-left d-md-none mb-1">{% if p.over_18 %}<span class="badge badge-danger">18+</span> {% endif %}{% if p.is_banned %}Removed by @{{p.ban_reason}} (Site Admin){% else %}[Deleted by user]{% endif %}</div>
 				<h5 class="card-title post-title text-left mb-0 mb-md-1">{{p.plaintitle(v)}}</h5>
-				<div class="post-meta text-left d-mob-none">{% if p.over_18 %}<span class="badge badge-danger">+18</span> {% endif %}{% if p.is_banned %}Removed by @{{p.ban_reason}} (Site Admin){% else %}[Deleted by user]{% endif %}</div>
+				<div class="post-meta text-left d-mob-none">{% if p.over_18 %}<span class="badge badge-danger">18+</span> {% endif %}{% if p.is_banned %}Removed by @{{p.ban_reason}} (Site Admin){% else %}[Deleted by user]{% endif %}</div>
 			</div>
 			<div id="voting" class="d-md-block my-auto mr-3 text-center">
 				<div class="post-{{p.id}}-up arrow-up mx-auto">
diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html
index 7d89ffd52..fdeb0ec27 100644
--- a/files/templates/settings/advanced.html
+++ b/files/templates/settings/advanced.html
@@ -130,7 +130,7 @@
 				<div class="settings-section rounded">
 					{{common.toggle_section('Disable Signatures', 'sigs_disabled', 'sigs_disabled', v.sigs_disabled, 'Hide user signatures.', false)}}
 					{% if FEATURES['NSFW_MARKING'] %}
-						{{common.toggle_section('Disable +18 Warnings', 'over_18', 'over_18', v.over_18, "Disable the warning that appears when viewing +18 posts and stop collapsing +18 comments.", false)}}
+						{{common.toggle_section('Disable 18+ Warnings', 'over_18', 'over_18', v.over_18, "Disable the warning that appears when viewing 18+ posts and stop collapsing 18+ comments.", false)}}
 					{% endif %}
 					{% if SITE_NAME != 'rDrama' %}
 						{{common.toggle_section('Hide Posts Voted On', 'hidevotedon', 'hidevotedon', v.hidevotedon, 'Enable if you would like to automatically hide posts you have voted on from your frontpage.', false)}}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 3d19faa8f..5822ab3c0 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -70,7 +70,7 @@
 												{% if FEATURES['NSFW_MARKING'] %}
 													<div class="custom-control custom-checkbox">
 														<input autocomplete="off" type="checkbox" class="custom-control-input" id="post-nsfw" name="over_18" data-nonce="{{g.nonce}}" data-onchange="savetext()">
-														<label class="custom-control-label" for="post-nsfw">+18</label>
+														<label class="custom-control-label" for="post-nsfw">18+</label>
 													</div>
 												{% endif %}
 												<div class="custom-control custom-checkbox">
diff --git a/files/templates/submit_emojis.html b/files/templates/submit_emojis.html
index c2549440a..ad2eeea66 100644
--- a/files/templates/submit_emojis.html
+++ b/files/templates/submit_emojis.html
@@ -46,7 +46,7 @@
 							{% if FEATURES['NSFW_MARKING'] %}
 								<div class="custom-control custom-checkbox mt-4">
 									<input autocomplete="off" type="checkbox" class="custom-control-input" id="emoji-over-18" name="over_18" data-nonce="{{g.nonce}}" data-onchange="savetext()">
-									<label class="custom-control-label" for="emoji-over-18">+18</label>
+									<label class="custom-control-label" for="emoji-over-18">18+</label>
 								</div>
 							{% endif %}
 
@@ -102,7 +102,7 @@
 								{% if FEATURES['NSFW_MARKING'] %}
 									<div class="custom-control custom-checkbox mt-4">
 										<input autocomplete="off" type="checkbox" class="custom-control-input" id="{{emoji.name}}-over-18" name="over_18" data-nonce="{{g.nonce}}" data-onchange="savetext()" {% if v.admin_level < PERMS['MODERATE_PENDING_SUBMITTED_ASSETS'] %}readonly{% endif %} {% if emoji.over_18 %}checked{% endif %}>
-										<label class="custom-control-label" for="{{emoji.name}}-over-18">+18</label>
+										<label class="custom-control-label" for="{{emoji.name}}-over-18">18+</label>
 									</div>
 								{% endif %}
 							</div>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index b32e598e8..c56b65b91 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -49,7 +49,7 @@
 	{% if p.is_pinned and request.path != '/' %}
 		<i class="fas fa-thumbtack fa-rotate--45 pr-1 ml-1 mt-3 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-extra 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 and not p.ghost %}<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user."></i>{% endif %}
 	{% if p.is_blocked and not p.ghost %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>{% endif %}