diff --git a/src-ui/src/app/components/common/input/check/check.component.html b/src-ui/src/app/components/common/input/check/check.component.html
index 2c910ab8b..62de7d143 100644
--- a/src-ui/src/app/components/common/input/check/check.component.html
+++ b/src-ui/src/app/components/common/input/check/check.component.html
@@ -1,5 +1,5 @@
 <div class="mb-3 form-check">
   <input type="checkbox" class="form-check-input" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" (blur)="onTouched()" [disabled]="disabled">
   <label class="form-check-label" [for]="inputId">{{title}}</label>
-  <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+  <div *ngIf="hint" class="form-text text-muted">{{hint}}</div>
 </div>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index bd3037a4b..728a22ca7 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -12,7 +12,7 @@
 
         <h4 i18n>Appearance</h4>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="col-md-3 col-form-label">
             <span i18n>Display language</span>
           </div>
@@ -27,7 +27,7 @@
           </div>
         </div>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="col-md-3 col-form-label">
             <span i18n>Date display</span>
           </div>
@@ -40,29 +40,29 @@
           </div>
         </div>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="col-md-3 col-form-label">
             <span i18n>Date format</span>
           </div>
           <div class="col">
 
-            <div class="custom-control custom-radio">
-              <input type="radio" id="dateFormatShort" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="shortDate">
-              <label class="custom-control-label" for="dateFormatShort" i18n>Short: {{today | customDate:'shortDate':null:computedDateLocale}}</label>
+            <div class="form-check">
+              <input type="radio" id="dateFormatShort" name="dateFormat" class="form-check-input" formControlName="dateFormat" value="shortDate">
+              <label class="form-check-label" for="dateFormatShort" i18n>Short: {{today | customDate:'shortDate':null:computedDateLocale}}</label>
             </div>
-            <div class="custom-control custom-radio">
-              <input type="radio" id="dateFormatMedium" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="mediumDate">
-              <label class="custom-control-label" for="dateFormatMedium" i18n>Medium: {{today | customDate:'mediumDate':null:computedDateLocale}}</label>
+            <div class="form-check">
+              <input type="radio" id="dateFormatMedium" name="dateFormat" class="form-check-input" formControlName="dateFormat" value="mediumDate">
+              <label class="form-check-label" for="dateFormatMedium" i18n>Medium: {{today | customDate:'mediumDate':null:computedDateLocale}}</label>
             </div>
-            <div class="custom-control custom-radio">
-              <input type="radio" id="dateFormatLong" name="dateFormat" class="custom-control-input" formControlName="dateFormat" value="longDate">
-              <label class="custom-control-label" for="dateFormatLong" i18n>Long: {{today | customDate:'longDate':null:computedDateLocale}}</label>
+            <div class="form-check">
+              <input type="radio" id="dateFormatLong" name="dateFormat" class="form-check-input" formControlName="dateFormat" value="longDate">
+              <label class="form-check-label" for="dateFormatLong" i18n>Long: {{today | customDate:'longDate':null:computedDateLocale}}</label>
             </div>
 
           </div>
         </div>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="col-md-3 col-form-label">
             <span i18n>Items per page</span>
           </div>
@@ -78,7 +78,7 @@
           </div>
         </div>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="col-md-3 col-form-label">
             <span i18n>Document editor</span>
           </div>
@@ -89,7 +89,7 @@
           </div>
         </div>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="col-md-3 col-form-label">
             <span i18n>Dark mode</span>
           </div>
@@ -102,7 +102,7 @@
 
         <h4 class="mt-4" i18n>Bulk editing</h4>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="offset-md-3 col">
             <app-input-check i18n-title title="Show confirmation dialogs" formControlName="bulkEditConfirmationDialogs" i18n-hint hint="Deleting documents will always ask for confirmation."></app-input-check>
             <app-input-check i18n-title title="Apply on close" formControlName="bulkEditApplyOnClose"></app-input-check>
@@ -118,7 +118,7 @@
 
         <h4 i18n>Document processing</h4>
 
-        <div class="form-row form-group">
+        <div class="row mb-3">
           <div class="offset-md-3 col">
             <app-input-check i18n-title title="Show notifications when new documents are detected" formControlName="notificationsConsumerNewDocument"></app-input-check>
             <app-input-check i18n-title title="Show notifications when document processing completes successfully" formControlName="notificationsConsumerSuccess"></app-input-check>
@@ -136,26 +136,26 @@
 
         <div formGroupName="savedViews">
 
-            <div *ngFor="let view of savedViews" [formGroupName]="view.id" class="form-row">
-              <div class="form-group col-4 me-3">
-                <label for="name_{{view.id}}" i18n>Name</label>
+            <div *ngFor="let view of savedViews" [formGroupName]="view.id" class="row">
+              <div class="mb-3 col-4 me-3">
+                <label class="form-label" for="name_{{view.id}}" i18n>Name</label>
                 <input type="text" class="form-control" formControlName="name" id="name_{{view.id}}">
               </div>
 
-              <div class="form-group col-auto me-3">
-                <label for="show_on_dashboard_{{view.id}}" i18n>Appears on</label>
-                <div class="custom-control custom-switch">
-                  <input type="checkbox" class="custom-control-input" id="show_on_dashboard_{{view.id}}" formControlName="show_on_dashboard">
-                  <label class="custom-control-label" for="show_on_dashboard_{{view.id}}" i18n>Show on dashboard</label>
+              <div class="mb-2 col-auto me-3">
+                <label class="form-label" for="show_on_dashboard_{{view.id}}" i18n>Appears on</label>
+                <div class="form-check form-switch">
+                  <input type="checkbox" class="form-check-input" id="show_on_dashboard_{{view.id}}" formControlName="show_on_dashboard">
+                  <label class="form-check-label" for="show_on_dashboard_{{view.id}}" i18n>Show on dashboard</label>
                 </div>
-                <div class="custom-control custom-switch">
-                  <input type="checkbox" class="custom-control-input" id="show_in_sidebar_{{view.id}}" formControlName="show_in_sidebar">
-                  <label class="custom-control-label" for="show_in_sidebar_{{view.id}}" i18n>Show in sidebar</label>
+                <div class="form-check form-switch">
+                  <input type="checkbox" class="form-check-input" id="show_in_sidebar_{{view.id}}" formControlName="show_in_sidebar">
+                  <label class="form-check-label" for="show_in_sidebar_{{view.id}}" i18n>Show in sidebar</label>
                 </div>
               </div>
 
-              <div class="form-group col-auto">
-                <label for="name_{{view.id}}" i18n>Actions</label>
+              <div class="mb-2 col-auto">
+                <label class="form-label" for="name_{{view.id}}" i18n>Actions</label>
                 <button type="button" class="btn btn-sm btn-outline-danger form-control" (click)="deleteSavedView(view)" i18n>Delete</button>
               </div>
             </div>