diff --git a/packages/features/eventtypes/components/Locations.tsx b/packages/features/eventtypes/components/Locations.tsx
index 5231b766e1..a71f2540cf 100644
--- a/packages/features/eventtypes/components/Locations.tsx
+++ b/packages/features/eventtypes/components/Locations.tsx
@@ -344,7 +344,7 @@ const Locations: React.FC<LocationsProps> = ({
               {isCalVideo && !isPlatform && (
                 <div className="bg-muted mt-2 space-y-2 rounded-lg p-4">
                   <div className="w-full">
-                    <div className="flex flex-col gap-2">
+                    <div className="flex flex-col gap-4">
                       <Controller
                         name="calVideoSettings.disableRecordingForGuests"
                         defaultValue={!!eventType.calVideoSettings?.disableRecordingForGuests}
@@ -352,7 +352,7 @@ const Locations: React.FC<LocationsProps> = ({
                           return (
                             <SettingsToggle
                               title={t("disable_recording_for_guests")}
-                              labelClassName="text-sm"
+                              labelClassName="text-sm leading-6 whitespace-normal break-words"
                               checked={value}
                               onCheckedChange={onChange}
                             />
@@ -367,7 +367,7 @@ const Locations: React.FC<LocationsProps> = ({
                           return (
                             <SettingsToggle
                               title={t("disable_recording_for_organizer")}
-                              labelClassName="text-sm"
+                              labelClassName="text-sm leading-6 whitespace-normal break-words"
                               checked={value}
                               onCheckedChange={onChange}
                             />
@@ -382,7 +382,7 @@ const Locations: React.FC<LocationsProps> = ({
                           return (
                             <SettingsToggle
                               title={t("enable_automatic_transcription")}
-                              labelClassName="text-sm"
+                              labelClassName="text-sm leading-6 whitespace-normal break-words"
                               checked={value}
                               onCheckedChange={onChange}
                             />
@@ -398,7 +398,7 @@ const Locations: React.FC<LocationsProps> = ({
                             return (
                               <SettingsToggle
                                 title={t("disable_transcription_for_guests")}
-                                labelClassName="text-sm"
+                                labelClassName="text-sm leading-6 whitespace-normal break-words"
                                 checked={value}
                                 onCheckedChange={onChange}
                               />
@@ -414,7 +414,7 @@ const Locations: React.FC<LocationsProps> = ({
                             return (
                               <SettingsToggle
                                 title={t("disable_transcription_for_organizer")}
-                                labelClassName="text-sm"
+                                labelClassName="text-sm leading-6 whitespace-normal break-words"
                                 checked={value}
                                 onCheckedChange={onChange}
                               />
@@ -427,7 +427,8 @@ const Locations: React.FC<LocationsProps> = ({
                         label={t("enter_redirect_url_on_exit_description")}
                         defaultValue={eventType.calVideoSettings?.redirectUrlOnExit || ""}
                         data-testid="calVideoSettings.redirectUrlOnExit"
-                        containerClassName="mt-2"
+                        containerClassName="mt-4"
+                        className="leading-6"
                         {...formMethods.register("calVideoSettings.redirectUrlOnExit", {
                           setValueAs: (v) => (!v || v.trim() === "" ? null : v),
                         })}
diff --git a/packages/platform/atoms/src/components/ui/switch.tsx b/packages/platform/atoms/src/components/ui/switch.tsx
index 3e8b9d0452..20c88117db 100644
--- a/packages/platform/atoms/src/components/ui/switch.tsx
+++ b/packages/platform/atoms/src/components/ui/switch.tsx
@@ -8,7 +8,7 @@ const Switch = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <SwitchPrimitives.Root
     className={cn(
-      "focus-visible:ring-ring focus-visible:ring-offset-background data-[state=checked]:bg-primary data-[state=unchecked]:bg-input peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+      "focus-visible:ring-ring focus-visible:ring-offset-background data-[state=checked]:bg-primary data-[state=unchecked]:bg-input peer inline-flex h-[24px] w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
       className
     )}
     {...props}