diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 9cd352a263..2698f0079b 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -123,8 +123,8 @@
 				</div>
 				<div class="row">
 					<div class="col-lg-6">
-						<div class="form-group">
-							<div class="form-check form-switch mb-3">
+						<div class="form-group mb-3">
+							<div class="form-check form-switch">
 								<input type="checkbox" class="form-check-input" id="cid-{category.cid}-isSection" data-name="isSection" <!-- IF category.isSection -->checked<!-- ENDIF category.isSection --> />
 								<label class="form-check-label">[[admin/manage/categories:is-section]]</label>
 							</div>
@@ -132,8 +132,8 @@
 					</div>
 					{{{ if postQueueEnabled }}}
 					<div class="col-lg-6">
-						<div class="form-group">
-							<div class="form-check form-switch mb-3">
+						<div class="form-group mb-3">
+							<div class="form-check form-switch">
 								<input type="checkbox" class="form-check-input" data-name="postQueue" {{{ if category.postQueue }}}checked{{{ end }}} />
 								<label class="form-check-label">[[admin/manage/categories:post-queue]]</label>
 							</div>
diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl
index 6ef8c36fbd..dc7e5beb38 100644
--- a/src/views/admin/settings/advanced.tpl
+++ b/src/views/admin/settings/advanced.tpl
@@ -199,7 +199,7 @@
 				<p class="form-text">
 					[[admin/settings/advanced:compression.help]]
 				</p>
-				<div class="form-check form-switch mb-3">
+				<div class="form-check form-switch">
 					<input class="form-check-input" type="checkbox" data-field="useCompression">
 					<label class="form-check-label">[[admin/settings/advanced:compression.enable]]</label>
 				</div>
diff --git a/src/views/admin/settings/api.tpl b/src/views/admin/settings/api.tpl
index 0194d98513..19af4cb568 100644
--- a/src/views/admin/settings/api.tpl
+++ b/src/views/admin/settings/api.tpl
@@ -16,8 +16,8 @@
 			<div class="form-check form-switch mb-3">
 				<input id="requireHttps" class="form-check-input" type="checkbox" name="requireHttps" />
 				<label class="form-check-label">[[admin/settings/api:require-https]]</label>
+				<p class="form-text">[[admin/settings/api:require-https-caveat]]</p>
 			</div>
-			<p class="form-text">[[admin/settings/api:require-https-caveat]]</p>
 		</div>
 	</div>
 
diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl
index 1e40d84425..de99a1a367 100644
--- a/src/views/admin/settings/chat.tpl
+++ b/src/views/admin/settings/chat.tpl
@@ -5,14 +5,14 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/chat:chat-settings]]</div>
 	<div class="col-sm-10 col-12">
 		<div class="mb-3">
-			<div class="form-check form-switch mb-3">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" id="disableChat" data-field="disableChat">
 				<label class="form-check-label">[[admin/settings/chat:disable]]</label>
 			</div>
 		</div>
 
 		<div class="mb-3">
-			<div class="form-check form-switch mb-3">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" id="disableChatMessageEditing" data-field="disableChatMessageEditing">
 				<label class="form-check-label">[[admin/settings/chat:disable-editing]]</label>
 			</div>
diff --git a/src/views/admin/settings/cookies.tpl b/src/views/admin/settings/cookies.tpl
index dbbbc5e73d..8272421010 100644
--- a/src/views/admin/settings/cookies.tpl
+++ b/src/views/admin/settings/cookies.tpl
@@ -5,7 +5,7 @@
 	<div class="col-sm-10 col-12">
 		<form>
 			<div class="mb-3">
-				<div class="form-check form-switch mb-3">
+				<div class="form-check form-switch">
 					<input type="checkbox" class="form-check-input" id="cookieConsentEnabled" data-field="cookieConsentEnabled">
 					<label class="form-check-label">[[admin/settings/cookies:consent.enabled]]</label>
 				</div>
diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl
index 1429c2b6a4..e973963679 100644
--- a/src/views/admin/settings/email.tpl
+++ b/src/views/admin/settings/email.tpl
@@ -110,14 +110,10 @@
 				<input class="form-check-input" type="checkbox" id="email:smtpTransport:enabled" data-field="email:smtpTransport:enabled" name="email:smtpTransport:enabled" />
 				<label for="email:smtpTransport:enabled" class="form-check-label">[[admin/settings/email:smtp-transport.enabled]]</label>
 			</div>
-			<div class="mb-3">
-				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" id="email:smtpTransport:pool" data-field="email:smtpTransport:pool" name="email:smtpTransport:pool" />
-					<label for="email:smtpTransport:pool" class="form-check-label">[[admin/settings/email:smtp-transport.pool]]</label>
-				</div>
-				<p class="form-text">
-					[[admin/settings/email:smtp-transport.pool-help]]
-				</p>
+			<div class="form-check form-switch mb-3">
+				<input class="form-check-input" type="checkbox" id="email:smtpTransport:pool" data-field="email:smtpTransport:pool" name="email:smtpTransport:pool" />
+				<label for="email:smtpTransport:pool" class="form-check-label">[[admin/settings/email:smtp-transport.pool]]</label>
+				<p class="form-text">[[admin/settings/email:smtp-transport.pool-help]]</p>
 			</div>
 			<div class="mb-3">
 				<label class="form-label" for="email:smtpTransport:service">[[admin/settings/email:smtp-transport.service]]</label>
diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl
index 8a52f95e01..d113cf2d9c 100644
--- a/src/views/admin/settings/group.tpl
+++ b/src/views/admin/settings/group.tpl
@@ -7,27 +7,21 @@
 			<div class="form-check form-switch mb-3">
 				<input class="form-check-input" type="checkbox" data-field="allowPrivateGroups">
 				<label class="form-check-label">[[admin/settings/group:private-groups]]</label>
+				<p class="form-text">[[admin/settings/group:private-groups.help]]</p>
+				<p class="form-text">[[admin/settings/group:private-groups.warning]]</p>
 			</div>
 
-			<p class="form-text">
-				[[admin/settings/group:private-groups.help]]
-			</p>
-			<p class="form-text">
-				[[admin/settings/group:private-groups.warning]]
-			</p>
-
 			<div class="form-check form-switch mb-3">
 				<input class="form-check-input" type="checkbox" data-field="allowMultipleBadges">
 				<label class="form-check-label">[[admin/settings/group:allow-multiple-badges]]</label>
+				<p class="form-text">[[admin/settings/group:allow-multiple-badges-help]]</p>
 			</div>
 
-			<p class="form-text">
-				[[admin/settings/group:allow-multiple-badges-help]]
-			</p>
 			<div class="mb-3">
 				<label class="form-label" for="maximumGroupNameLength">[[admin/settings/group:max-name-length]]</label>
 				<input id="maximumGroupNameLength" class="form-control" type="text" placeholder="255" data-field="maximumGroupNameLength" />
 			</div>
+
 			<div class="mb=3">
 				<label class="form-label" for="maximumGroupTitleLength">[[admin/settings/group:max-title-length]]</label>
 				<input id="maximumGroupTitleLength" class="form-control" type="text" placeholder="40" data-field="maximumGroupTitleLength" />