diff --git a/files/templates/popover.html b/files/templates/popover.html
index 640b365ca..5183117bf 100644
--- a/files/templates/popover.html
+++ b/files/templates/popover.html
@@ -35,9 +35,8 @@
 			<strong class="pop-coins text-black"></strong>
 			<span class="text-black">coins</span>
 		</span>
-		&nbsp;&nbsp;&nbsp;&nbsp;
 		<a href="/" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} class="pop-viewmore ml-auto text-decoration-none">
-		View
+		<span class="ml-3">View</span>
 		<i class="fas fa-arrow-right fa-sm px-1"></i>
 		</a>
 	</div>
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 0eb6956bf..435597ab6 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -454,8 +454,7 @@
 										<input maxlength=100 {% if v.flairchanged %}disabled{% endif %} autocomplete="off" id="customtitlebody" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if v.customtitleplain %}{{v.customtitleplain}}{% endif %}">
 										<div class="d-flex mt-2">
 											<div role="button"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('customtitlebody')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
-											&nbsp;&nbsp;&nbsp;
-											<small>Limit of 100 characters</small>
+											<small class="ml-3">Limit of 100 characters</small>
 											<input {% if v.flairchanged %}disabled{% endif %} autocomplete="off" class="btn btn-primary ml-auto" id="titleSave" type="submit" onclick="disable(this)" value="Change Flair">
 										</div>
 									</form>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 69205a220..1209d6397 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -622,7 +622,7 @@
 					<div class="post-meta text-left mb-2">
 						{% if p.sub %}
 							{% if not HOLE_STYLE_FLAIR -%}
-								<a href='/h/{{p.sub}}'>/h/{{p.sub}}</a>&nbsp;&nbsp;
+								<a class="mr-2" href='/h/{{p.sub}}'>/h/{{p.sub}}</a>
 							{%- else -%}
 								<a href='/h/{{p.sub}}' class="sub-flair">{{p.sub|capitalize}}</a>
 							{%- endif %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 214ec609c..101f9c650 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -115,7 +115,7 @@
 			<div class="post-meta text-left x-scroll mb-md-2">
 				{% if p.sub %}
 					{% if not HOLE_STYLE_FLAIR -%}
-						<a href='/h/{{p.sub}}'>/h/{{p.sub}}</a>&nbsp;&nbsp;
+						<a class="mr-2" href='/h/{{p.sub}}'>/h/{{p.sub}}</a>
 					{%- else -%}
 						<a href='/h/{{p.sub}}' class="sub-flair">{{p.sub|capitalize}}</a>
 					{%- endif %}
diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html
index 324970a9c..bbf373565 100644
--- a/files/templates/userpage_admintools.html
+++ b/files/templates/userpage_admintools.html
@@ -46,12 +46,10 @@
 							<input maxlength=100 autocomplete="off" id="customtitlebody-{{deviceType}}" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if u.customtitleplain %}{{u.customtitleplain}}{% endif %}">
 							<div class="d-flex mt-2">
 								<div class="format" role="button"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('customtitlebody-{{deviceType}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></i></div>
-								&nbsp;&nbsp;&nbsp;
-								<div class="custom-control custom-checkbox">
+								<div class="custom-control custom-checkbox ml-3">
 									<input autocomplete="off" type="checkbox" class="custom-control-input" id="locked" name="locked" {% if u.flairchanged %}checked{% endif %}>
 									<label class="custom-control-label" for="locked">locked</label>
 								</div>
-								&nbsp;&nbsp;&nbsp;
 								<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" onclick="disable(this)" value="Change Flair">
 							</div>
 						</form>