diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl
index a0f4eaca95..927eda909f 100644
--- a/src/views/admin/advanced/cache.tpl
+++ b/src/views/admin/advanced/cache.tpl
@@ -7,7 +7,7 @@
 				<div class="card">
 					<div class="card-header">[[admin/advanced/cache:{@key}-cache]]</div>
 					<div class="card-body">
-						<div class="form-check" data-name="{@key}">
+						<div class="form-check form-switch" data-name="{@key}">
 							<input class="form-check-input" type="checkbox" {{{if caches.enabled}}}checked{{{end}}}>
 						</div>
 
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 21a85c83d3..815d7088a5 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -124,7 +124,7 @@
 				<div class="row">
 					<div class="col-lg-6">
 						<div class="form-group">
-							<div class="form-check">
+							<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>
@@ -133,7 +133,7 @@
 					{{{ if postQueueEnabled }}}
 					<div class="col-lg-6">
 						<div class="form-group">
-							<div class="form-check">
+							<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/partials/create_group_modal.tpl b/src/views/admin/partials/create_group_modal.tpl
index 13e54f1332..9fa47d2b1d 100644
--- a/src/views/admin/partials/create_group_modal.tpl
+++ b/src/views/admin/partials/create_group_modal.tpl
@@ -16,11 +16,11 @@
 						<label class="form-label" for="create-group-desc">[[admin/manage/groups:description]]</label>
 						<input type="text" class="form-control" id="create-group-desc" placeholder="[[admin/manage/groups:description-placeholder]]" />
 					</div>
-					<div class="form-check">
+					<div class="form-check form-switch">
 						<input class="form-check-input" id="create-group-private" name="private" type="checkbox" checked>
 						<label class="form-check-label" for="create-group-private">[[admin/manage/groups:private]]</label>
 					</div>
-					<div class="form-check">
+					<div class="form-check form-switch">
 						<input class="form-check-input" id="create-group-hidden" name="hidden" type="checkbox">
 						<label class="form-check-label" for="create-group-hidden">[[admin/manage/groups:hidden]]</label>
 					</div>
diff --git a/src/views/admin/partials/save_button.tpl b/src/views/admin/partials/save_button.tpl
index 9edbe764f0..664b461386 100644
--- a/src/views/admin/partials/save_button.tpl
+++ b/src/views/admin/partials/save_button.tpl
@@ -1,4 +1,3 @@
-<button id="save" class="btn btn-primary position-fixed bottom-0 end-0 px-3 py-2 mb-4 me-4 rounded-3" type="button">
+<button id="save" class="btn btn-primary position-fixed bottom-0 end-0 px-3 py-2 mb-4 me-4 rounded-circle" type="button">
 	<i class="fa fa-fw fa-save"></i>
-	<strong class="mx-1">[[global:save]]</strong>
 </button>
\ No newline at end of file
diff --git a/src/views/admin/partials/widget-settings.tpl b/src/views/admin/partials/widget-settings.tpl
index b56a5a5062..f94bbd44a0 100644
--- a/src/views/admin/partials/widget-settings.tpl
+++ b/src/views/admin/partials/widget-settings.tpl
@@ -10,7 +10,7 @@
 
 <!-- IMPORT admin/partials/widgets/show_hide_groups.tpl -->
 
-<div class="form-check">
+<div class="form-check form-switch">
 	<input class="form-check-input" type="checkbox" name="hide-mobile" id="hide-mobile-check"/>
 	<label class="form-check-label" for="hide-mobile-check">[[admin/extend/widgets:hide-on-mobile]]</label>
 </div>
diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl
index 816b0d603c..5e550beb6b 100644
--- a/src/views/admin/settings/advanced.tpl
+++ b/src/views/admin/settings/advanced.tpl
@@ -4,7 +4,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/advanced:maintenance-mode]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="maintenanceMode">
 				<label class="form-check-label">[[admin/settings/advanced:maintenance-mode]]</label>
 			</div>
@@ -64,7 +64,7 @@
 				<label class="form-label" for="access-control-allow-headers">[[admin/settings/advanced:headers.acah]]</label>
 				<input class="form-control" id="access-control-allow-headers" type="text" placeholder="" data-field="access-control-allow-headers" />
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="cross-origin-embedder-policy" id="cross-origin-embedder-policy">
 				<label class="form-check-label">[[admin/settings/advanced:headers.coep]]</label>
 			</div>
@@ -94,7 +94,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/advanced:hsts]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="hsts-enabled" checked>
 				<label class="form-check-label">[[admin/settings/advanced:hsts.enabled]]</label>
 			</div>
@@ -102,11 +102,11 @@
 				<label class="form-label" for="hsts-maxage">[[admin/settings/advanced:hsts.maxAge]]</label>
 				<input class="form-control" id="hsts-maxage" type="number" placeholder="31536000" data-field="hsts-maxage" />
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="hsts-subdomains" checked>
 				<label class="form-check-label">[[admin/settings/advanced:hsts.subdomains]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="hsts-preload">
 				<label class="form-check-label">[[admin/settings/advanced:hsts.preload]]</label>
 			</div>
@@ -124,7 +124,7 @@
 			[[admin/settings/advanced:traffic.help]]
 		</p>
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" id="eventLoopCheckEnabled" type="checkbox" data-field="eventLoopCheckEnabled" checked />
 				<label class="form-check-label" for="eventLoopCheckEnabled">[[admin/settings/advanced:traffic.enable]]</label>
 			</div>
@@ -185,7 +185,7 @@
 				<p class="form-text">
 					[[admin/settings/advanced:compression.help]]
 				</p>
-				<div class="form-check">
+				<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 0d9d605702..cef184d8ce 100644
--- a/src/views/admin/settings/api.tpl
+++ b/src/views/admin/settings/api.tpl
@@ -13,7 +13,7 @@
 	<div class="row mb-4">
 		<div class="col-sm-2 col-12 settings-header">[[admin/settings/api:settings]]</div>
 		<div class="col-sm-10 col-12">
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input id="requireHttps" class="form-check-input" type="checkbox" name="requireHttps" />
 				<label class="form-check-label">[[admin/settings/api:require-https]]</label>
 			</div>
diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl
index 20b8e13a8e..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">
+			<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">
+			<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 8d82ada59b..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">
+				<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 4c192e9a19..8ea2fe9cd8 100644
--- a/src/views/admin/settings/email.tpl
+++ b/src/views/admin/settings/email.tpl
@@ -20,18 +20,18 @@
 				<input type="text" class="form-control input-lg" id="email:from_name" data-field="email:from_name" placeholder="NodeBB" />
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="requireEmailAddress" data-field="requireEmailAddress" name="requireEmailAddress" />
 				<label for="requireEmailAddress" class="form-check-label">[[admin/settings/email:require-email-address]]</label>
 			</div>
 			<p class="form-text">[[admin/settings/email:require-email-address-warning]]</p>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="sendEmailToBanned" data-field="sendEmailToBanned" name="sendEmailToBanned" />
 				<label for="sendEmailToBanned" class="form-check-label">[[admin/settings/email:sendEmailToBanned]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="removeEmailNotificationImages" data-field="removeEmailNotificationImages" name="removeEmailNotificationImages" />
 				<label for="removeEmailNotificationImages" class="form-check-label">[[admin/settings/email:notifications.remove-images]]</label>
 			</div>
@@ -60,18 +60,18 @@
 			<input class="form-control" data-field="emailConfirmExpiry" type="number" id="emailConfirmExpiry" placeholder="24" />
 		</div>
 
-		<div class="form-check">
+		<div class="form-check form-switch">
 			<input class="form-check-input" type="checkbox" id="sendValidationEmail" data-field="sendValidationEmail" name="sendValidationEmail" />
 			<label for="sendValidationEmail" class="form-check-label">[[admin/settings/email:send-validation-email]]</label>
 		</div>
 
-		<div class="form-check">
+		<div class="form-check form-switch">
 			<input class="form-check-input" type="checkbox" id="includeUnverifiedEmails" data-field="includeUnverifiedEmails" name="includeUnverifiedEmails" />
 			<label for="includeUnverifiedEmails" class="form-check-label">[[admin/settings/email:include-unverified-emails]]</label>
 		</div>
 		<p class="form-text">[[admin/settings/email:include-unverified-warning]]</p>
 
-		<div class="form-check">
+		<div class="form-check form-switch">
 			<input class="form-check-input" type="checkbox" id="emailPrompt" data-field="emailPrompt" name="emailPrompt" />
 			<label for="emailPrompt" class="form-check-label">[[admin/settings/email:prompt]]</label>
 		</div>
@@ -83,7 +83,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/email:subscriptions]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="disableEmailSubscriptions" data-field="disableEmailSubscriptions" name="disableEmailSubscriptions" />
 				<label for="disableEmailSubscriptions" class="form-check-label">[[admin/settings/email:subscriptions.disable]]</label>
 			</div>
@@ -106,12 +106,12 @@
 			[[admin/settings/email:smtp-transport-help]]
 		</div>
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<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">
+				<div class="form-check form-switch">
 					<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>
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index 5642a6ec30..0a8e8f5d38 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -22,7 +22,7 @@
 				</p>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" id="showSiteTitle" data-field="showSiteTitle" name="showSiteTitle" />
 				<label for="showSiteTitle" class="form-check-label">[[admin/settings/general:title.show-in-header]]</label>
 			</div>
@@ -183,7 +183,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/general:outgoing-links]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" id="useOutgoingLinksPage" data-field="useOutgoingLinksPage">
 				<label for="useOutgoingLinksPage" class="form-check-label">[[admin/settings/general:outgoing-links.warning-page]]</label>
 			</div>
diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl
index 1d77c894fe..07d746777f 100644
--- a/src/views/admin/settings/group.tpl
+++ b/src/views/admin/settings/group.tpl
@@ -4,7 +4,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/group:general]]</div>
 	<div class="col-sm-10 col-12">
 		<form role="form">
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="allowPrivateGroups">
 				<label class="form-check-label">[[admin/settings/group:private-groups]]</label>
 			</div>
@@ -16,7 +16,7 @@
 				[[admin/settings/group:private-groups.warning]]
 			</p>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="allowMultipleBadges">
 				<label class="form-check-label">[[admin/settings/group:allow-multiple-badges]]</label>
 			</div>
diff --git a/src/views/admin/settings/guest.tpl b/src/views/admin/settings/guest.tpl
index a85b1a7212..31c65e98eb 100644
--- a/src/views/admin/settings/guest.tpl
+++ b/src/views/admin/settings/guest.tpl
@@ -4,7 +4,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/guest:settings]]</div>
 	<div class="col-sm-10 col-12">
 		<form role="form" class="mb-3">
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="allowGuestHandles">
 				<label class="form-check-label">[[admin/settings/guest:handles.enabled]]</label>
 			</div>
@@ -13,13 +13,13 @@
 			</p>
 		</form>
 		<form role="form" class="mb-3">
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="guestsIncrementTopicViews">
 				<label class="form-check-label">[[admin/settings/guest:topic-views.enabled]]</label>
 			</div>
 		</form>
 		<form role="form" class="mb-3">
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="allowGuestReplyNotifications">
 				<label class="form-check-label">[[admin/settings/guest:reply-notifications.enabled]]</label>
 			</div>
diff --git a/src/views/admin/settings/homepage.tpl b/src/views/admin/settings/homepage.tpl
index ef07a87828..2b2fce7556 100644
--- a/src/views/admin/settings/homepage.tpl
+++ b/src/views/admin/settings/homepage.tpl
@@ -21,7 +21,7 @@
 					<p class="form-text">[[user:custom_route_help]]</p>
 				</div>
 
-				<div class="form-check">
+				<div class="form-check form-switch">
 					<input class="form-check-input" type="checkbox" data-field="allowUserHomePage">
 					<label class="form-check-label">[[admin/settings/homepage:allow-user-home-pages]]</label>
 				</div>
diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tpl
index ebede6b3f5..371a9c70df 100644
--- a/src/views/admin/settings/navigation.tpl
+++ b/src/views/admin/settings/navigation.tpl
@@ -83,12 +83,12 @@
 						</div>
 					</div>
 
-					<div class="form-check">
+					<div class="form-check form-switch">
 						<input class="form-check-input" type="checkbox" name="targetBlank" <!-- IF enabled.targetBlank -->checked<!-- ENDIF enabled.targetBlank -->/>
 						<label class="form-check-label">[[admin/settings/navigation:open-new-window]]</label>
 					</div>
 
-					<div class="form-check">
+					<div class="form-check form-switch">
 						<input class="form-check-input" type="checkbox" name="dropdown" {{{ if enabled.dropdown }}}checked{{{ end }}}/>
 						<label class="form-check-label">[[admin/settings/navigation:dropdown]]</label>
 					</div>
diff --git a/src/views/admin/settings/pagination.tpl b/src/views/admin/settings/pagination.tpl
index f804e3b649..4670e8b26e 100644
--- a/src/views/admin/settings/pagination.tpl
+++ b/src/views/admin/settings/pagination.tpl
@@ -4,7 +4,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/pagination:pagination]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="usePagination">
 				<label class="form-check-label">[[admin/settings/pagination:enable]]</label>
 			</div>
diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl
index ab6cedd13f..a3a796ed4d 100644
--- a/src/views/admin/settings/post.tpl
+++ b/src/views/admin/settings/post.tpl
@@ -120,7 +120,7 @@
 			<div class="row">
 				<div class="col-sm-6">
 					<div class="mb-3">
-						<div class="form-check">
+						<div class="form-check form-switch">
 							<input class="form-check-input" type="checkbox" data-field="postQueue">
 							<label class="form-check-label">[[admin/settings/post:restrictions.post-queue]]</label>
 						</div>
@@ -191,7 +191,7 @@
 					<option value="first">[[admin/settings/post:teaser.first]]</option>
 				</select>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="showPostPreviewsOnHover">
 				<label class="form-check-label">[[admin/settings/post:showPostPreviewsOnHover]]</label>
 			</div>
@@ -223,7 +223,7 @@
 				<label class="form-label" for="recentMaxTopics">[[admin/settings/post:recent.max-topics]]</label>
 				<input id="recentMaxTopics" type="text" class="form-control" value="200" data-field="recentMaxTopics">
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="disableRecentCategoryFilter">
 				<label class="form-check-label">[[admin/settings/post:recent.categoryFilter.disable]]</label>
 			</div>
@@ -235,19 +235,19 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/post:signature]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="disableSignatures">
 				<label class="form-check-label">[[admin/settings/post:signature.disable]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="signatures:disableLinks">
 				<label class="form-check-label">[[admin/settings/post:signature.no-links]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="signatures:disableImages">
 				<label class="form-check-label">[[admin/settings/post:signature.no-images]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="signatures:hideDuplicates">
 				<label class="form-check-label">[[admin/settings/post:signature.hide-duplicates]]</label>
 			</div>
@@ -266,11 +266,11 @@
 			<p>
 				[[admin/settings/post:composer-help]]
 			</p>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="composer:showHelpTab" data-field="composer:showHelpTab" checked />
 				<label class="form-check-label" for="composer:showHelpTab">[[admin/settings/post:composer.show-help]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="composer:allowPluginHelp" data-field="composer:allowPluginHelp" checked />
 				<label class="form-check-label" for="composer:allowPluginHelp">[[admin/settings/post:composer.enable-plugin-help]]</label>
 			</div>
@@ -278,7 +278,7 @@
 				<label class="form-label" for="composer:customHelpText">[[admin/settings/post:composer.custom-help]]</label>
 				<textarea class="form-control" id="composer:customHelpText" data-field="composer:customHelpText" rows="5"></textarea>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="enablePostHistory" data-field="enablePostHistory" checked />
 				<label class="form-check-label" for="enablePostHistory">[[admin/settings/post:enable-post-history]]</label>
 			</div>
@@ -290,7 +290,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/post:backlinks]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="topicBacklinks">
 				<label class="form-check-label">[[admin/settings/post:backlinks.enabled]]</label>
 				<p class="form-text">[[admin/settings/post:backlinks.help]]</p>
@@ -303,7 +303,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/post:ip-tracking]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="trackIpPerPost">
 				<label class="form-check-label">[[admin/settings/post:ip-tracking.each-post]]</label>
 			</div>
diff --git a/src/views/admin/settings/reputation.tpl b/src/views/admin/settings/reputation.tpl
index 2741846a76..1e4fbbd9b5 100644
--- a/src/views/admin/settings/reputation.tpl
+++ b/src/views/admin/settings/reputation.tpl
@@ -5,15 +5,15 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/reputation:reputation]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" data-field="reputation:disabled">
 				<label class="form-check-label">[[admin/settings/reputation:disable]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" data-field="downvote:disabled">
 				<label class="form-check-label">[[admin/settings/reputation:disable-down-voting]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" data-field="votesArePublic">
 				<label class="form-check-label">[[admin/settings/reputation:votes-are-public]]</label>
 			</div>
@@ -117,7 +117,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input type="checkbox" class="form-check-input" data-field="flags:autoResolveOnBan">
 				<label class="form-check-label">[[admin/settings/reputation:flags.auto-resolve-on-ban]]</label>
 			</div>
diff --git a/src/views/admin/settings/social.tpl b/src/views/admin/settings/social.tpl
index 79771432e1..63fd1e5dfa 100644
--- a/src/views/admin/settings/social.tpl
+++ b/src/views/admin/settings/social.tpl
@@ -5,7 +5,7 @@
 			<div class="col-sm-10 col-12">
 				<div class="form-group" id="postSharingNetworks">
 					<!-- BEGIN posts -->
-					<div class="form-check">
+					<div class="form-check form-switch">
 						<input type="checkbox" class="form-check-input" id="{posts.id}" data-field="{posts.id}" name="{posts.id}" <!-- IF posts.activated -->checked<!-- ENDIF posts.activated --> />
 						<label for="{posts.id}" class="form-check-label">
 							<i class="fa {posts.class}"></i> {posts.name}
diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl
index bb09aff9cf..aae661439a 100644
--- a/src/views/admin/settings/uploads.tpl
+++ b/src/views/admin/settings/uploads.tpl
@@ -6,12 +6,12 @@
 	</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="stripEXIFData">
 				<label class="form-check-label">[[admin/settings/uploads:strip-exif-data]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="privateUploads">
 				<label class="form-check-label">[[admin/settings/uploads:private]]</label>
 			</div>
@@ -78,7 +78,7 @@
 				</p>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="allowTopicsThumbnail">
 				<label class="form-check-label">[[admin/settings/uploads:allow-topic-thumbnails]]</label>
 			</div>
@@ -121,7 +121,7 @@
 		[[admin/settings/uploads:orphans]]
 	</div>
 	<div class="col-sm-10 col-12">
-		<div class="form-check">
+		<div class="form-check form-switch">
 			<input class="form-check-input" type="checkbox" data-field="preserveOrphanedUploads">
 			<label class="form-check-label">[[admin/settings/uploads:preserve-orphaned-uploads]]</label>
 		</div>
@@ -142,12 +142,12 @@
 	</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="allowProfileImageUploads">
 				<label class="form-check-label">[[admin/settings/uploads:allow-profile-image-uploads]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="profile:convertProfileImageToPNG">
 				<label class="form-check-label">[[admin/settings/uploads:convert-profile-image-png]]</label>
 			</div>
@@ -184,7 +184,7 @@
 				</p>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="profile:keepAllUserImages">
 				<label class="form-check-label">[[admin/settings/uploads:keep-all-user-images]]</label>
 			</div>
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index 406c3d9281..cc8493c88b 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -19,36 +19,36 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/user:account-settings]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="gdpr_enabled">
 				<label class="form-check-label">[[admin/settings/user:gdpr_enabled]]</label>
 				<p class="form-text">[[admin/settings/user:gdpr_enabled_help]]</p>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="username:disableEdit">
 				<label class="form-check-label">[[admin/settings/user:disable-username-changes]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="email:disableEdit">
 				<label class="form-check-label">[[admin/settings/user:disable-email-changes]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="password:disableEdit">
 				<label class="form-check-label">[[admin/settings/user:disable-password-changes]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="allowAccountDelete" checked>
 				<label class="form-check-label">[[admin/settings/user:allow-account-deletion]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="hideFullname">
 				<label class="form-check-label">[[admin/settings/user:hide-fullname]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="hideEmail">
 				<label class="form-check-label">[[admin/settings/user:hide-email]]</label>
 			</div>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="showFullnameAsDisplayName">
 				<label class="form-check-label">[[admin/settings/user:show-fullname-as-displayname]]</label>
 			</div>
@@ -60,7 +60,7 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/user:themes]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="disableCustomUserSkins">
 				<label class="form-check-label">[[admin/settings/user:disable-user-skins]]</label>
 			</div>
@@ -165,12 +165,12 @@
 				</p>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="showAverageApprovalTime">
 				<label class="form-check-label">[[admin/settings/user:registration-queue-show-average-time]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" id="requireEmailAddress" data-field="requireEmailAddress" name="requireEmailAddress" />
 				<label for="requireEmailAddress" class="form-check-label">[[admin/settings/email:require-email-address]]</label>
 			</div>
@@ -240,32 +240,32 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/user:default-user-settings]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="showemail">
 				<label class="form-check-label">[[admin/settings/user:show-email]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="showfullname">
 				<label class="form-check-label">[[admin/settings/user:show-fullname]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="restrictChat">
 				<label class="form-check-label">[[admin/settings/user:restrict-chat]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="openOutgoingLinksInNewTab">
 				<label class="form-check-label">[[admin/settings/user:outgoing-new-tab]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="topicSearchEnabled">
 				<label class="form-check-label">[[admin/settings/user:topic-search]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="updateUrlWithPostIndex">
 				<label class="form-check-label">[[admin/settings/user:update-url-with-post-index]]</label>
 			</div>
@@ -281,12 +281,12 @@
 				</select>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="followTopicsOnCreate">
 				<label class="form-check-label">[[admin/settings/user:follow-created-topics]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="followTopicsOnReply">
 				<label class="form-check-label">[[admin/settings/user:follow-replied-topics]]</label>
 			</div>
diff --git a/src/views/admin/settings/web-crawler.tpl b/src/views/admin/settings/web-crawler.tpl
index acd006c2da..23521967f1 100644
--- a/src/views/admin/settings/web-crawler.tpl
+++ b/src/views/admin/settings/web-crawler.tpl
@@ -14,12 +14,12 @@
 	<div class="col-sm-2 col-12 settings-header">[[admin/settings/web-crawler:sitemap-feed-settings]]</div>
 	<div class="col-sm-10 col-12">
 		<form>
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="feeds:disableRSS">
 				<label class="form-check-label">[[admin/settings/web-crawler:disable-rss-feeds]]</label>
 			</div>
 
-			<div class="form-check">
+			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" data-field="feeds:disableSitemap">
 				<label class="form-check-label">[[admin/settings/web-crawler:disable-sitemap-xml]]</label>
 			</div>