diff --git a/src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html b/src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html
index de3479e7..3528e4ed 100644
--- a/src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html
+++ b/src/frontend/app/ui/gallery/lightbox/controls/controls.lightbox.gallery.component.html
@@ -71,8 +71,7 @@
                 switch-on-text="always"
                 i18n-switch-off-text
                 i18n-switch-on-text
-                [switch-handle-width]="100"
-                [switch-label-width]="20"
+                [switch-label-width]="30"
                 [(ngModel)]="lightboxService.captionAlwaysOn">
               </bSwitch>
             </div>
@@ -89,8 +88,7 @@
                 switch-on-text="always"
                 i18n-switch-off-text
                 i18n-switch-on-text
-                [switch-handle-width]="100"
-                [switch-label-width]="20"
+                [switch-label-width]="30"
                 [(ngModel)]="lightboxService.facesAlwaysOn">
               </bSwitch>
             </div>
@@ -109,8 +107,7 @@
                 switch-on-text="loop"
                 i18n-switch-off-text
                 i18n-switch-on-text
-                [switch-handle-width]="100"
-                [switch-label-width]="20"
+                [switch-label-width]="30"
                 [(ngModel)]="lightboxService.loopVideos">
               </bSwitch>
             </div>
diff --git a/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html b/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html
index 9553b98c..cf026c5a 100644
--- a/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html
+++ b/src/frontend/app/ui/gallery/search/query-enrty/query-entry.search.gallery.component.html
@@ -211,8 +211,7 @@
             switch-on-text="Landscape"
             i18n-switch-off-text
             i18n-switch-on-text
-            [switch-handle-width]="100"
-            [switch-label-width]="20"
+            [switch-label-width]="30"
             (ngModelChange)="onChange()"
             [(ngModel)]="AsOrientationQuery.landscape">
           </bSwitch>
diff --git a/src/frontend/app/ui/gallery/share/share.gallery.component.html b/src/frontend/app/ui/gallery/share/share.gallery.component.html
index 6598a237..3db936a4 100644
--- a/src/frontend/app/ui/gallery/share/share.gallery.component.html
+++ b/src/frontend/app/ui/gallery/share/share.gallery.component.html
@@ -62,8 +62,7 @@
             [switch-inverse]="true"
             [switch-off-text]="text.No"
             [switch-on-text]="text.Yes"
-            [switch-handle-width]="100"
-            [switch-label-width]="20"
+            [switch-label-width]="30"
             (change)="update()"
             [(ngModel)]="input.includeSubfolders">
           </bSwitch>
diff --git a/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html b/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html
index 263285c0..927ba94a 100644
--- a/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html
+++ b/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html
@@ -66,13 +66,11 @@
           switch-on-text="Enabled"
           i18n-switch-off-text
           i18n-switch-on-text
-          [switch-handle-width]="100"
-          [switch-label-width]="20"
+          [switch-label-width]="30"
           (ngModelChange)="onChange($event)"
           [(ngModel)]="state.value">
         </bSwitch>
-
-
+        
         <app-settings-workflow
           class="w-100"
           *ngSwitchCase="'JobScheduleConfig'"
diff --git a/src/frontend/app/ui/settings/template/template.component.html b/src/frontend/app/ui/settings/template/template.component.html
index 1a1a3195..ca3f213c 100644
--- a/src/frontend/app/ui/settings/template/template.component.html
+++ b/src/frontend/app/ui/settings/template/template.component.html
@@ -14,8 +14,7 @@
           i18n-switch-off-text
           i18n-switch-on-text
           [switch-disabled]="inProgress"
-          [switch-handle-width]="100"
-          [switch-label-width]="20"
+          [switch-label-width]="30"
           [(ngModel)]="states.value.enabled">
         </bSwitch>
       </div>
diff --git a/src/frontend/app/ui/settings/workflow/workflow.component.html b/src/frontend/app/ui/settings/workflow/workflow.component.html
index 0872e129..347a44c1 100644
--- a/src/frontend/app/ui/settings/workflow/workflow.component.html
+++ b/src/frontend/app/ui/settings/workflow/workflow.component.html
@@ -131,8 +131,7 @@
                 switch-off-text="Disabled"
                 switch-on-text="Enabled"
                 i18n-switch-off-text i18n-switch-on-text
-                [switch-handle-width]="100"
-                [switch-label-width]="20"
+                [switch-label-width]="30"
                 (ngModelChange)="onChange($event)"
                 [(ngModel)]="schedule.allowParallelRun">
               </bSwitch>
@@ -165,8 +164,7 @@
                     switch-off-text="Disabled"
                     switch-on-text="Enabled"
                     i18n-switch-off-text i18n-switch-on-text
-                    [switch-handle-width]="100"
-                    [switch-label-width]="20"
+                    [switch-label-width]="30"
                     (ngModelChange)="onChange($event)"
                     [(ngModel)]="schedule.config[configEntry.id]">
                   </bSwitch>