diff --git a/web/src/components/config-form/theme/templates/ObjectFieldTemplate.tsx b/web/src/components/config-form/theme/templates/ObjectFieldTemplate.tsx
index 7551c5733..ca6c04797 100644
--- a/web/src/components/config-form/theme/templates/ObjectFieldTemplate.tsx
+++ b/web/src/components/config-form/theme/templates/ObjectFieldTemplate.tsx
@@ -287,7 +287,7 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
     <Card className="w-full">
       <Collapsible open={isOpen} onOpenChange={setIsOpen}>
         <CollapsibleTrigger asChild>
-          <CardHeader className="cursor-pointer transition-colors hover:bg-muted/50">
+          <CardHeader className="cursor-pointer p-4 transition-colors hover:bg-muted/50">
             <div className="flex items-center justify-between">
               <div>
                 <CardTitle className="text-sm">{inferredLabel}</CardTitle>
@@ -306,7 +306,7 @@ export function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {
           </CardHeader>
         </CollapsibleTrigger>
         <CollapsibleContent>
-          <CardContent className="space-y-4 pt-0">
+          <CardContent className="space-y-6 p-4 pt-0">
             {hasCustomChildren ? (
               children
             ) : (
diff --git a/web/src/components/config-form/theme/widgets/SwitchesWidget.tsx b/web/src/components/config-form/theme/widgets/SwitchesWidget.tsx
index 1f837c2f8..fa8030dba 100644
--- a/web/src/components/config-form/theme/widgets/SwitchesWidget.tsx
+++ b/web/src/components/config-form/theme/widgets/SwitchesWidget.tsx
@@ -179,7 +179,7 @@ export function SwitchesWidget(props: WidgetProps) {
           </Button>
         </CollapsibleTrigger>
 
-        <CollapsibleContent className="bg-background_alt p-2 md:max-w-xl">
+        <CollapsibleContent className="rounded-lg bg-secondary p-2 pr-0 md:max-w-md">
           {availableEntities.length === 0 ? (
             <div className="text-sm text-muted-foreground">{emptyMessage}</div>
           ) : (
diff --git a/web/src/views/settings/SingleSectionPage.tsx b/web/src/views/settings/SingleSectionPage.tsx
index f10492927..5b6392fd2 100644
--- a/web/src/views/settings/SingleSectionPage.tsx
+++ b/web/src/views/settings/SingleSectionPage.tsx
@@ -127,7 +127,7 @@ export function SingleSectionPage({
               sectionStatus.isOverridden && (
                 <Badge
                   variant="secondary"
-                  className="border-2 border-selected text-xs text-primary-variant"
+                  className="cursor-default border-2 border-selected text-xs text-primary-variant"
                 >
                   {t("button.overridden", {
                     ns: "common",
@@ -138,7 +138,7 @@ export function SingleSectionPage({
             {sectionStatus.hasChanges && (
               <Badge
                 variant="secondary"
-                className="bg-danger text-xs text-white"
+                className="cursor-default bg-danger text-xs text-white hover:bg-danger"
               >
                 {t("modified", { ns: "common", defaultValue: "Modified" })}
               </Badge>