diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tpl
index f5dafb2423..c9f7ba42fb 100644
--- a/src/views/partials/acceptTos.tpl
+++ b/src/views/partials/acceptTos.tpl
@@ -1,9 +1,8 @@
 <div>
 	<label for="agree-terms">[[register:terms-of-use]]</label>
 	<div class="tos">{termsOfUse}</div>
-	<div class="checkbox">
-		<label>
-			<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree-to-terms-of-use]]
-		</label>
+	<div class="form-check">
+		<input class="form-check-input border-gray-500" type="checkbox" name="agree-terms" id="agree-terms">
+		<label class="form-check-label">[[register:agree-to-terms-of-use]]</label>
 	</div>
 </div>
\ No newline at end of file
diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl
index 21ec19074c..ea25aeb43c 100644
--- a/src/views/partials/gdpr_consent.tpl
+++ b/src/views/partials/gdpr_consent.tpl
@@ -2,7 +2,7 @@
 	<p class="lead">[[user:consent.lead]]</p>
 	<p>[[user:consent.intro]]</p>
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data">
+		<input class="form-check-input border-gray-500" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data" role="switch">
 		<label class="form-check-label" for="gdpr_agree_data">[[register:gdpr-agree-data]]</label>
 	</div>
 
@@ -16,7 +16,7 @@
 	</p>
 
 	<div class="form-check">
-		<input class="form-check-input" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email">
+		<input class="form-check-input border-gray-500" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email" role="switch">
 		<label class="form-check-label" for="gdpr_agree_email">[[register:gdpr-agree-email]]</label>
 	</div>
 </div>
\ No newline at end of file