diff --git a/component-library/package-lock.json b/component-library/package-lock.json
index b063773..1468716 100644
--- a/component-library/package-lock.json
+++ b/component-library/package-lock.json
@@ -16,6 +16,7 @@
         "@radix-ui/react-select": "^2.2.5",
         "@radix-ui/react-separator": "^1.1.7",
         "@radix-ui/react-slot": "^1.2.3",
+        "@radix-ui/react-switch": "^1.3.7",
         "@radix-ui/react-tabs": "^1.1.12",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
@@ -1471,6 +1472,34 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-switch": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.3.7.tgz",
+      "integrity": "sha512-48tB/4dn2UVLBCYhTu9AuR63IHl73l/qLbLgxd86noTUor4/K4LFDAcYjK+isP5313qxaFpjPVogE7+Y0/V3Kw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-size": "1.1.4"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-tabs": {
       "version": "1.1.21",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.21.tgz",
diff --git a/component-library/package.json b/component-library/package.json
index 1118d48..748884d 100644
--- a/component-library/package.json
+++ b/component-library/package.json
@@ -17,6 +17,7 @@
     "@radix-ui/react-select": "^2.2.5",
     "@radix-ui/react-separator": "^1.1.7",
     "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-switch": "^1.3.7",
     "@radix-ui/react-tabs": "^1.1.12",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
diff --git a/component-library/src/components/gebos/hero-art.tsx b/component-library/src/components/gebos/hero-art.tsx
index 9cd6df4..407f41e 100644
--- a/component-library/src/components/gebos/hero-art.tsx
+++ b/component-library/src/components/gebos/hero-art.tsx
@@ -6,7 +6,8 @@ import consumptionRing from "@/assets/gebos/consumption-ring.svg"
 import smokeAlarmAvif from "@/assets/gebos/smoke-alarm.avif"
 import smokeAlarmWebp from "@/assets/gebos/smoke-alarm.webp"
 import tealBars from "@/assets/gebos/teal-bars.svg"
-import uviBadge from "@/assets/gebos/uvi-badge.svg"
+import uviBadge from "@/assetAs/gebos/uvi-badge.svg"
+import { AssetRender, renders } from ""
 
 /**
  * Homepage hero composition from the GebOS visual asset kit:
@@ -30,6 +31,11 @@ function HeroArt({ className }: { className?: string }) {
         alt=""
         className="absolute top-[12%] -right-[5%] z-0 w-[46%]"
       />
+      <AssetRender
+        render={renders.barChart}
+        alt=""
+        className="absolute top-[52%] left-[10%] w-[16%] scale-200"
+      />
       <picture>
         <source srcSet={buildingAvif} type="image/avif" />
         <img
diff --git a/component-library/src/components/gebos/site-footer.tsx b/component-library/src/components/gebos/site-footer.tsx
index a55fc79..bada9be 100644
--- a/component-library/src/components/gebos/site-footer.tsx
+++ b/component-library/src/components/gebos/site-footer.tsx
@@ -38,7 +38,7 @@ function SiteFooter() {
       <footer className="glass-navy inset-shadow-glass-slab shadow-glass-slab rounded-3xl text-white">
         <Container className="grid gap-10 py-14 sm:grid-cols-2 lg:grid-cols-[1.2fr_1fr_1fr_1fr]">
           <div>
-            <Logo inverse />
+            <Logo inverse mark="3d" markClassName="size-9" />
             <p className="mt-4 max-w-xs text-sm leading-relaxed text-white/60">
               Messdienstleistungen einfach gemacht – von der vorkonfigurierten
               Hardware bis zum laufenden Betrieb.
diff --git a/component-library/src/components/ui/switch.tsx b/component-library/src/components/ui/switch.tsx
new file mode 100644
index 0000000..d407af6
--- /dev/null
+++ b/component-library/src/components/ui/switch.tsx
@@ -0,0 +1,48 @@
+import * as React from "react"
+import * as SwitchPrimitive from "@radix-ui/react-switch"
+import { CheckIcon } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+/**
+ * On/off switch. The lit track is the same teal glass as a primary button, at
+ * pill scale (`inset-shadow-glass-pill`); off it is a recessed navy pane. The
+ * thumb travels on the site's spring easing and carries the checkbox tick, so
+ * the state reads without relying on colour alone.
+ */
+function Switch({
+  className,
+  ...props
+}: React.ComponentProps<typeof SwitchPrimitive.Root>) {
+  return (
+    <SwitchPrimitive.Root
+      data-slot="switch"
+      className={cn(
+        "group peer inline-flex h-7 w-12 shrink-0 cursor-pointer items-center rounded-full p-0.5 transition-colors outline-none",
+        "focus-visible:ring-[3px] focus-visible:ring-ring/40",
+        "disabled:cursor-not-allowed disabled:opacity-50",
+        "data-[state=unchecked]:inset-shadow-xs data-[state=unchecked]:bg-navy/20 data-[state=unchecked]:hover:bg-navy/30",
+        "data-[state=checked]:glass-teal data-[state=checked]:inset-shadow-glass-pill data-[state=checked]:shadow-glass data-[state=checked]:bg-brand-600 data-[state=checked]:hover:glass-lit",
+        className
+      )}
+      {...props}
+    >
+      <SwitchPrimitive.Thumb
+        data-slot="switch-thumb"
+        className={cn(
+          "pointer-events-none flex size-6 items-center justify-center rounded-full bg-card ring-1 ring-navy/10",
+          "shadow-[0_1px_2px_rgb(19_41_60/0.2)]",
+          "transition-transform duration-300 ease-[cubic-bezier(0.34,1.16,0.42,1)] motion-reduce:transition-none",
+          "data-[state=unchecked]:translate-x-0 data-[state=checked]:translate-x-5"
+        )}
+      >
+        <CheckIcon
+          aria-hidden="true"
+          className="size-3.5 stroke-[3] text-primary opacity-0 transition-opacity duration-200 group-data-[state=checked]:opacity-100 motion-reduce:transition-none"
+        />
+      </SwitchPrimitive.Thumb>
+    </SwitchPrimitive.Root>
+  )
+}
+
+export { Switch }
diff --git a/component-library/src/pages/audiences/hauseigentuemer.tsx b/component-library/src/pages/audiences/hauseigentuemer.tsx
index deeedfc..243631c 100644
--- a/component-library/src/pages/audiences/hauseigentuemer.tsx
+++ b/component-library/src/pages/audiences/hauseigentuemer.tsx
@@ -35,7 +35,7 @@ function HomeownerArt() {
     <div className="relative mx-auto aspect-[1.28] w-full max-w-[560px]">
       <AssetRender
         render={renders.buildingIso}
-        className="absolute top-[4%] right-0 w-[74%] z-50"
+        className="absolute top-[4%] right-0 w-[74%]"
         imgClassName="w-full"
         loading="eager"
       />
diff --git a/component-library/src/pages/configurator.tsx b/component-library/src/pages/configurator.tsx
index 2719aae..5b9ed42 100644
--- a/component-library/src/pages/configurator.tsx
+++ b/component-library/src/pages/configurator.tsx
@@ -9,7 +9,7 @@ import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { Separator } from "@/components/ui/separator"
-import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs"
+import { Switch } from "@/components/ui/switch"
 import { Checklist } from "@/components/gebos/checklist"
 import { IconBadge } from "@/components/gebos/icon-tile"
 import { Container, Section, SectionHeading } from "@/components/gebos/section"
@@ -160,13 +160,12 @@ function ServiceOption({
  * "Nicht enthalten" instead of merely dimmed.
  */
 function PackageCard({
-  assets,
+  render,
   title,
   items,
   included,
 }: {
-  /** drawn side by side in the header, first one leading */
-  assets: RenderAsset[]
+  render: RenderAsset
   title: string
   items: string[]
   included: boolean
@@ -179,17 +178,12 @@ function PackageCard({
       )}
     >
       <div className="flex flex-wrap items-center gap-x-4 gap-y-3">
-        <div className="flex shrink-0 items-center gap-1">
-          {assets.map((asset) => (
-            <AssetRender
-              key={asset.webp}
-              render={asset}
-              alt=""
-              className="flex size-20 items-center justify-center"
-              imgClassName={cn("w-20", !included && "opacity-40 grayscale")}
-            />
-          ))}
-        </div>
+        <AssetRender
+          render={render}
+          alt=""
+          className="flex size-20 shrink-0 items-center justify-center"
+          imgClassName={cn("w-20", !included && "opacity-40 grayscale")}
+        />
         <h3
           className={cn(
             "text-xl font-extrabold tracking-tight",
@@ -292,10 +286,6 @@ export default function ConfiguratorPage() {
   const rwmRatePerUnit = install ? RWM_ONE_TIME_INSTALLED : RWM_ONE_TIME_SELF
   /* RWM hardware is billed once per Wohnung – the estimate is the sum. */
   const rwmOneTimeTotal = rwm ? rwmRatePerUnit * totalUnits : 0
-  /* the UVI package shows the heat distribution it has to measure */
-  const heatAsset = buildings.some((b) => b.heat === "fussbodenheizung")
-    ? renders.floorHeating
-    : renders.radiator
 
   return (
     <Container>
@@ -333,22 +323,34 @@ export default function ConfiguratorPage() {
                 />
               </div>
               <Separator className="my-6" />
-              <p className="text-sm font-bold text-navy">Installation</p>
-              <Tabs
-                className="mt-3"
-                value={install ? "mit" : "ohne"}
-                onValueChange={(v) => setInstall(v === "mit")}
+              <div
+                className={cn(
+                  "flex items-start justify-between gap-4 rounded-xl border p-4 transition-colors",
+                  install
+                    ? "border-primary bg-brand-50/60 shadow-pill"
+                    : "border-border bg-card"
+                )}
               >
-                <TabsList>
-                  <TabsTrigger value="mit">Mit Installation</TabsTrigger>
-                  <TabsTrigger value="ohne">Ohne Installation</TabsTrigger>
-                </TabsList>
-              </Tabs>
-              <p className="mt-3 text-sm text-muted-foreground">
-                {install
-                  ? "GebOS organisiert die Montage – Geräte- und Monatspreise enthalten die Installation."
-                  : "Sie selbst, Ihr Hausmeister oder Ihr Fachbetrieb montiert die Geräte."}
-              </p>
+                <div className="min-w-0">
+                  <Label
+                    htmlFor="installation"
+                    className="cursor-pointer text-sm font-bold text-navy"
+                  >
+                    Installation durch GebOS
+                  </Label>
+                  <p className="mt-1 text-sm text-muted-foreground">
+                    {install
+                      ? "GebOS organisiert die Montage – Geräte- und Monatspreise enthalten die Installation."
+                      : "Sie selbst, Ihr Hausmeister oder Ihr Fachbetrieb montiert die Geräte."}
+                  </p>
+                </div>
+                <Switch
+                  id="installation"
+                  checked={install}
+                  onCheckedChange={setInstall}
+                  className="mt-0.5"
+                />
+              </div>
             </StepCard>
 
             <StepCard step={2} title="Gebäude angeben">
@@ -563,7 +565,7 @@ export default function ConfiguratorPage() {
         />
         <div className="mt-8 grid gap-6 lg:grid-cols-2">
           <PackageCard
-            assets={[renders.gateway, heatAsset]}
+            render={renders.gateway}
             title="UVI"
             included={uvi}
             items={[
@@ -575,7 +577,7 @@ export default function ConfiguratorPage() {
             ]}
           />
           <PackageCard
-            assets={[renders.smokeAlarm]}
+            render={renders.smokeAlarm}
             title="Rauchwarnmelder"
             included={rwm}
             items={[
diff --git a/component-library/src/pages/solutions.tsx b/component-library/src/pages/solutions.tsx
index 9461e86..a6ac788 100644
--- a/component-library/src/pages/solutions.tsx
+++ b/component-library/src/pages/solutions.tsx
@@ -60,7 +60,7 @@ export default function SolutionsPage() {
             />
             <SectionHeading
               title="Unsere Lösungen"
-              lead="Drei sauber getrennte Leistungen. Perfekt zusammenspielend."
+              lead="Hier finden sie eine Übersicht unserer Produkt Lösungen."
             />
             <div className="mt-10 grid gap-6 sm:grid-cols-2 lg:grid-cols-3">
               {solutions.map((s) => (
diff --git a/component-library/src/styles/globals.css b/component-library/src/styles/globals.css
index 5962fb0..7bb1f07 100644
--- a/component-library/src/styles/globals.css
+++ b/component-library/src/styles/globals.css
@@ -133,6 +133,10 @@
     0 1px 2px rgb(19 41 60 / 0.05), 0 10px 22px -10px var(--glass-bloom);
   --shadow-glass-lg:
     0 2px 4px rgb(19 41 60 / 0.06), 0 18px 34px -12px var(--glass-bloom);
+  /* the same optics at control scale, for pills the size of a switch track */
+  --inset-shadow-glass-pill:
+    inset 0 1px 0 0 var(--glass-rim), inset 0 0 0 1px var(--glass-ring),
+    inset 0 -4px 6px -4px var(--glass-caustic);
   /* the same optics at slab scale, for surfaces the size of the footer */
   --inset-shadow-glass-slab:
     inset 0 2px 0 0 var(--glass-rim), inset 0 0 0 1px var(--glass-ring),