diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index cdc120f..bf1e420 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react';
 import { signIn } from 'next-auth/react';
 import { useRouter } from 'next/navigation';
 import Link from 'next/link';
-import { RocketIcon } from '@/components/ui';
+import { Button, Input, RocketIcon } from '@/components/ui';
 
 export default function LoginPage() {
   const router = useRouter();
@@ -62,42 +62,32 @@ export default function LoginPage() {
           )}
 
           <div className="mb-4">
-            <label htmlFor="email" className="mb-2 block text-sm font-medium text-foreground">
-              Email
-            </label>
-            <input
+            <Input
               id="email"
               name="email"
               type="email"
+              label="Email"
               required
               autoComplete="email"
-              className="w-full rounded-lg border border-input-border bg-input px-4 py-2.5 text-foreground placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-2 focus:ring-primary/20"
               placeholder="vous@exemple.com"
             />
           </div>
 
           <div className="mb-6">
-            <label htmlFor="password" className="mb-2 block text-sm font-medium text-foreground">
-              Mot de passe
-            </label>
-            <input
+            <Input
               id="password"
               name="password"
               type="password"
+              label="Mot de passe"
               required
               autoComplete="current-password"
-              className="w-full rounded-lg border border-input-border bg-input px-4 py-2.5 text-foreground placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-2 focus:ring-primary/20"
               placeholder="••••••••"
             />
           </div>
 
-          <button
-            type="submit"
-            disabled={loading}
-            className="w-full rounded-lg bg-primary px-4 py-2.5 font-semibold text-primary-foreground transition-colors hover:bg-primary-hover disabled:cursor-not-allowed disabled:opacity-50"
-          >
+          <Button type="submit" disabled={loading} loading={loading} className="w-full">
             {loading ? 'Connexion...' : 'Se connecter'}
-          </button>
+          </Button>
 
           <p className="mt-6 text-center text-sm text-muted">
             Pas encore de compte ?{' '}
diff --git a/src/app/(auth)/register/page.tsx b/src/app/(auth)/register/page.tsx
index 0173b78..77320eb 100644
--- a/src/app/(auth)/register/page.tsx
+++ b/src/app/(auth)/register/page.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react';
 import { signIn } from 'next-auth/react';
 import { useRouter } from 'next/navigation';
 import Link from 'next/link';
-import { RocketIcon } from '@/components/ui';
+import { Button, Input, RocketIcon } from '@/components/ui';
 
 export default function RegisterPage() {
   const router = useRouter();
@@ -91,74 +91,55 @@ export default function RegisterPage() {
           )}
 
           <div className="mb-4">
-            <label htmlFor="name" className="mb-2 block text-sm font-medium text-foreground">
-              Nom
-            </label>
-            <input
+            <Input
               id="name"
               name="name"
               type="text"
+              label="Nom"
               autoComplete="name"
-              className="w-full rounded-lg border border-input-border bg-input px-4 py-2.5 text-foreground placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-2 focus:ring-primary/20"
               placeholder="Jean Dupont"
             />
           </div>
 
           <div className="mb-4">
-            <label htmlFor="email" className="mb-2 block text-sm font-medium text-foreground">
-              Email
-            </label>
-            <input
+            <Input
               id="email"
               name="email"
               type="email"
+              label="Email"
               required
               autoComplete="email"
-              className="w-full rounded-lg border border-input-border bg-input px-4 py-2.5 text-foreground placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-2 focus:ring-primary/20"
               placeholder="vous@exemple.com"
             />
           </div>
 
           <div className="mb-4">
-            <label htmlFor="password" className="mb-2 block text-sm font-medium text-foreground">
-              Mot de passe
-            </label>
-            <input
+            <Input
               id="password"
               name="password"
               type="password"
+              label="Mot de passe"
               required
               autoComplete="new-password"
-              className="w-full rounded-lg border border-input-border bg-input px-4 py-2.5 text-foreground placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-2 focus:ring-primary/20"
               placeholder="••••••••"
             />
           </div>
 
           <div className="mb-6">
-            <label
-              htmlFor="confirmPassword"
-              className="mb-2 block text-sm font-medium text-foreground"
-            >
-              Confirmer le mot de passe
-            </label>
-            <input
+            <Input
               id="confirmPassword"
               name="confirmPassword"
               type="password"
+              label="Confirmer le mot de passe"
               required
               autoComplete="new-password"
-              className="w-full rounded-lg border border-input-border bg-input px-4 py-2.5 text-foreground placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-2 focus:ring-primary/20"
               placeholder="••••••••"
             />
           </div>
 
-          <button
-            type="submit"
-            disabled={loading}
-            className="w-full rounded-lg bg-primary px-4 py-2.5 font-semibold text-primary-foreground transition-colors hover:bg-primary-hover disabled:cursor-not-allowed disabled:opacity-50"
-          >
+          <Button type="submit" disabled={loading} loading={loading} className="w-full">
             {loading ? 'Création...' : 'Créer mon compte'}
-          </button>
+          </Button>
 
           <p className="mt-6 text-center text-sm text-muted">
             Déjà un compte ?{' '}
diff --git a/src/app/design-system/page.tsx b/src/app/design-system/page.tsx
new file mode 100644
index 0000000..54a0950
--- /dev/null
+++ b/src/app/design-system/page.tsx
@@ -0,0 +1,525 @@
+'use client';
+
+import { useState } from 'react';
+import {
+  Avatar,
+  Badge,
+  Button,
+  Card,
+  CardContent,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+  CardTitle,
+  CollaboratorDisplay,
+  DateInput,
+  Disclosure,
+  DropdownMenu,
+  EditableGifMoodTitle,
+  EditableMotivatorTitle,
+  EditableSessionTitle,
+  EditableTitle,
+  EditableWeatherTitle,
+  EditableWeeklyCheckInTitle,
+  EditableYearReviewTitle,
+  InlineFormActions,
+  Input,
+  IconCheck,
+  IconClose,
+  IconDuplicate,
+  IconEdit,
+  IconButton,
+  IconPlus,
+  IconTrash,
+  Modal,
+  ModalFooter,
+  PageHeader,
+  ParticipantInput,
+  RocketIcon,
+  Select,
+  SegmentedControl,
+  SessionPageHeader,
+  Textarea,
+  ToggleGroup,
+  FormField,
+  NumberInput,
+} from '@/components/ui';
+
+const BUTTON_VARIANTS = [
+  'primary',
+  'secondary',
+  'outline',
+  'ghost',
+  'destructive',
+  'brand',
+] as const;
+const BUTTON_SIZES = ['sm', 'md', 'lg'] as const;
+
+const BADGE_VARIANTS = [
+  'default',
+  'primary',
+  'strength',
+  'weakness',
+  'opportunity',
+  'threat',
+  'success',
+  'warning',
+  'destructive',
+  'accent',
+] as const;
+
+const SELECT_OPTIONS = [
+  { value: 'editor', label: 'Editeur' },
+  { value: 'viewer', label: 'Lecteur' },
+  { value: 'admin', label: 'Admin' },
+];
+
+const SECTION_LINKS = [
+  { id: 'buttons', label: 'Buttons' },
+  { id: 'badges', label: 'Badges' },
+  { id: 'icon-button', label: 'IconButton' },
+  { id: 'form-inputs', label: 'Form Inputs' },
+  { id: 'select-toggle', label: 'Select & Toggle' },
+  { id: 'form-field', label: 'FormField / Date / Number' },
+  { id: 'cards', label: 'Cards' },
+  { id: 'avatars', label: 'Avatar & Collaborators' },
+  { id: 'disclosure-dropdown', label: 'Disclosure & Dropdown' },
+  { id: 'menu', label: 'Menu' },
+  { id: 'editable-titles', label: 'Editable Titles' },
+  { id: 'session-header', label: 'Session Header' },
+  { id: 'participant-input', label: 'ParticipantInput' },
+  { id: 'icons', label: 'Icons' },
+  { id: 'modal', label: 'Modal' },
+] as const;
+
+export default function DesignSystemPage() {
+  const [modalOpen, setModalOpen] = useState(false);
+  const [toggleValue, setToggleValue] = useState<'cards' | 'table' | 'list'>('cards');
+  const [selectMd, setSelectMd] = useState('editor');
+  const [selectSm, setSelectSm] = useState('viewer');
+  const [selectXs, setSelectXs] = useState('admin');
+  const [selectLg, setSelectLg] = useState('editor');
+  const [menuCount, setMenuCount] = useState(0);
+
+  return (
+    <main className="mx-auto max-w-7xl px-4 py-8">
+      <PageHeader
+        emoji="🎨"
+        title="Design System"
+        subtitle="Guide visuel des composants UI et de leurs variantes"
+        actions={
+          <Button variant="brand" size="sm">
+            Action principale
+          </Button>
+        }
+      />
+
+      <div className="grid items-start gap-8" style={{ gridTemplateColumns: '240px minmax(0, 1fr)' }}>
+        <aside>
+          <Card className="sticky top-20 p-4">
+            <p className="mb-3 text-sm font-medium text-foreground">Menu de la page</p>
+            <nav className="flex flex-col gap-1.5">
+              {SECTION_LINKS.map((section) => (
+                <a
+                  key={section.id}
+                  href={`#${section.id}`}
+                  className="rounded-md px-2.5 py-1.5 text-sm text-muted transition-colors hover:bg-card-hover hover:text-foreground"
+                >
+                  {section.label}
+                </a>
+              ))}
+            </nav>
+          </Card>
+        </aside>
+
+        <div className="space-y-8">
+        <Card id="buttons" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Buttons</h2>
+          <div className="space-y-4">
+            {BUTTON_SIZES.map((size) => (
+              <div key={size} className="flex flex-wrap items-center gap-3">
+                <span className="w-12 text-xs uppercase tracking-wide text-muted">{size}</span>
+                {BUTTON_VARIANTS.map((variant) => (
+                  <Button key={`${size}-${variant}`} variant={variant} size={size}>
+                    {variant}
+                  </Button>
+                ))}
+              </div>
+            ))}
+            <div className="flex flex-wrap items-center gap-3 border-t border-border pt-4">
+              <Button loading>Chargement</Button>
+              <Button disabled>Desactive</Button>
+            </div>
+          </div>
+        </Card>
+
+        <Card id="badges" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Badges</h2>
+          <div className="flex flex-wrap gap-2">
+            {BADGE_VARIANTS.map((variant) => (
+              <Badge key={variant} variant={variant}>
+                {variant}
+              </Badge>
+            ))}
+          </div>
+        </Card>
+
+        <Card id="icon-button" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">IconButton</h2>
+          <div className="flex flex-wrap items-center gap-2">
+            <IconButton icon={<IconEdit />} label="Edit" />
+            <IconButton icon={<IconDuplicate />} label="Duplicate" variant="primary" />
+            <IconButton icon={<IconTrash />} label="Delete" variant="destructive" />
+          </div>
+        </Card>
+
+        <Card id="form-inputs" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Form Inputs</h2>
+          <div className="grid gap-4 md:grid-cols-2">
+            <Input label="Input standard" placeholder="Votre texte" />
+            <Input label="Input avec erreur" defaultValue="Valeur invalide" error="Champ invalide" />
+            <Textarea label="Textarea standard" placeholder="Votre description" rows={3} />
+            <Textarea
+              label="Textarea avec erreur"
+              defaultValue="Texte"
+              rows={3}
+              error="Description trop courte"
+            />
+          </div>
+        </Card>
+
+        <Card id="select-toggle" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Select & ToggleGroup</h2>
+          <div className="grid gap-4 md:grid-cols-2">
+            <div className="space-y-3">
+              <Select
+                label="Select XS"
+                size="xs"
+                value={selectXs}
+                onChange={(e) => setSelectXs(e.target.value)}
+                options={SELECT_OPTIONS}
+              />
+              <Select
+                label="Select SM"
+                size="sm"
+                value={selectSm}
+                onChange={(e) => setSelectSm(e.target.value)}
+                options={SELECT_OPTIONS}
+              />
+              <Select
+                label="Select MD"
+                size="md"
+                value={selectMd}
+                onChange={(e) => setSelectMd(e.target.value)}
+                options={SELECT_OPTIONS}
+              />
+              <Select
+                label="Select LG"
+                size="lg"
+                value={selectLg}
+                onChange={(e) => setSelectLg(e.target.value)}
+                options={SELECT_OPTIONS}
+              />
+            </div>
+
+            <div className="space-y-3">
+              <p className="text-sm font-medium text-foreground">Toggle group</p>
+              <ToggleGroup
+                value={toggleValue}
+                onChange={setToggleValue}
+                options={[
+                  { value: 'cards', label: 'Cards' },
+                  { value: 'table', label: 'Table' },
+                  { value: 'list', label: 'List' },
+                ]}
+              />
+              <p className="text-sm text-muted">Valeur active: {toggleValue}</p>
+              <p className="pt-2 text-sm font-medium text-foreground">Segmented control</p>
+              <SegmentedControl
+                value={toggleValue}
+                onChange={setToggleValue}
+                options={[
+                  { value: 'cards', label: 'Cards' },
+                  { value: 'table', label: 'Table' },
+                  { value: 'list', label: 'List' },
+                ]}
+              />
+            </div>
+          </div>
+        </Card>
+
+        <Card id="form-field" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">FormField / Date / Number</h2>
+          <div className="grid gap-4 md:grid-cols-2">
+            <FormField label="FormField">
+              <Input placeholder="Control custom" />
+            </FormField>
+            <DateInput label="DateInput" defaultValue="2026-03-03" />
+            <NumberInput label="NumberInput" defaultValue={42} />
+          </div>
+        </Card>
+
+        <Card id="cards" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Cards & Header blocks</h2>
+          <div className="grid gap-4 md:grid-cols-2">
+            <Card hover>
+              <CardHeader>
+                <CardTitle>Card title</CardTitle>
+                <CardDescription>Description secondaire</CardDescription>
+              </CardHeader>
+              <CardContent>
+                <p className="text-sm text-muted">Contenu principal de la card.</p>
+              </CardContent>
+              <CardFooter className="justify-end">
+                <Button size="sm" variant="outline">
+                  Annuler
+                </Button>
+                <Button size="sm">Valider</Button>
+              </CardFooter>
+            </Card>
+
+            <Card className="p-4">
+              <h3 className="mb-3 font-medium text-foreground">Inline actions</h3>
+              <Input placeholder="Exemple inline" className="mb-2" />
+              <InlineFormActions
+                onCancel={() => {}}
+                onSubmit={() => {}}
+                isPending={false}
+                submitLabel="Ajouter"
+              />
+            </Card>
+          </div>
+        </Card>
+
+        <Card id="avatars" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Avatar & Collaborators</h2>
+          <div className="grid gap-4 md:grid-cols-2">
+            <div className="flex items-center gap-3">
+              <Avatar email="jane.doe@example.com" name="Jane Doe" size={40} />
+              <Avatar email="john.smith@example.com" name="John Smith" size={32} />
+              <Avatar email="team@example.com" size={24} />
+            </div>
+
+            <div className="space-y-3">
+              <CollaboratorDisplay
+                collaborator={{
+                  raw: 'Jane Doe',
+                  matchedUser: {
+                    id: '1',
+                    email: 'jane.doe@example.com',
+                    name: 'Jane Doe',
+                  },
+                }}
+                showEmail
+              />
+              <CollaboratorDisplay
+                collaborator={{
+                  raw: 'Intervenant externe',
+                  matchedUser: null,
+                }}
+              />
+            </div>
+          </div>
+        </Card>
+
+        <Card id="disclosure-dropdown" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Disclosure & Dropdown</h2>
+          <div className="space-y-4">
+            <Disclosure title="Panneau pliable" subtitle="Composant Disclosure">
+              <p className="text-sm text-muted">Contenu du panneau.</p>
+            </Disclosure>
+            <DropdownMenu
+              panelClassName="mt-2 w-56 rounded-lg border border-border bg-card p-2 shadow-lg"
+              trigger={({ open, toggle }) => (
+                <Button type="button" variant="outline" onClick={toggle}>
+                  Menu demo {open ? '▲' : '▼'}
+                </Button>
+              )}
+            >
+              {({ close }) => (
+                <Button
+                  size="sm"
+                  variant="secondary"
+                  onClick={() => {
+                    setMenuCount((prev) => prev + 1);
+                    close();
+                  }}
+                >
+                  Incrementer ({menuCount})
+                </Button>
+              )}
+            </DropdownMenu>
+          </div>
+        </Card>
+
+        <Card id="menu" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Menu</h2>
+          <DropdownMenu
+            panelClassName="mt-2 w-64 overflow-hidden rounded-lg border border-border bg-card py-1 shadow-lg"
+            trigger={({ open, toggle }) => (
+              <Button type="button" variant="outline" onClick={toggle}>
+                Ouvrir le menu {open ? '▲' : '▼'}
+              </Button>
+            )}
+          >
+            {({ close }) => (
+              <>
+                <div className="border-b border-border px-4 py-2">
+                  <p className="text-xs text-muted">MENU DE DEMO</p>
+                  <p className="text-sm font-medium text-foreground">Navigation rapide</p>
+                </div>
+                <button
+                  type="button"
+                  onClick={close}
+                  className="block w-full px-4 py-2 text-left text-sm text-foreground hover:bg-card-hover"
+                >
+                  👤 Mon profil
+                </button>
+                <button
+                  type="button"
+                  onClick={close}
+                  className="block w-full px-4 py-2 text-left text-sm text-foreground hover:bg-card-hover"
+                >
+                  👥 Equipes
+                </button>
+                <button
+                  type="button"
+                  onClick={close}
+                  className="block w-full px-4 py-2 text-left text-sm text-destructive hover:bg-card-hover"
+                >
+                  Se deconnecter
+                </button>
+              </>
+            )}
+          </DropdownMenu>
+        </Card>
+
+        <Card id="editable-titles" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Editable Titles</h2>
+          <div className="space-y-6">
+            <div>
+              <p className="mb-2 text-sm font-medium text-foreground">EditableTitle (base)</p>
+              <EditableTitle
+                sessionId="demo-editable-title"
+                initialTitle="Titre modifiable (cliquez pour tester)"
+                canEdit
+                onUpdate={async () => ({ success: true })}
+              />
+            </div>
+            <div className="grid gap-4 md:grid-cols-2">
+              <EditableSessionTitle
+                sessionId="demo-session-title"
+                initialTitle="Session title wrapper"
+                canEdit={false}
+              />
+              <EditableMotivatorTitle
+                sessionId="demo-motivator-title"
+                initialTitle="Motivator title wrapper"
+                canEdit={false}
+              />
+              <EditableYearReviewTitle
+                sessionId="demo-year-review-title"
+                initialTitle="Year review title wrapper"
+                canEdit={false}
+              />
+              <EditableWeatherTitle
+                sessionId="demo-weather-title"
+                initialTitle="Weather title wrapper"
+                canEdit={false}
+              />
+              <EditableWeeklyCheckInTitle
+                sessionId="demo-weekly-checkin-title"
+                initialTitle="Weekly check-in title wrapper"
+                canEdit={false}
+              />
+              <EditableGifMoodTitle
+                sessionId="demo-gif-mood-title"
+                initialTitle="Gif mood title wrapper"
+                canEdit={false}
+              />
+            </div>
+          </div>
+        </Card>
+
+        <Card id="session-header" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Session Header</h2>
+          <SessionPageHeader
+            workshopType="swot"
+            sessionId="demo-session"
+            sessionTitle="Atelier de demonstration"
+            isOwner={true}
+            canEdit={false}
+            ownerUser={{ name: 'Jane Doe', email: 'jane.doe@example.com' }}
+            date={new Date()}
+            collaborator={{
+              raw: 'Jane Doe',
+              matchedUser: {
+                id: '1',
+                email: 'jane.doe@example.com',
+                name: 'Jane Doe',
+              },
+            }}
+            badges={<Badge variant="primary">DEMO</Badge>}
+          />
+        </Card>
+
+        <Card id="participant-input" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">ParticipantInput</h2>
+          <ParticipantInput name="participant" />
+        </Card>
+
+        <Card id="icons" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Icons</h2>
+          <div className="flex flex-wrap items-center gap-4 text-foreground">
+            <div className="flex items-center gap-2">
+              <IconEdit />
+              <span className="text-sm text-muted">Edit</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <IconTrash />
+              <span className="text-sm text-muted">Trash</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <IconDuplicate />
+              <span className="text-sm text-muted">Duplicate</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <IconPlus />
+              <span className="text-sm text-muted">Plus</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <IconCheck />
+              <span className="text-sm text-muted">Check</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <IconClose />
+              <span className="text-sm text-muted">Close</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <RocketIcon className="h-5 w-5" />
+              <span className="text-sm text-muted">Rocket</span>
+            </div>
+          </div>
+        </Card>
+
+        <Card id="modal" className="p-6">
+          <h2 className="mb-4 text-xl font-semibold text-foreground">Modal</h2>
+          <Button onClick={() => setModalOpen(true)}>Ouvrir la popup</Button>
+        </Card>
+        </div>
+      </div>
+
+      <Modal isOpen={modalOpen} onClose={() => setModalOpen(false)} title="Exemple de popup" size="md">
+        <p className="text-sm text-muted">
+          Ceci est un exemple de modal avec ses actions standardisees.
+        </p>
+        <ModalFooter>
+          <Button variant="outline" onClick={() => setModalOpen(false)}>
+            Annuler
+          </Button>
+          <Button onClick={() => setModalOpen(false)}>Confirmer</Button>
+        </ModalFooter>
+      </Modal>
+    </main>
+  );
+}
diff --git a/src/app/gif-mood/new/page.tsx b/src/app/gif-mood/new/page.tsx
index c5a4926..daf2a77 100644
--- a/src/app/gif-mood/new/page.tsx
+++ b/src/app/gif-mood/new/page.tsx
@@ -9,6 +9,7 @@ import {
   CardDescription,
   CardContent,
   Button,
+  DateInput,
   Input,
 } from '@/components/ui';
 import { createGifMoodSession } from '@/actions/gif-mood';
@@ -78,20 +79,14 @@ export default function NewGifMoodPage() {
               required
             />
 
-            <div>
-              <label htmlFor="date" className="block text-sm font-medium text-foreground mb-1">
-                Date
-              </label>
-              <input
-                id="date"
-                name="date"
-                type="date"
-                value={selectedDate}
-                onChange={(e) => setSelectedDate(e.target.value)}
-                required
-                className="w-full rounded-lg border border-border bg-input px-3 py-2 text-foreground outline-none focus:border-primary focus:ring-2 focus:ring-primary/20"
-              />
-            </div>
+            <DateInput
+              id="date"
+              name="date"
+              label="Date"
+              value={selectedDate}
+              onChange={(e) => setSelectedDate(e.target.value)}
+              required
+            />
 
             <div className="rounded-lg border border-border bg-card-hover p-4">
               <h3 className="font-medium text-foreground mb-2">Comment ça marche ?</h3>
diff --git a/src/app/objectives/page.tsx b/src/app/objectives/page.tsx
index f317dbd..c740495 100644
--- a/src/app/objectives/page.tsx
+++ b/src/app/objectives/page.tsx
@@ -2,7 +2,7 @@ import { auth } from '@/lib/auth';
 import { redirect } from 'next/navigation';
 import Link from 'next/link';
 import { getUserOKRs } from '@/services/okrs';
-import { Card, PageHeader } from '@/components/ui';
+import { Card, PageHeader, getButtonClassName } from '@/components/ui';
 import { ObjectivesList } from '@/components/okrs/ObjectivesList';
 import { comparePeriods } from '@/lib/okr-utils';
 
@@ -46,10 +46,11 @@ export default async function ObjectivesPage() {
             Vous n&apos;avez pas encore d&apos;OKR défini. Contactez un administrateur d&apos;équipe
             pour en créer.
           </p>
-          <Link href="/teams">
-            <span className="inline-block rounded-lg bg-[var(--purple)] px-4 py-2 text-white hover:opacity-90">
-              Voir mes équipes
-            </span>
+          <Link
+            href="/teams"
+            className={getButtonClassName({ variant: 'brand' })}
+          >
+            Voir mes équipes
           </Link>
         </Card>
       ) : (
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4371799..6a764e4 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,4 +1,5 @@
 import Link from 'next/link';
+import { getButtonClassName } from '@/components/ui';
 import { WORKSHOPS, getSessionsTabUrl } from '@/lib/workshops';
 
 export default function Home() {
@@ -888,14 +889,16 @@ function WorkshopCard({
       <div className="flex gap-3">
         <Link
           href={newHref}
-          className="flex-1 rounded-lg px-4 py-2.5 text-center font-medium text-white transition-colors"
+          className={getButtonClassName({
+            className: 'flex-1 border-transparent text-white',
+          })}
           style={{ backgroundColor: accentColor }}
         >
           Démarrer
         </Link>
         <Link
           href={href}
-          className="rounded-lg border border-border px-4 py-2.5 font-medium text-foreground transition-colors hover:bg-card-hover"
+          className={getButtonClassName({ variant: 'outline' })}
         >
           Mes sessions
         </Link>
diff --git a/src/app/profile/PasswordForm.tsx b/src/app/profile/PasswordForm.tsx
index 1f2fa43..fc1ef00 100644
--- a/src/app/profile/PasswordForm.tsx
+++ b/src/app/profile/PasswordForm.tsx
@@ -39,29 +39,20 @@ export function PasswordForm() {
 
   return (
     <form onSubmit={handleSubmit} className="space-y-4">
-      <div>
-        <label
-          htmlFor="currentPassword"
-          className="mb-1.5 block text-sm font-medium text-foreground"
-        >
-          Mot de passe actuel
-        </label>
-        <Input
-          id="currentPassword"
-          type="password"
-          value={currentPassword}
-          onChange={(e) => setCurrentPassword(e.target.value)}
-          required
-        />
-      </div>
+      <Input
+        id="currentPassword"
+        type="password"
+        label="Mot de passe actuel"
+        value={currentPassword}
+        onChange={(e) => setCurrentPassword(e.target.value)}
+        required
+      />
 
       <div>
-        <label htmlFor="newPassword" className="mb-1.5 block text-sm font-medium text-foreground">
-          Nouveau mot de passe
-        </label>
         <Input
           id="newPassword"
           type="password"
+          label="Nouveau mot de passe"
           value={newPassword}
           onChange={(e) => setNewPassword(e.target.value)}
           required
@@ -71,15 +62,10 @@ export function PasswordForm() {
       </div>
 
       <div>
-        <label
-          htmlFor="confirmPassword"
-          className="mb-1.5 block text-sm font-medium text-foreground"
-        >
-          Confirmer le nouveau mot de passe
-        </label>
         <Input
           id="confirmPassword"
           type="password"
+          label="Confirmer le nouveau mot de passe"
           value={confirmPassword}
           onChange={(e) => setConfirmPassword(e.target.value)}
           required
diff --git a/src/app/profile/ProfileForm.tsx b/src/app/profile/ProfileForm.tsx
index 9cb9943..e369e42 100644
--- a/src/app/profile/ProfileForm.tsx
+++ b/src/app/profile/ProfileForm.tsx
@@ -39,31 +39,23 @@ export function ProfileForm({ initialData }: ProfileFormProps) {
 
   return (
     <form onSubmit={handleSubmit} className="space-y-4">
-      <div>
-        <label htmlFor="name" className="mb-1.5 block text-sm font-medium text-foreground">
-          Nom
-        </label>
-        <Input
-          id="name"
-          type="text"
-          value={name}
-          onChange={(e) => setName(e.target.value)}
-          placeholder="Votre nom"
-        />
-      </div>
+      <Input
+        id="name"
+        type="text"
+        label="Nom"
+        value={name}
+        onChange={(e) => setName(e.target.value)}
+        placeholder="Votre nom"
+      />
 
-      <div>
-        <label htmlFor="email" className="mb-1.5 block text-sm font-medium text-foreground">
-          Email
-        </label>
-        <Input
-          id="email"
-          type="email"
-          value={email}
-          onChange={(e) => setEmail(e.target.value)}
-          required
-        />
-      </div>
+      <Input
+        id="email"
+        type="email"
+        label="Email"
+        value={email}
+        onChange={(e) => setEmail(e.target.value)}
+        required
+      />
 
       {message && (
         <p
diff --git a/src/app/sessions/NewWorkshopDropdown.tsx b/src/app/sessions/NewWorkshopDropdown.tsx
index a766694..65e88f0 100644
--- a/src/app/sessions/NewWorkshopDropdown.tsx
+++ b/src/app/sessions/NewWorkshopDropdown.tsx
@@ -1,46 +1,38 @@
 'use client';
 
-import { useState, useRef } from 'react';
 import Link from 'next/link';
-import { Button } from '@/components/ui';
+import { Button, DropdownMenu } from '@/components/ui';
 import { WORKSHOPS } from '@/lib/workshops';
-import { useClickOutside } from '@/hooks/useClickOutside';
 
 export function NewWorkshopDropdown() {
-  const [open, setOpen] = useState(false);
-  const containerRef = useRef<HTMLDivElement>(null);
-  useClickOutside(containerRef, () => setOpen(false), open);
-
   return (
-    <div ref={containerRef} className="relative">
-      <Button
-        type="button"
-        variant="primary"
-        size="sm"
-        onClick={() => setOpen(!open)}
-        className="gap-1.5"
-      >
-        <svg className="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 4v16m8-8H4" />
-        </svg>
-        Nouvel atelier
-        <svg
-          className={`h-3.5 w-3.5 transition-transform ${open ? 'rotate-180' : ''}`}
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
-        >
-          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
-        </svg>
-      </Button>
-      {open && (
-        <div className="absolute right-0 z-20 mt-2 w-60 rounded-xl border border-border bg-card py-1.5 shadow-lg">
+    <DropdownMenu
+      panelClassName="absolute right-0 z-20 mt-2 w-60 rounded-xl border border-border bg-card py-1.5 shadow-lg"
+      trigger={({ open, toggle }) => (
+        <Button type="button" variant="primary" size="sm" onClick={toggle} className="gap-1.5">
+          <svg className="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 4v16m8-8H4" />
+          </svg>
+          Nouvel atelier
+          <svg
+            className={`h-3.5 w-3.5 transition-transform ${open ? 'rotate-180' : ''}`}
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+          >
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+          </svg>
+        </Button>
+      )}
+    >
+      {({ close }) => (
+        <>
           {WORKSHOPS.map((w) => (
             <Link
               key={w.id}
               href={w.newPath}
               className="flex items-center gap-3 px-4 py-2.5 text-sm text-foreground hover:bg-card-hover transition-colors"
-              onClick={() => setOpen(false)}
+              onClick={close}
             >
               <span
                 className="flex h-8 w-8 items-center justify-center rounded-lg text-base flex-shrink-0"
@@ -54,8 +46,8 @@ export function NewWorkshopDropdown() {
               </div>
             </Link>
           ))}
-        </div>
+        </>
       )}
-    </div>
+    </DropdownMenu>
   );
 }
diff --git a/src/app/sessions/SessionCard.tsx b/src/app/sessions/SessionCard.tsx
index c656fe0..9ccfbbb 100644
--- a/src/app/sessions/SessionCard.tsx
+++ b/src/app/sessions/SessionCard.tsx
@@ -2,7 +2,16 @@
 
 import { useState, useTransition } from 'react';
 import Link from 'next/link';
-import { Button, Modal, ModalFooter, Input, CollaboratorDisplay } from '@/components/ui';
+import {
+  Button,
+  Modal,
+  ModalFooter,
+  Input,
+  CollaboratorDisplay,
+  IconButton,
+  IconEdit,
+  IconTrash,
+} from '@/components/ui';
 import { deleteSwotSession, updateSwotSession } from '@/actions/session';
 import { deleteMotivatorSession, updateMotivatorSession } from '@/actions/moving-motivators';
 import { deleteYearReviewSession, updateYearReviewSession } from '@/actions/year-review';
@@ -211,25 +220,21 @@ export function SessionCard({
     <>
       {(session.isOwner || session.role === 'EDITOR' || session.isTeamCollab) && (
         <div className={`absolute flex gap-1 opacity-0 group-hover:opacity-100 transition-opacity z-20 ${view === 'table' ? 'top-1/2 -translate-y-1/2 right-3' : 'top-2.5 right-2.5'}`}>
-          <button
+          <IconButton
             onClick={(e) => { e.preventDefault(); e.stopPropagation(); openEditModal(); }}
-            className="p-1.5 rounded-lg bg-card border border-border text-muted hover:text-primary hover:bg-primary/5 shadow-sm"
-            title="Modifier"
-          >
-            <svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
-            </svg>
-          </button>
+            label="Modifier"
+            icon={<IconEdit />}
+            variant="primary"
+            className="bg-card shadow-sm"
+          />
           {(session.isOwner || session.isTeamCollab) && (
-            <button
+            <IconButton
               onClick={(e) => { e.preventDefault(); e.stopPropagation(); setShowDeleteModal(true); }}
-              className="p-1.5 rounded-lg bg-card border border-border text-muted hover:text-destructive hover:bg-destructive/5 shadow-sm"
-              title="Supprimer"
-            >
-              <svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
-              </svg>
-            </button>
+              label="Supprimer"
+              icon={<IconTrash />}
+              variant="destructive"
+              className="bg-card shadow-sm"
+            />
           )}
         </div>
       )}
@@ -247,19 +252,15 @@ export function SessionCard({
 
       <Modal isOpen={showEditModal} onClose={() => setShowEditModal(false)} title="Modifier l'atelier" size="sm">
         <form onSubmit={(e) => { e.preventDefault(); handleEdit(); }} className="space-y-4">
+          <Input id="edit-title" label="Titre" value={editTitle} onChange={(e) => setEditTitle(e.target.value)} placeholder="Titre de l'atelier" required />
           <div>
-            <label htmlFor="edit-title" className="block text-sm font-medium text-foreground mb-1">Titre</label>
-            <Input id="edit-title" value={editTitle} onChange={(e) => setEditTitle(e.target.value)} placeholder="Titre de l'atelier" required />
-          </div>
-          <div>
-            <label htmlFor="edit-participant" className="block text-sm font-medium text-foreground mb-1">{workshop.participantLabel}</label>
             {!isWeather && !isGifMood && (
-              <Input id="edit-participant" value={editParticipant} onChange={(e) => setEditParticipant(e.target.value)}
+              <Input id="edit-participant" label={workshop.participantLabel} value={editParticipant} onChange={(e) => setEditParticipant(e.target.value)}
                 placeholder={isSwot ? 'Nom du collaborateur' : 'Nom du participant'} required />
             )}
           </div>
           <ModalFooter>
-            <Button type="button" variant="ghost" onClick={() => setShowEditModal(false)} disabled={isPending}>Annuler</Button>
+            <Button type="button" variant="outline" onClick={() => setShowEditModal(false)} disabled={isPending}>Annuler</Button>
             <Button type="submit" disabled={isPending || !editTitle.trim() || (!isWeather && !isGifMood && !editParticipant.trim())}>
               {isPending ? 'Enregistrement...' : 'Enregistrer'}
             </Button>
@@ -272,7 +273,7 @@ export function SessionCard({
           <p className="text-muted">Êtes-vous sûr de vouloir supprimer <strong className="text-foreground">&quot;{session.title}&quot;</strong> ?</p>
           <p className="text-sm text-destructive">Cette action est irréversible. Toutes les données seront perdues.</p>
           <ModalFooter>
-            <Button variant="ghost" onClick={() => setShowDeleteModal(false)} disabled={isPending}>Annuler</Button>
+            <Button variant="outline" onClick={() => setShowDeleteModal(false)} disabled={isPending}>Annuler</Button>
             <Button variant="destructive" onClick={handleDelete} disabled={isPending}>{isPending ? 'Suppression...' : 'Supprimer'}</Button>
           </ModalFooter>
         </div>
diff --git a/src/app/teams/[id]/page.tsx b/src/app/teams/[id]/page.tsx
index a591084..1ecbc04 100644
--- a/src/app/teams/[id]/page.tsx
+++ b/src/app/teams/[id]/page.tsx
@@ -52,7 +52,7 @@ export default async function TeamDetailPage({ params }: TeamDetailPageProps) {
           isAdmin ? (
             <div className="flex items-center gap-3">
               <Link href={`/teams/${id}/okrs/new`}>
-                <Button className="bg-[var(--purple)] text-white hover:opacity-90 border-transparent">
+                <Button variant="brand" size="sm">
                   Définir un OKR
                 </Button>
               </Link>
diff --git a/src/app/teams/new/page.tsx b/src/app/teams/new/page.tsx
index 2b1158a..20e41ac 100644
--- a/src/app/teams/new/page.tsx
+++ b/src/app/teams/new/page.tsx
@@ -79,7 +79,7 @@ export default function NewTeamPage() {
             <Button
               type="submit"
               disabled={submitting}
-              className="bg-[var(--purple)] text-white hover:opacity-90 border-transparent"
+              variant="brand"
             >
               {submitting ? 'Création...' : "Créer l'équipe"}
             </Button>
diff --git a/src/app/teams/page.tsx b/src/app/teams/page.tsx
index 6702e36..1924696 100644
--- a/src/app/teams/page.tsx
+++ b/src/app/teams/page.tsx
@@ -22,7 +22,7 @@ export default async function TeamsPage() {
         subtitle={`${teams.length} équipe${teams.length !== 1 ? 's' : ''} · Collaborez et définissez vos OKRs`}
         actions={
           <Link href="/teams/new">
-            <Button className="bg-[var(--purple)] text-white hover:opacity-90 border-transparent">
+            <Button variant="brand" size="sm">
               Créer une équipe
             </Button>
           </Link>
@@ -44,7 +44,7 @@ export default async function TeamsPage() {
             Créez votre première équipe pour commencer à définir des OKRs
           </div>
           <Link href="/teams/new" className="mt-6">
-            <Button className="!bg-[var(--purple)] !text-white hover:!bg-[var(--purple)]/90">
+            <Button variant="brand">
               Créer une équipe
             </Button>
           </Link>
diff --git a/src/app/weather/new/page.tsx b/src/app/weather/new/page.tsx
index a5572d6..3ed0377 100644
--- a/src/app/weather/new/page.tsx
+++ b/src/app/weather/new/page.tsx
@@ -9,6 +9,7 @@ import {
   CardDescription,
   CardContent,
   Button,
+  DateInput,
   Input,
 } from '@/components/ui';
 import { createWeatherSession } from '@/actions/weather';
@@ -93,20 +94,14 @@ export default function NewWeatherPage() {
               required
             />
 
-            <div>
-              <label htmlFor="date" className="block text-sm font-medium text-foreground mb-1">
-                Date de la météo
-              </label>
-              <input
-                id="date"
-                name="date"
-                type="date"
-                value={selectedDate}
-                onChange={handleDateChange}
-                required
-                className="w-full rounded-lg border border-border bg-input px-3 py-2 text-foreground outline-none focus:border-primary focus:ring-2 focus:ring-primary/20"
-              />
-            </div>
+            <DateInput
+              id="date"
+              name="date"
+              label="Date de la météo"
+              value={selectedDate}
+              onChange={handleDateChange}
+              required
+            />
 
             <div className="rounded-lg border border-border bg-card-hover p-4">
               <h3 className="font-medium text-foreground mb-2">Comment ça marche ?</h3>
diff --git a/src/app/weekly-checkin/new/page.tsx b/src/app/weekly-checkin/new/page.tsx
index 2ebbcb1..9eab01a 100644
--- a/src/app/weekly-checkin/new/page.tsx
+++ b/src/app/weekly-checkin/new/page.tsx
@@ -9,6 +9,7 @@ import {
   CardDescription,
   CardContent,
   Button,
+  DateInput,
   Input,
   ParticipantInput,
 } from '@/components/ui';
@@ -98,20 +99,14 @@ export default function NewWeeklyCheckInPage() {
 
             <ParticipantInput name="participant" required />
 
-            <div>
-              <label htmlFor="date" className="block text-sm font-medium text-foreground mb-1">
-                Date du check-in
-              </label>
-              <input
-                id="date"
-                name="date"
-                type="date"
-                value={selectedDate}
-                onChange={handleDateChange}
-                required
-                className="w-full rounded-lg border border-border bg-input px-3 py-2 text-foreground outline-none focus:border-primary focus:ring-2 focus:ring-primary/20"
-              />
-            </div>
+            <DateInput
+              id="date"
+              name="date"
+              label="Date du check-in"
+              value={selectedDate}
+              onChange={handleDateChange}
+              required
+            />
 
             <div className="rounded-lg border border-border bg-card-hover p-4">
               <h3 className="font-medium text-foreground mb-2">Comment ça marche ?</h3>
diff --git a/src/app/year-review/new/page.tsx b/src/app/year-review/new/page.tsx
index 9f74430..f456266 100644
--- a/src/app/year-review/new/page.tsx
+++ b/src/app/year-review/new/page.tsx
@@ -9,6 +9,7 @@ import {
   CardDescription,
   CardContent,
   Button,
+  NumberInput,
   Input,
   ParticipantInput,
 } from '@/components/ui';
@@ -79,21 +80,15 @@ export default function NewYearReviewPage() {
 
             <ParticipantInput name="participant" required />
 
-            <div>
-              <label htmlFor="year" className="block text-sm font-medium text-foreground mb-1">
-                Année du bilan
-              </label>
-              <input
-                id="year"
-                name="year"
-                type="number"
-                min="2000"
-                max="2100"
-                defaultValue={currentYear}
-                required
-                className="w-full rounded-lg border border-border bg-input px-3 py-2 text-foreground outline-none focus:border-primary focus:ring-2 focus:ring-primary/20"
-              />
-            </div>
+            <NumberInput
+              id="year"
+              name="year"
+              label="Année du bilan"
+              min="2000"
+              max="2100"
+              defaultValue={currentYear}
+              required
+            />
 
             <div className="rounded-lg border border-border bg-card-hover p-4">
               <h3 className="font-medium text-foreground mb-2">Comment ça marche ?</h3>
diff --git a/src/components/collaboration/ShareModal.tsx b/src/components/collaboration/ShareModal.tsx
index fd5c1bc..23f12bb 100644
--- a/src/components/collaboration/ShareModal.tsx
+++ b/src/components/collaboration/ShareModal.tsx
@@ -2,12 +2,17 @@
 
 import { useState, useTransition } from 'react';
 import Link from 'next/link';
-import { Modal } from '@/components/ui/Modal';
-import { Input } from '@/components/ui/Input';
-import { Button } from '@/components/ui/Button';
-import { Badge } from '@/components/ui/Badge';
-import { Avatar } from '@/components/ui/Avatar';
-import { Select } from '@/components/ui/Select';
+import {
+  Modal,
+  Input,
+  Button,
+  Badge,
+  Avatar,
+  Select,
+  SegmentedControl,
+  IconButton,
+  IconTrash,
+} from '@/components/ui';
 import { getTeamMembersForShare, type TeamWithMembers, type Share } from '@/lib/share-utils';
 import type { ShareRole } from '@prisma/client';
 
@@ -117,24 +122,20 @@ export function ShareModal({
 
         {isOwner && (
           <form onSubmit={handleShare} className="space-y-4">
-            <div className="flex gap-2 border-b border-border pb-3 flex-wrap">
-              {tabs.map((tab) => (
-                <button
-                  key={tab.value}
-                  type="button"
-                  onClick={() => {
-                    setShareType(tab.value);
-                    resetForm();
-                  }}
-                  className={`flex-1 min-w-0 rounded-lg px-4 py-2 text-sm font-medium transition-colors ${
-                    shareType === tab.value
-                      ? 'bg-primary text-primary-foreground'
-                      : 'bg-card-hover text-muted hover:text-foreground'
-                  }`}
-                >
-                  {tab.icon} {tab.label}
-                </button>
-              ))}
+            <div className="border-b border-border pb-3">
+              <SegmentedControl
+                value={shareType}
+                onChange={(value) => {
+                  setShareType(value);
+                  resetForm();
+                }}
+                fullWidth
+                className="flex w-full gap-2 border-0 bg-transparent p-0"
+                options={tabs.map((tab) => ({
+                  value: tab.value,
+                  label: `${tab.icon} ${tab.label}`,
+                }))}
+              />
             </div>
 
             {shareType === 'email' && (
@@ -271,25 +272,13 @@ export function ShareModal({
                       {share.role === 'EDITOR' ? 'Éditeur' : 'Lecteur'}
                     </Badge>
                     {isOwner && (
-                      <button
+                      <IconButton
+                        icon={<IconTrash className="h-4 w-4" />}
+                        label="Retirer l'accès"
+                        variant="destructive"
                         onClick={() => handleRemove(share.user.id)}
                         disabled={isPending}
-                        className="rounded p-1 text-muted hover:bg-destructive/10 hover:text-destructive"
-                        title="Retirer l'accès"
-                      >
-                        <svg
-                          xmlns="http://www.w3.org/2000/svg"
-                          viewBox="0 0 20 20"
-                          fill="currentColor"
-                          className="h-4 w-4"
-                        >
-                          <path
-                            fillRule="evenodd"
-                            d="M8.75 1A2.75 2.75 0 006 3.75v.443c-.795.077-1.584.176-2.365.298a.75.75 0 10.23 1.482l.149-.022.841 10.518A2.75 2.75 0 007.596 19h4.807a2.75 2.75 0 002.742-2.53l.841-10.52.149.023a.75.75 0 00.23-1.482A41.03 41.03 0 0014 4.193V3.75A2.75 2.75 0 0011.25 1h-2.5zM10 4c.84 0 1.673.025 2.5.075V3.75c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25v.325C8.327 4.025 9.16 4 10 4zM8.58 7.72a.75.75 0 00-1.5.06l.3 7.5a.75.75 0 101.5-.06l-.3-7.5zm4.34.06a.75.75 0 10-1.5-.06l-.3 7.5a.75.75 0 101.5.06l.3-7.5z"
-                            clipRule="evenodd"
-                          />
-                        </svg>
-                      </button>
+                      />
                     )}
                   </div>
                 </li>
diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
index 6b36146..b8104e9 100644
--- a/src/components/layout/Header.tsx
+++ b/src/components/layout/Header.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 import { auth } from '@/lib/auth';
-import { RocketIcon } from '@/components/ui';
+import { RocketIcon, getButtonClassName } from '@/components/ui';
 import { ThemeToggle } from './ThemeToggle';
 import { UserMenu } from './UserMenu';
 import { WorkshopsDropdown } from './WorkshopsDropdown';
@@ -36,7 +36,7 @@ export async function Header() {
           ) : (
             <Link
               href="/login"
-              className="flex h-9 items-center rounded-lg bg-primary px-4 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary-hover"
+              className={getButtonClassName({ size: 'sm' })}
             >
               Connexion
             </Link>
diff --git a/src/components/layout/NavLinks.tsx b/src/components/layout/NavLinks.tsx
index 6b696be..bc19235 100644
--- a/src/components/layout/NavLinks.tsx
+++ b/src/components/layout/NavLinks.tsx
@@ -5,6 +5,7 @@ import { usePathname } from 'next/navigation';
 
 export function NavLinks() {
   const pathname = usePathname();
+  const isDev = process.env.NODE_ENV !== 'production';
 
   const isActiveLink = (path: string) => pathname.startsWith(path);
 
@@ -38,6 +39,17 @@ export function NavLinks() {
       >
         👥 Équipes
       </Link>
+
+      {isDev && (
+        <Link
+          href="/design-system"
+          className={`text-sm font-medium transition-colors ${
+            isActiveLink('/design-system') ? 'text-primary' : 'text-muted hover:text-foreground'
+          }`}
+        >
+          🎨 UI Guide
+        </Link>
+      )}
     </>
   );
 }
diff --git a/src/components/layout/UserMenu.tsx b/src/components/layout/UserMenu.tsx
index dd70b9b..30f0e9c 100644
--- a/src/components/layout/UserMenu.tsx
+++ b/src/components/layout/UserMenu.tsx
@@ -2,9 +2,7 @@
 
 import Link from 'next/link';
 import { signOut } from 'next-auth/react';
-import { useState, useRef } from 'react';
-import { Avatar } from '@/components/ui';
-import { useClickOutside } from '@/hooks/useClickOutside';
+import { Avatar, DropdownMenu } from '@/components/ui';
 
 interface UserMenuProps {
   userName: string | null | undefined;
@@ -12,51 +10,45 @@ interface UserMenuProps {
 }
 
 export function UserMenu({ userName, userEmail }: UserMenuProps) {
-  const [menuOpen, setMenuOpen] = useState(false);
-  const userMenuRef = useRef<HTMLDivElement>(null);
-  useClickOutside(userMenuRef, () => setMenuOpen(false), menuOpen);
-
   return (
-    <div ref={userMenuRef} className="relative">
-      <button
-        onClick={() => setMenuOpen(!menuOpen)}
-        className="flex h-9 items-center gap-2 rounded-lg border border-border bg-card pl-1.5 pr-3 transition-colors hover:bg-card-hover"
-      >
-        <Avatar email={userEmail} name={userName} size={24} />
-        <span className="text-sm font-medium text-foreground">
-          {userName || userEmail.split('@')[0]}
-        </span>
-        <svg
-          className={`h-4 w-4 text-muted transition-transform ${menuOpen ? 'rotate-180' : ''}`}
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
+    <DropdownMenu
+      panelClassName="absolute right-0 z-20 mt-2 w-48 rounded-lg border border-border bg-card py-1 shadow-lg"
+      trigger={({ open, toggle }) => (
+        <button
+          onClick={toggle}
+          className="flex h-9 items-center gap-2 rounded-lg border border-border bg-card pl-1.5 pr-3 transition-colors hover:bg-card-hover"
         >
-          <path
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            strokeWidth={2}
-            d="M19 9l-7 7-7-7"
-          />
-        </svg>
-      </button>
-
-      {menuOpen && (
-        <div className="absolute right-0 z-20 mt-2 w-48 rounded-lg border border-border bg-card py-1 shadow-lg">
+          <Avatar email={userEmail} name={userName} size={24} />
+          <span className="text-sm font-medium text-foreground">
+            {userName || userEmail.split('@')[0]}
+          </span>
+          <svg
+            className={`h-4 w-4 text-muted transition-transform ${open ? 'rotate-180' : ''}`}
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+          >
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+          </svg>
+        </button>
+      )}
+    >
+      {({ close }) => (
+        <>
           <div className="border-b border-border px-4 py-2">
             <p className="text-xs text-muted">Connecté en tant que</p>
             <p className="truncate text-sm font-medium text-foreground">{userEmail}</p>
           </div>
           <Link
             href="/profile"
-            onClick={() => setMenuOpen(false)}
+            onClick={close}
             className="block w-full px-4 py-2 text-left text-sm text-foreground hover:bg-card-hover"
           >
             👤 Mon Profil
           </Link>
           <Link
             href="/users"
-            onClick={() => setMenuOpen(false)}
+            onClick={close}
             className="block w-full px-4 py-2 text-left text-sm text-foreground hover:bg-card-hover"
           >
             👥 Utilisateurs
@@ -67,8 +59,8 @@ export function UserMenu({ userName, userEmail }: UserMenuProps) {
           >
             Se déconnecter
           </button>
-        </div>
+        </>
       )}
-    </div>
+    </DropdownMenu>
   );
 }
diff --git a/src/components/layout/WorkshopsDropdown.tsx b/src/components/layout/WorkshopsDropdown.tsx
index fde83c8..4a0f97b 100644
--- a/src/components/layout/WorkshopsDropdown.tsx
+++ b/src/components/layout/WorkshopsDropdown.tsx
@@ -2,52 +2,46 @@
 
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
-import { useState, useRef } from 'react';
+import { DropdownMenu } from '@/components/ui';
 import { WORKSHOPS } from '@/lib/workshops';
-import { useClickOutside } from '@/hooks/useClickOutside';
 
 export function WorkshopsDropdown() {
-  const [workshopsOpen, setWorkshopsOpen] = useState(false);
-  const workshopsDropdownRef = useRef<HTMLDivElement>(null);
-  useClickOutside(workshopsDropdownRef, () => setWorkshopsOpen(false), workshopsOpen);
   const pathname = usePathname();
 
   const isActiveLink = (path: string) => pathname.startsWith(path);
 
   return (
-    <div className="relative" ref={workshopsDropdownRef}>
-      <button
-        onClick={() => setWorkshopsOpen(!workshopsOpen)}
-        className={`flex items-center gap-1 text-sm font-medium transition-colors ${
-          WORKSHOPS.some((w) => isActiveLink(w.path))
-            ? 'text-primary'
-            : 'text-muted hover:text-foreground'
-        }`}
-      >
-        Nouvel atelier
-        <svg
-          className={`h-4 w-4 transition-transform ${workshopsOpen ? 'rotate-180' : ''}`}
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
+    <DropdownMenu
+      panelClassName="absolute left-0 z-20 mt-2 w-56 rounded-lg border border-border bg-card py-1 shadow-lg"
+      trigger={({ open, toggle }) => (
+        <button
+          onClick={toggle}
+          className={`flex items-center gap-1 text-sm font-medium transition-colors ${
+            WORKSHOPS.some((w) => isActiveLink(w.path))
+              ? 'text-primary'
+              : 'text-muted hover:text-foreground'
+          }`}
         >
-          <path
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            strokeWidth={2}
-            d="M19 9l-7 7-7-7"
-          />
-        </svg>
-      </button>
-
-      {workshopsOpen && (
-        <div className="absolute left-0 z-20 mt-2 w-56 rounded-lg border border-border bg-card py-1 shadow-lg">
+          Nouvel atelier
+          <svg
+            className={`h-4 w-4 transition-transform ${open ? 'rotate-180' : ''}`}
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+          >
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+          </svg>
+        </button>
+      )}
+    >
+      {({ close }) => (
+        <>
           {WORKSHOPS.map((w) => (
             <Link
               key={w.id}
               href={w.newPath}
               className="flex items-center gap-3 px-4 py-2.5 text-sm text-foreground hover:bg-card-hover"
-              onClick={() => setWorkshopsOpen(false)}
+              onClick={close}
             >
               <span className="text-lg">{w.icon}</span>
               <div>
@@ -56,8 +50,8 @@ export function WorkshopsDropdown() {
               </div>
             </Link>
           ))}
-        </div>
+        </>
       )}
-    </div>
+    </DropdownMenu>
   );
 }
diff --git a/src/components/moving-motivators/MotivatorBoard.tsx b/src/components/moving-motivators/MotivatorBoard.tsx
index c196a0b..26297af 100644
--- a/src/components/moving-motivators/MotivatorBoard.tsx
+++ b/src/components/moving-motivators/MotivatorBoard.tsx
@@ -17,6 +17,7 @@ import {
   arrayMove,
 } from '@dnd-kit/sortable';
 import type { MotivatorCard as MotivatorCardType } from '@/lib/types';
+import { Button } from '@/components/ui';
 import { MotivatorCard } from './MotivatorCard';
 import { MotivatorSummary } from './MotivatorSummary';
 import { InfluenceZone } from './InfluenceZone';
@@ -167,12 +168,9 @@ export function MotivatorBoard({ sessionId, cards: initialCards, canEdit }: Moti
 
           {/* Next button */}
           <div className="flex justify-end">
-            <button
-              onClick={nextStep}
-              className="px-6 py-2 bg-primary text-primary-foreground rounded-lg font-medium hover:bg-primary/90 transition-colors"
-            >
+            <Button onClick={nextStep} className="px-6">
               Suivant →
-            </button>
+            </Button>
           </div>
         </div>
       )}
@@ -197,18 +195,12 @@ export function MotivatorBoard({ sessionId, cards: initialCards, canEdit }: Moti
 
           {/* Navigation buttons */}
           <div className="flex justify-between">
-            <button
-              onClick={prevStep}
-              className="px-6 py-2 border border-border rounded-lg font-medium hover:bg-card transition-colors"
-            >
+            <Button onClick={prevStep} variant="outline" className="px-6">
               ← Retour
-            </button>
-            <button
-              onClick={nextStep}
-              className="px-6 py-2 bg-primary text-primary-foreground rounded-lg font-medium hover:bg-primary/90 transition-colors"
-            >
+            </Button>
+            <Button onClick={nextStep} className="px-6">
               Voir le récapitulatif →
-            </button>
+            </Button>
           </div>
         </div>
       )}
@@ -226,12 +218,9 @@ export function MotivatorBoard({ sessionId, cards: initialCards, canEdit }: Moti
 
           {/* Navigation buttons */}
           <div className="flex justify-start">
-            <button
-              onClick={prevStep}
-              className="px-6 py-2 border border-border rounded-lg font-medium hover:bg-card transition-colors"
-            >
+            <Button onClick={prevStep} variant="outline" className="px-6">
               ← Modifier
-            </button>
+            </Button>
           </div>
         </div>
       )}
diff --git a/src/components/okrs/OKRCard.tsx b/src/components/okrs/OKRCard.tsx
index 8a83d24..413acb0 100644
--- a/src/components/okrs/OKRCard.tsx
+++ b/src/components/okrs/OKRCard.tsx
@@ -3,8 +3,7 @@
 import { useTransition } from 'react';
 import { useRouter } from 'next/navigation';
 import Link from 'next/link';
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui';
-import { Badge } from '@/components/ui';
+import { Badge, Card, CardContent, CardHeader, CardTitle, IconButton, IconTrash } from '@/components/ui';
 import { getGravatarUrl } from '@/lib/gravatar';
 import type { OKR, KeyResult, OKRStatus, KeyResultStatus } from '@/lib/types';
 import { OKR_STATUS_LABELS, KEY_RESULT_STATUS_LABELS } from '@/lib/types';
@@ -143,32 +142,20 @@ export function OKRCard({ okr, teamId, isAdmin = false, compact = false }: OKRCa
               </div>
               <div className="flex items-center gap-1.5 flex-shrink-0 relative z-10">
                 {isAdmin && (
-                  <button
+                  <IconButton
+                    icon={<IconTrash className="h-3 w-3" />}
+                    label="Supprimer l'OKR"
+                    variant="destructive"
+                    size="xs"
                     onClick={handleDelete}
-                    className="h-5 w-5 p-0 flex items-center justify-center rounded hover:bg-destructive/10 transition-colors flex-shrink-0"
+                    className="flex-shrink-0"
                     style={{
                       color: 'var(--destructive)',
                       border: '1px solid color-mix(in srgb, var(--destructive) 40%, transparent)',
                       backgroundColor: 'color-mix(in srgb, var(--destructive) 5%, transparent)',
                     }}
                     disabled={isPending}
-                    title="Supprimer l'OKR"
-                  >
-                    <svg
-                      className="h-3 w-3"
-                      fill="none"
-                      stroke="currentColor"
-                      viewBox="0 0 24 24"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                        strokeWidth={2.5}
-                        d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
-                      />
-                    </svg>
-                  </button>
+                  />
                 )}
                 <Badge
                   style={{
@@ -255,32 +242,20 @@ export function OKRCard({ okr, teamId, isAdmin = false, compact = false }: OKRCa
           {/* Action Zone */}
           <div className="flex items-center gap-2 flex-shrink-0 relative z-10">
             {isAdmin && (
-              <button
+              <IconButton
+                icon={<IconTrash className="h-4 w-4" />}
+                label="Supprimer l'OKR"
+                variant="destructive"
+                size="sm"
                 onClick={handleDelete}
-                className="h-6 w-6 p-0 flex items-center justify-center rounded hover:bg-destructive/10 transition-colors flex-shrink-0"
+                className="flex-shrink-0"
                 style={{
                   color: 'var(--destructive)',
                   border: '1px solid color-mix(in srgb, var(--destructive) 40%, transparent)',
                   backgroundColor: 'color-mix(in srgb, var(--destructive) 5%, transparent)',
                 }}
                 disabled={isPending}
-                title="Supprimer l'OKR"
-              >
-                <svg
-                  className="h-4 w-4"
-                  fill="none"
-                  stroke="currentColor"
-                  viewBox="0 0 24 24"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth={2.5}
-                    d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
-                  />
-                </svg>
-              </button>
+              />
             )}
             <Badge
               style={{
diff --git a/src/components/okrs/OKRForm.tsx b/src/components/okrs/OKRForm.tsx
index 59c67f8..d216532 100644
--- a/src/components/okrs/OKRForm.tsx
+++ b/src/components/okrs/OKRForm.tsx
@@ -478,7 +478,7 @@ export function OKRForm({ teamMembers, onSubmit, onCancel, initialData }: OKRFor
         <Button
           type="submit"
           disabled={submitting}
-          className="bg-[var(--purple)] text-white hover:opacity-90 border-transparent"
+          variant="brand"
         >
           {submitting
             ? initialData?.teamMemberId
diff --git a/src/components/swot/ActionPanel.tsx b/src/components/swot/ActionPanel.tsx
index 0fc6759..2a16cd2 100644
--- a/src/components/swot/ActionPanel.tsx
+++ b/src/components/swot/ActionPanel.tsx
@@ -2,7 +2,18 @@
 
 import { useState, useTransition } from 'react';
 import type { SwotItem, Action, ActionLink, SwotCategory } from '@prisma/client';
-import { Button, Badge, Modal, ModalFooter, Input, Textarea, Select } from '@/components/ui';
+import {
+  Button,
+  Badge,
+  Modal,
+  ModalFooter,
+  Input,
+  Textarea,
+  Select,
+  IconButton,
+  IconEdit,
+  IconTrash,
+} from '@/components/ui';
 import { createAction, updateAction, deleteAction } from '@/actions/swot';
 
 type ActionWithLinks = Action & {
@@ -202,44 +213,19 @@ export function ActionPanel({
               <div className="flex items-start justify-between gap-2">
                 <h3 className="font-medium text-foreground line-clamp-2">{action.title}</h3>
                 <div className="flex shrink-0 items-center gap-1">
-                  <button
+                  <IconButton
+                    icon={<IconEdit />}
+                    label="Modifier"
                     onClick={() => openEditModal(action)}
-                    className="rounded p-1 text-muted opacity-0 transition-opacity hover:bg-card-hover hover:text-foreground group-hover:opacity-100"
-                    aria-label="Modifier"
-                  >
-                    <svg
-                      className="h-3.5 w-3.5"
-                      fill="none"
-                      viewBox="0 0 24 24"
-                      stroke="currentColor"
-                    >
-                      <path
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                        strokeWidth={2}
-                        d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z"
-                      />
-                    </svg>
-                  </button>
-                  <button
+                    className="opacity-0 transition-opacity group-hover:opacity-100"
+                  />
+                  <IconButton
+                    icon={<IconTrash />}
+                    label="Supprimer"
+                    variant="destructive"
                     onClick={() => handleDelete(action.id)}
-                    className="rounded p-1 text-muted opacity-0 transition-opacity hover:bg-destructive/10 hover:text-destructive group-hover:opacity-100"
-                    aria-label="Supprimer"
-                  >
-                    <svg
-                      className="h-3.5 w-3.5"
-                      fill="none"
-                      viewBox="0 0 24 24"
-                      stroke="currentColor"
-                    >
-                      <path
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                        strokeWidth={2}
-                        d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
-                      />
-                    </svg>
-                  </button>
+                    className="opacity-0 transition-opacity group-hover:opacity-100"
+                  />
                 </div>
               </div>
 
@@ -377,35 +363,37 @@ export function ActionPanel({
               <label className="mb-2 block text-sm font-medium text-foreground">Priorité</label>
               <div className="flex gap-2">
                 {priorityLabels.map((label, index) => (
-                  <button
+                  <Button
                     key={index}
                     type="button"
+                    variant="outline"
+                    size="sm"
                     onClick={() => setPriority(index)}
                     className={`
-                      flex-1 rounded-lg border px-3 py-2 text-sm font-medium transition-colors
+                      flex-1
                       ${
                         priority === index
                           ? index === 2
                             ? 'border-destructive bg-destructive/10 text-destructive'
                             : index === 1
                               ? 'border-warning bg-warning/10 text-warning'
-                              : 'border-primary bg-primary/10 text-primary'
+                            : 'border-primary bg-primary/10 text-primary'
                           : 'border-border bg-card text-muted hover:bg-card-hover'
                       }
                     `}
                   >
                     {label}
-                  </button>
+                  </Button>
                 ))}
               </div>
             </div>
           </div>
 
           <ModalFooter>
-            <Button type="button" variant="outline" onClick={closeModal}>
+            <Button type="button" variant="outline" size="sm" onClick={closeModal}>
               Annuler
             </Button>
-            <Button type="submit" loading={isPending}>
+            <Button type="submit" size="sm" loading={isPending}>
               {editingAction ? 'Enregistrer' : "Créer l'action"}
             </Button>
           </ModalFooter>
diff --git a/src/components/swot/SwotBoard.tsx b/src/components/swot/SwotBoard.tsx
index 32c7f00..bdc174f 100644
--- a/src/components/swot/SwotBoard.tsx
+++ b/src/components/swot/SwotBoard.tsx
@@ -6,6 +6,7 @@ import type { SwotItem, Action, ActionLink, SwotCategory } from '@prisma/client'
 import { SwotQuadrant } from './SwotQuadrant';
 import { SwotCard } from './SwotCard';
 import { ActionPanel } from './ActionPanel';
+import { Button } from '@/components/ui';
 import { moveSwotItem } from '@/actions/swot';
 
 type ActionWithLinks = Action & {
@@ -94,12 +95,9 @@ export function SwotBoard({ sessionId, items, actions }: SwotBoardProps) {
               </p>
             </div>
           </div>
-          <button
-            onClick={exitLinkMode}
-            className="rounded-lg border border-border bg-card px-4 py-2 text-sm font-medium hover:bg-card-hover"
-          >
+          <Button onClick={exitLinkMode} variant="outline" size="sm">
             Annuler
-          </button>
+          </Button>
         </div>
       )}
 
diff --git a/src/components/swot/SwotCard.tsx b/src/components/swot/SwotCard.tsx
index b2309d7..2be78c1 100644
--- a/src/components/swot/SwotCard.tsx
+++ b/src/components/swot/SwotCard.tsx
@@ -3,7 +3,7 @@
 import { forwardRef, memo, useState, useTransition } from 'react';
 import type { SwotItem, SwotCategory } from '@prisma/client';
 import { updateSwotItem, deleteSwotItem, duplicateSwotItem } from '@/actions/swot';
-import { IconEdit, IconTrash, IconDuplicate, IconCheck } from '@/components/ui';
+import { IconEdit, IconTrash, IconDuplicate, IconCheck, IconButton } from '@/components/ui';
 
 interface SwotCardProps {
   item: SwotItem;
@@ -114,30 +114,32 @@ export const SwotCard = memo(
               {/* Actions (visible on hover) */}
               {!linkMode && (
                 <div className="absolute right-1 top-1 flex gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-                  <button
+                  <IconButton
+                    icon={<IconEdit />}
+                    label="Modifier"
                     onClick={(e) => {
                       e.stopPropagation();
                       setIsEditing(true);
                     }}
-                    className="rounded p-1 text-muted hover:bg-card-hover hover:text-foreground"
-                    aria-label="Modifier"
-                  >
-                    <IconEdit />
-                  </button>
-                  <button
-                    onClick={(e) => { e.stopPropagation(); handleDuplicate(); }}
-                    className="rounded p-1 text-muted hover:bg-primary/10 hover:text-primary"
-                    aria-label="Dupliquer"
-                  >
-                    <IconDuplicate />
-                  </button>
-                  <button
-                    onClick={(e) => { e.stopPropagation(); handleDelete(); }}
-                    className="rounded p-1 text-muted hover:bg-destructive/10 hover:text-destructive"
-                    aria-label="Supprimer"
-                  >
-                    <IconTrash />
-                  </button>
+                  />
+                  <IconButton
+                    icon={<IconDuplicate />}
+                    label="Dupliquer"
+                    variant="primary"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      handleDuplicate();
+                    }}
+                  />
+                  <IconButton
+                    icon={<IconTrash />}
+                    label="Supprimer"
+                    variant="destructive"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      handleDelete();
+                    }}
+                  />
                 </div>
               )}
 
diff --git a/src/components/swot/SwotQuadrant.tsx b/src/components/swot/SwotQuadrant.tsx
index d657d98..fcf02ce 100644
--- a/src/components/swot/SwotQuadrant.tsx
+++ b/src/components/swot/SwotQuadrant.tsx
@@ -4,7 +4,7 @@ import { forwardRef, useState, useTransition, useRef, ReactNode } from 'react';
 import type { SwotCategory } from '@prisma/client';
 import { createSwotItem } from '@/actions/swot';
 import { QuadrantHelpPanel } from './QuadrantHelp';
-import { IconPlus, InlineFormActions } from '@/components/ui';
+import { IconPlus, InlineAddItem } from '@/components/ui';
 
 interface SwotQuadrantProps {
   category: SwotCategory;
@@ -66,16 +66,6 @@ export const SwotQuadrant = forwardRef<HTMLDivElement, SwotQuadrantProps>(
       });
     }
 
-    function handleKeyDown(e: React.KeyboardEvent) {
-      if (e.key === 'Enter' && !e.shiftKey) {
-        e.preventDefault();
-        handleAdd();
-      } else if (e.key === 'Escape') {
-        setIsAdding(false);
-        setNewContent('');
-      }
-    }
-
     return (
       <div
         ref={ref}
@@ -129,32 +119,18 @@ export const SwotQuadrant = forwardRef<HTMLDivElement, SwotQuadrantProps>(
 
           {/* Add Form */}
           {isAdding && (
-            <div className="rounded-lg border border-border bg-card p-2 shadow-sm">
-              <textarea
-                autoFocus
-                value={newContent}
-                onChange={(e) => setNewContent(e.target.value)}
-                onKeyDown={handleKeyDown}
-                onBlur={(e) => {
-                  // Don't trigger on blur if clicking on a button
-                  if (!e.currentTarget.contains(e.relatedTarget as Node)) {
-                    handleAdd();
-                  }
-                }}
-                placeholder="Décrivez cet élément..."
-                className="w-full resize-none rounded border-0 bg-transparent p-1 text-sm text-foreground placeholder:text-muted focus:outline-none focus:ring-0"
-                rows={2}
-                disabled={isPending}
-              />
-              <InlineFormActions
-                onCancel={() => { setIsAdding(false); setNewContent(''); }}
-                onSubmit={handleAdd}
-                isPending={isPending}
-                disabled={!newContent.trim()}
-                submitColorClass={`${styles.text} hover:bg-white/50`}
-                className="mt-1"
-              />
-            </div>
+            <InlineAddItem
+              value={newContent}
+              onChange={setNewContent}
+              onSubmit={handleAdd}
+              onCancel={() => {
+                setIsAdding(false);
+                setNewContent('');
+              }}
+              isPending={isPending}
+              placeholder="Décrivez cet élément..."
+              submitColorClass={`${styles.text} hover:bg-white/50`}
+            />
           )}
         </div>
       </div>
diff --git a/src/components/teams/AddMemberModal.tsx b/src/components/teams/AddMemberModal.tsx
index 4b1c2ae..199701d 100644
--- a/src/components/teams/AddMemberModal.tsx
+++ b/src/components/teams/AddMemberModal.tsx
@@ -153,7 +153,7 @@ export function AddMemberModal({
           <Button
             type="submit"
             disabled={!selectedUserId || loading}
-            className="bg-[var(--purple)] text-white hover:opacity-90 border-transparent"
+            variant="brand"
           >
             {loading ? 'Ajout...' : 'Ajouter'}
           </Button>
diff --git a/src/components/teams/DeleteTeamButton.tsx b/src/components/teams/DeleteTeamButton.tsx
index 4db070c..05d791f 100644
--- a/src/components/teams/DeleteTeamButton.tsx
+++ b/src/components/teams/DeleteTeamButton.tsx
@@ -42,7 +42,11 @@ export function DeleteTeamButton({ teamId, teamName }: DeleteTeamButtonProps) {
       <Button
         onClick={() => setShowModal(true)}
         variant="outline"
-        className="text-destructive border-destructive hover:bg-destructive/10"
+        size="sm"
+        style={{
+          color: 'var(--destructive)',
+          borderColor: 'var(--destructive)',
+        }}
       >
         Supprimer l&apos;équipe
       </Button>
@@ -63,7 +67,7 @@ export function DeleteTeamButton({ teamId, teamName }: DeleteTeamButtonProps) {
             supprimés.
           </p>
           <ModalFooter>
-            <Button variant="ghost" onClick={() => setShowModal(false)} disabled={isPending}>
+            <Button variant="outline" onClick={() => setShowModal(false)} disabled={isPending}>
               Annuler
             </Button>
             <Button variant="destructive" onClick={handleDelete} disabled={isPending}>
diff --git a/src/components/teams/MembersList.tsx b/src/components/teams/MembersList.tsx
index 6c8bd7e..0b78f47 100644
--- a/src/components/teams/MembersList.tsx
+++ b/src/components/teams/MembersList.tsx
@@ -75,10 +75,7 @@ export function MembersList({ members, teamId, isAdmin, onMemberUpdate }: Member
       <div className="mb-4 flex items-center justify-between">
         <h3 className="text-lg font-semibold text-foreground">Membres ({members.length})</h3>
         {isAdmin && (
-          <Button
-            onClick={() => setAddMemberOpen(true)}
-            className="bg-[var(--purple)] text-white hover:opacity-90 border-transparent"
-          >
+          <Button onClick={() => setAddMemberOpen(true)} variant="brand" size="sm">
             Ajouter un membre
           </Button>
         )}
diff --git a/src/components/ui/Button.tsx b/src/components/ui/Button.tsx
index 07bcc63..d25bd23 100644
--- a/src/components/ui/Button.tsx
+++ b/src/components/ui/Button.tsx
@@ -1,6 +1,6 @@
 import { forwardRef, ButtonHTMLAttributes } from 'react';
 
-type ButtonVariant = 'primary' | 'secondary' | 'outline' | 'ghost' | 'destructive';
+type ButtonVariant = 'primary' | 'secondary' | 'outline' | 'ghost' | 'destructive' | 'brand';
 type ButtonSize = 'sm' | 'md' | 'lg';
 
 interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
@@ -15,6 +15,7 @@ const variantStyles: Record<ButtonVariant, string> = {
   outline: 'bg-transparent text-foreground hover:bg-card-hover border-border',
   ghost: 'bg-transparent text-foreground hover:bg-card-hover border-transparent',
   destructive: 'bg-destructive text-white hover:bg-destructive/90 border-transparent',
+  brand: 'bg-[var(--purple)] text-white hover:opacity-90 border-transparent',
 };
 
 const sizeStyles: Record<ButtonSize, string> = {
@@ -23,6 +24,28 @@ const sizeStyles: Record<ButtonSize, string> = {
   lg: 'h-12 px-6 text-base gap-2',
 };
 
+interface GetButtonClassNameOptions {
+  variant?: ButtonVariant;
+  size?: ButtonSize;
+  className?: string;
+}
+
+export function getButtonClassName({
+  variant = 'primary',
+  size = 'md',
+  className = '',
+}: GetButtonClassNameOptions = {}) {
+  return `
+    inline-flex items-center justify-center rounded-lg border font-medium
+    transition-colors focus-visible:outline-none focus-visible:ring-2
+    focus-visible:ring-ring focus-visible:ring-offset-2
+    disabled:pointer-events-none disabled:opacity-50
+    ${variantStyles[variant]}
+    ${sizeStyles[size]}
+    ${className}
+  `;
+}
+
 export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
   (
     { className = '', variant = 'primary', size = 'md', loading, disabled, children, ...props },
@@ -32,15 +55,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
       <button
         ref={ref}
         disabled={disabled || loading}
-        className={`
-          inline-flex items-center justify-center rounded-lg border font-medium
-          transition-colors focus-visible:outline-none focus-visible:ring-2
-          focus-visible:ring-ring focus-visible:ring-offset-2
-          disabled:pointer-events-none disabled:opacity-50
-          ${variantStyles[variant]}
-          ${sizeStyles[size]}
-          ${className}
-        `}
+        className={getButtonClassName({ variant, size, className })}
         {...props}
       >
         {loading && (
diff --git a/src/components/ui/Disclosure.tsx b/src/components/ui/Disclosure.tsx
new file mode 100644
index 0000000..f43a965
--- /dev/null
+++ b/src/components/ui/Disclosure.tsx
@@ -0,0 +1,52 @@
+'use client';
+
+import { ReactNode, useId, useState } from 'react';
+
+interface DisclosureProps {
+  title: ReactNode;
+  subtitle?: ReactNode;
+  defaultOpen?: boolean;
+  className?: string;
+  children: ReactNode;
+}
+
+export function Disclosure({
+  title,
+  subtitle,
+  defaultOpen = false,
+  className = '',
+  children,
+}: DisclosureProps) {
+  const [isOpen, setIsOpen] = useState(defaultOpen);
+  const contentId = useId();
+
+  return (
+    <div className={`rounded-lg border border-border bg-card-hover ${className}`}>
+      <button
+        type="button"
+        onClick={() => setIsOpen((prev) => !prev)}
+        aria-expanded={isOpen}
+        aria-controls={contentId}
+        className="flex w-full items-center justify-between px-4 py-2.5 text-left transition-colors hover:bg-card"
+      >
+        <div className="min-w-0">
+          <div className="text-sm font-semibold text-foreground">{title}</div>
+          {subtitle && <div className="text-xs text-muted">{subtitle}</div>}
+        </div>
+        <svg
+          className={`h-4 w-4 shrink-0 text-muted transition-transform ${isOpen ? 'rotate-180' : ''}`}
+          fill="none"
+          stroke="currentColor"
+          viewBox="0 0 24 24"
+        >
+          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+        </svg>
+      </button>
+      {isOpen && (
+        <div id={contentId} className="border-t border-border px-4 py-3">
+          {children}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/ui/DropdownMenu.tsx b/src/components/ui/DropdownMenu.tsx
new file mode 100644
index 0000000..916c882
--- /dev/null
+++ b/src/components/ui/DropdownMenu.tsx
@@ -0,0 +1,29 @@
+'use client';
+
+import { ReactNode, useRef, useState } from 'react';
+import { useClickOutside } from '@/hooks/useClickOutside';
+
+interface DropdownMenuProps {
+  trigger: (options: { open: boolean; toggle: () => void }) => ReactNode;
+  children: (options: { close: () => void }) => ReactNode;
+  panelClassName?: string;
+  className?: string;
+}
+
+export function DropdownMenu({
+  trigger,
+  children,
+  panelClassName = '',
+  className = '',
+}: DropdownMenuProps) {
+  const [open, setOpen] = useState(false);
+  const ref = useRef<HTMLDivElement>(null);
+  useClickOutside(ref, () => setOpen(false), open);
+
+  return (
+    <div ref={ref} className={`relative ${className}`}>
+      {trigger({ open, toggle: () => setOpen((prev) => !prev) })}
+      {open && <div className={panelClassName}>{children({ close: () => setOpen(false) })}</div>}
+    </div>
+  );
+}
diff --git a/src/components/ui/FormField.tsx b/src/components/ui/FormField.tsx
new file mode 100644
index 0000000..664c57d
--- /dev/null
+++ b/src/components/ui/FormField.tsx
@@ -0,0 +1,67 @@
+import { ChangeEventHandler, ReactNode } from 'react';
+import { Input } from './Input';
+
+interface FormFieldProps {
+  id?: string;
+  label?: string;
+  error?: string;
+  hint?: string;
+  className?: string;
+  children: ReactNode;
+}
+
+export function FormField({ id, label, error, hint, className = '', children }: FormFieldProps) {
+  return (
+    <div className={className || 'w-full'}>
+      {label && (
+        <label htmlFor={id} className="mb-2 block text-sm font-medium text-foreground">
+          {label}
+        </label>
+      )}
+      {children}
+      {hint && !error && <p className="mt-1 text-xs text-muted">{hint}</p>}
+      {error && <p className="mt-1.5 text-sm text-destructive">{error}</p>}
+    </div>
+  );
+}
+
+type BaseInputProps = {
+  id?: string;
+  name?: string;
+  value?: string | number;
+  defaultValue?: string | number;
+  onChange?: ChangeEventHandler<HTMLInputElement>;
+  required?: boolean;
+  disabled?: boolean;
+  min?: string | number;
+  max?: string | number;
+  step?: string | number;
+  className?: string;
+};
+
+interface DateInputProps extends BaseInputProps {
+  label?: string;
+  error?: string;
+}
+
+export function DateInput({ label, error, className = '', ...props }: DateInputProps) {
+  return (
+    <FormField id={props.id} label={label} error={error}>
+      <Input type="date" className={className} {...props} />
+    </FormField>
+  );
+}
+
+interface NumberInputProps extends BaseInputProps {
+  label?: string;
+  error?: string;
+  hint?: string;
+}
+
+export function NumberInput({ label, error, hint, className = '', ...props }: NumberInputProps) {
+  return (
+    <FormField id={props.id} label={label} error={error} hint={hint}>
+      <Input type="number" className={className} {...props} />
+    </FormField>
+  );
+}
diff --git a/src/components/ui/IconButton.tsx b/src/components/ui/IconButton.tsx
new file mode 100644
index 0000000..3f08ee7
--- /dev/null
+++ b/src/components/ui/IconButton.tsx
@@ -0,0 +1,53 @@
+import { ButtonHTMLAttributes, ReactNode } from 'react';
+
+type IconButtonVariant = 'default' | 'primary' | 'destructive' | 'ghost';
+type IconButtonSize = 'xs' | 'sm' | 'md';
+
+interface IconButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+  icon: ReactNode;
+  label: string;
+  variant?: IconButtonVariant;
+  size?: IconButtonSize;
+}
+
+const variantStyles: Record<IconButtonVariant, string> = {
+  default: 'text-muted hover:bg-card-hover hover:text-foreground border-transparent',
+  primary: 'text-muted hover:bg-primary/10 hover:text-primary border-transparent',
+  destructive:
+    'text-muted hover:bg-destructive/10 hover:text-destructive border-transparent',
+  ghost: 'text-muted hover:text-foreground border-transparent',
+};
+
+const sizeStyles: Record<IconButtonSize, string> = {
+  xs: 'h-6 w-6',
+  sm: 'h-7 w-7',
+  md: 'h-8 w-8',
+};
+
+export function IconButton({
+  icon,
+  label,
+  variant = 'default',
+  size = 'sm',
+  className = '',
+  type = 'button',
+  ...props
+}: IconButtonProps) {
+  return (
+    <button
+      type={type}
+      aria-label={label}
+      title={label}
+      className={`
+        inline-flex items-center justify-center rounded-md border
+        transition-colors disabled:pointer-events-none disabled:opacity-50
+        ${sizeStyles[size]}
+        ${variantStyles[variant]}
+        ${className}
+      `}
+      {...props}
+    >
+      {icon}
+    </button>
+  );
+}
diff --git a/src/components/ui/InlineAddItem.tsx b/src/components/ui/InlineAddItem.tsx
new file mode 100644
index 0000000..e97991f
--- /dev/null
+++ b/src/components/ui/InlineAddItem.tsx
@@ -0,0 +1,59 @@
+import { ReactNode } from 'react';
+import { InlineFormActions } from './InlineFormActions';
+
+interface InlineAddItemProps {
+  value: string;
+  onChange: (value: string) => void;
+  onSubmit: () => void;
+  onCancel: () => void;
+  isPending: boolean;
+  placeholder?: string;
+  rows?: number;
+  extra?: ReactNode;
+  submitColorClass?: string;
+  className?: string;
+}
+
+export function InlineAddItem({
+  value,
+  onChange,
+  onSubmit,
+  onCancel,
+  isPending,
+  placeholder,
+  rows = 2,
+  extra,
+  submitColorClass,
+  className = '',
+}: InlineAddItemProps) {
+  return (
+    <div className={`rounded-lg border border-border bg-card p-2 shadow-sm ${className}`}>
+      <textarea
+        autoFocus
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter' && !e.shiftKey) {
+            e.preventDefault();
+            onSubmit();
+          } else if (e.key === 'Escape') {
+            onCancel();
+          }
+        }}
+        placeholder={placeholder}
+        className="w-full resize-none rounded border-0 bg-transparent p-1 text-sm text-foreground placeholder:text-muted focus:outline-none focus:ring-0"
+        rows={rows}
+        disabled={isPending}
+      />
+      {extra}
+      <InlineFormActions
+        onCancel={onCancel}
+        onSubmit={onSubmit}
+        isPending={isPending}
+        disabled={!value.trim()}
+        submitColorClass={submitColorClass}
+        className="mt-1"
+      />
+    </div>
+  );
+}
diff --git a/src/components/ui/InlineEditor.tsx b/src/components/ui/InlineEditor.tsx
new file mode 100644
index 0000000..1202e80
--- /dev/null
+++ b/src/components/ui/InlineEditor.tsx
@@ -0,0 +1,68 @@
+import { ReactNode } from 'react';
+
+interface InlineEditorProps {
+  value: string;
+  onChange: (value: string) => void;
+  onSave: () => void;
+  onCancel: () => void;
+  isPending: boolean;
+  placeholder?: string;
+  rows?: number;
+  submitLabel?: string;
+  footer?: ReactNode;
+}
+
+export function InlineEditor({
+  value,
+  onChange,
+  onSave,
+  onCancel,
+  isPending,
+  placeholder,
+  rows = 2,
+  submitLabel = 'Enregistrer',
+  footer,
+}: InlineEditorProps) {
+  return (
+    <div className="space-y-2">
+      <textarea
+        autoFocus
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter' && !e.shiftKey && !e.ctrlKey && !e.metaKey) {
+            e.preventDefault();
+            onSave();
+          } else if (e.key === 'Escape') {
+            onCancel();
+          }
+        }}
+        className="w-full resize-none rounded border-0 bg-transparent p-0 text-sm text-foreground focus:outline-none focus:ring-0"
+        rows={rows}
+        disabled={isPending}
+        placeholder={placeholder}
+      />
+      {footer}
+      {!footer && (
+        <div className="flex justify-end gap-2">
+          <button
+            type="button"
+            className="rounded px-2 py-1 text-xs text-muted hover:bg-card-hover"
+            onClick={onCancel}
+            disabled={isPending}
+          >
+            Annuler
+          </button>
+          <button
+            type="button"
+            className="rounded px-2 py-1 text-xs font-medium text-primary hover:bg-primary/10"
+            onClick={onSave}
+            disabled={isPending || !value.trim()}
+          >
+            {submitLabel}
+          </button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/ui/InlineFormActions.tsx b/src/components/ui/InlineFormActions.tsx
index 099f2f1..499b0e5 100644
--- a/src/components/ui/InlineFormActions.tsx
+++ b/src/components/ui/InlineFormActions.tsx
@@ -1,3 +1,5 @@
+import { Button } from './Button';
+
 interface InlineFormActionsProps {
   onCancel: () => void;
   onSubmit: () => void;
@@ -19,21 +21,27 @@ export function InlineFormActions({
 }: InlineFormActionsProps) {
   return (
     <div className={`flex justify-end gap-1 ${className}`}>
-      <button
+      <Button
+        type="button"
+        size="sm"
+        variant="ghost"
         onClick={onCancel}
-        className="rounded px-2 py-1 text-xs text-muted hover:bg-card-hover"
+        className="h-7 px-2 text-xs text-muted"
         disabled={isPending}
       >
         Annuler
-      </button>
-      <button
+      </Button>
+      <Button
+        type="button"
+        size="sm"
+        variant="ghost"
         onMouseDown={(e) => e.preventDefault()}
         onClick={onSubmit}
         disabled={isPending || disabled}
-        className={`rounded px-2 py-1 text-xs font-medium disabled:opacity-50 ${submitColorClass}`}
+        className={`h-7 px-2 text-xs ${submitColorClass}`}
       >
         {isPending ? '...' : submitLabel}
-      </button>
+      </Button>
     </div>
   );
 }
diff --git a/src/components/ui/SegmentedControl.tsx b/src/components/ui/SegmentedControl.tsx
new file mode 100644
index 0000000..fe812f2
--- /dev/null
+++ b/src/components/ui/SegmentedControl.tsx
@@ -0,0 +1,59 @@
+'use client';
+
+import { ReactNode } from 'react';
+
+export interface SegmentedOption<T extends string> {
+  value: T;
+  label: ReactNode;
+  disabled?: boolean;
+}
+
+interface SegmentedControlProps<T extends string> {
+  value: T;
+  options: SegmentedOption<T>[];
+  onChange: (value: T) => void;
+  size?: 'sm' | 'md';
+  fullWidth?: boolean;
+  className?: string;
+}
+
+const sizeStyles = {
+  sm: 'px-3 py-1.5 text-sm',
+  md: 'px-4 py-2 text-sm',
+} as const;
+
+export function SegmentedControl<T extends string>({
+  value,
+  options,
+  onChange,
+  size = 'md',
+  fullWidth = false,
+  className = '',
+}: SegmentedControlProps<T>) {
+  return (
+    <div
+      className={`inline-flex items-center gap-1 rounded-lg border border-border bg-card p-1 ${className}`}
+    >
+      {options.map((option) => (
+        <button
+          key={option.value}
+          type="button"
+          disabled={option.disabled}
+          onClick={() => onChange(option.value)}
+          className={`
+            rounded-md font-medium transition-colors disabled:pointer-events-none disabled:opacity-50
+            ${sizeStyles[size]}
+            ${fullWidth ? 'min-w-0 flex-1' : ''}
+            ${
+              value === option.value
+                ? 'bg-primary text-primary-foreground'
+                : 'text-muted hover:bg-card-hover hover:text-foreground'
+            }
+          `}
+        >
+          {option.label}
+        </button>
+      ))}
+    </div>
+  );
+}
diff --git a/src/components/ui/index.ts b/src/components/ui/index.ts
index 3f7e877..ea7f6b3 100644
--- a/src/components/ui/index.ts
+++ b/src/components/ui/index.ts
@@ -1,8 +1,10 @@
 export { Avatar } from './Avatar';
 export { Badge } from './Badge';
-export { Button } from './Button';
+export { Button, getButtonClassName } from './Button';
 export { Card, CardHeader, CardTitle, CardDescription, CardContent, CardFooter } from './Card';
 export { CollaboratorDisplay } from './CollaboratorDisplay';
+export { Disclosure } from './Disclosure';
+export { DropdownMenu } from './DropdownMenu';
 export { EditableTitle } from './EditableTitle';
 export {
   EditableSessionTitle,
@@ -13,6 +15,9 @@ export {
   EditableGifMoodTitle,
 } from './EditableTitles';
 export { IconEdit, IconTrash, IconDuplicate, IconPlus, IconCheck, IconClose } from './Icons';
+export { IconButton } from './IconButton';
+export { InlineAddItem } from './InlineAddItem';
+export { InlineEditor } from './InlineEditor';
 export { InlineFormActions } from './InlineFormActions';
 export { PageHeader } from './PageHeader';
 export { SessionPageHeader } from './SessionPageHeader';
@@ -22,6 +27,8 @@ export { Modal, ModalFooter } from './Modal';
 export { RocketIcon } from './RocketIcon';
 export { Select } from './Select';
 export type { SelectOption } from './Select';
+export { SegmentedControl } from './SegmentedControl';
 export { Textarea } from './Textarea';
 export { ToggleGroup } from './ToggleGroup';
 export type { ToggleOption } from './ToggleGroup';
+export { FormField, DateInput, NumberInput } from './FormField';
diff --git a/src/components/weather/WeatherInfoPanel.tsx b/src/components/weather/WeatherInfoPanel.tsx
index dc8efb3..91874a4 100644
--- a/src/components/weather/WeatherInfoPanel.tsx
+++ b/src/components/weather/WeatherInfoPanel.tsx
@@ -1,58 +1,36 @@
 'use client';
 
-import { useState } from 'react';
+import { Disclosure } from '@/components/ui';
 
 export function WeatherInfoPanel() {
-  const [isOpen, setIsOpen] = useState(false);
-
   return (
-    <div className="mb-6 rounded-lg border border-border bg-card-hover">
-      <button
-        onClick={() => setIsOpen(!isOpen)}
-        className="w-full flex items-center justify-between px-4 py-2.5 text-left transition-colors hover:bg-card"
-      >
-        <h3 className="text-sm font-semibold text-foreground">
-          Les 4 axes de la météo personnelle
-        </h3>
-        <svg
-          className={`h-4 w-4 text-muted transition-transform ${isOpen ? 'rotate-180' : ''}`}
-          fill="none"
-          stroke="currentColor"
-          viewBox="0 0 24 24"
-        >
-          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
-        </svg>
-      </button>
-      {isOpen && (
-        <div className="border-t border-border px-4 py-3">
-          <div className="grid gap-2.5 sm:grid-cols-2 lg:grid-cols-4">
-            <div>
-              <p className="text-xs font-medium text-foreground mb-0.5">☀️ Performance</p>
-              <p className="text-xs text-muted leading-relaxed">
-                Votre performance personnelle et l&apos;atteinte de vos objectifs
-              </p>
-            </div>
-            <div>
-              <p className="text-xs font-medium text-foreground mb-0.5">😊 Moral</p>
-              <p className="text-xs text-muted leading-relaxed">
-                Votre moral actuel et votre ressenti
-              </p>
-            </div>
-            <div>
-              <p className="text-xs font-medium text-foreground mb-0.5">🌊 Flux</p>
-              <p className="text-xs text-muted leading-relaxed">
-                Votre flux de travail personnel et les blocages éventuels
-              </p>
-            </div>
-            <div>
-              <p className="text-xs font-medium text-foreground mb-0.5">💎 Création de valeur</p>
-              <p className="text-xs text-muted leading-relaxed">
-                Votre création de valeur et votre apport
-              </p>
-            </div>
-          </div>
+    <Disclosure title="Les 4 axes de la météo personnelle" className="mb-6">
+      <div className="grid gap-2.5 sm:grid-cols-2 lg:grid-cols-4">
+        <div>
+          <p className="mb-0.5 text-xs font-medium text-foreground">☀️ Performance</p>
+          <p className="text-xs leading-relaxed text-muted">
+            Votre performance personnelle et l&apos;atteinte de vos objectifs
+          </p>
         </div>
-      )}
-    </div>
+        <div>
+          <p className="mb-0.5 text-xs font-medium text-foreground">😊 Moral</p>
+          <p className="text-xs leading-relaxed text-muted">
+            Votre moral actuel et votre ressenti
+          </p>
+        </div>
+        <div>
+          <p className="mb-0.5 text-xs font-medium text-foreground">🌊 Flux</p>
+          <p className="text-xs leading-relaxed text-muted">
+            Votre flux de travail personnel et les blocages éventuels
+          </p>
+        </div>
+        <div>
+          <p className="mb-0.5 text-xs font-medium text-foreground">💎 Création de valeur</p>
+          <p className="text-xs leading-relaxed text-muted">
+            Votre création de valeur et votre apport
+          </p>
+        </div>
+      </div>
+    </Disclosure>
   );
 }
diff --git a/src/components/weather/WeatherTrendChart.tsx b/src/components/weather/WeatherTrendChart.tsx
index 9f6b296..9cde6b4 100644
--- a/src/components/weather/WeatherTrendChart.tsx
+++ b/src/components/weather/WeatherTrendChart.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useState } from 'react';
+import { Disclosure } from '@/components/ui';
 import type { WeatherHistoryPoint } from '@/services/weather';
 
 interface WeatherTrendChartProps {
@@ -63,7 +64,6 @@ function buildPath(
 const Y_TICKS = [1, 5, 10, 14, 19];
 
 export function WeatherTrendChart({ data, currentSessionId }: WeatherTrendChartProps) {
-  const [isOpen, setIsOpen] = useState(false);
   const [hoveredIdx, setHoveredIdx] = useState<number | null>(null);
 
   if (data.length < 2) return null;
@@ -71,27 +71,16 @@ export function WeatherTrendChart({ data, currentSessionId }: WeatherTrendChartP
   const hoveredPt = hoveredIdx !== null ? data[hoveredIdx] : null;
 
   return (
-    <div className="mb-6 rounded-lg border border-border bg-card-hover">
-      <button
-        onClick={() => setIsOpen(!isOpen)}
-        className="w-full flex items-center justify-between px-4 py-2.5 text-left transition-colors hover:bg-card"
-      >
-        <h3 className="text-sm font-semibold text-foreground">
+    <Disclosure
+      className="mb-6"
+      title={
+        <>
           Évolution dans le temps
           <span className="ml-2 text-xs font-normal text-muted">{data.length} sessions</span>
-        </h3>
-        <svg
-          className={`h-4 w-4 text-muted transition-transform ${isOpen ? 'rotate-180' : ''}`}
-          fill="none"
-          stroke="currentColor"
-          viewBox="0 0 24 24"
-        >
-          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
-        </svg>
-      </button>
-
-      {isOpen && (
-        <div className="border-t border-border px-4 py-4">
+        </>
+      }
+    >
+      <div className="py-1">
           {/* Legend */}
           <div className="flex flex-wrap gap-4 mb-3">
             {INDICATORS.map((ind) => (
@@ -300,8 +289,7 @@ export function WeatherTrendChart({ data, currentSessionId }: WeatherTrendChartP
           <p className="text-[10px] text-muted mt-1 text-right">
             Score 1 = ☀️ (meilleur) · Score 19 = dégradé
           </p>
-        </div>
-      )}
-    </div>
+      </div>
+    </Disclosure>
   );
 }
diff --git a/src/components/weekly-checkin/WeeklyCheckInCard.tsx b/src/components/weekly-checkin/WeeklyCheckInCard.tsx
index bc2a5c8..ff4703f 100644
--- a/src/components/weekly-checkin/WeeklyCheckInCard.tsx
+++ b/src/components/weekly-checkin/WeeklyCheckInCard.tsx
@@ -4,7 +4,7 @@ import { forwardRef, memo, useState, useTransition } from 'react';
 import type { WeeklyCheckInItem } from '@prisma/client';
 import { updateWeeklyCheckInItem, deleteWeeklyCheckInItem } from '@/actions/weekly-checkin';
 import { WEEKLY_CHECK_IN_BY_CATEGORY, EMOTION_BY_TYPE } from '@/lib/types';
-import { IconEdit, IconTrash, InlineFormActions } from '@/components/ui';
+import { IconEdit, IconTrash, IconButton, InlineFormActions } from '@/components/ui';
 import { Select } from '@/components/ui/Select';
 
 interface WeeklyCheckInCardProps {
@@ -144,23 +144,23 @@ export const WeeklyCheckInCard = memo(
 
               {/* Actions (visible on hover) */}
               <div className="absolute right-1 top-1 flex gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-                <button
+                <IconButton
+                  icon={<IconEdit />}
+                  label="Modifier"
                   onClick={(e) => {
                     e.stopPropagation();
                     setIsEditing(true);
                   }}
-                  className="rounded p-1 text-muted hover:bg-card-hover hover:text-foreground"
-                  aria-label="Modifier"
-                >
-                  <IconEdit />
-                </button>
-                <button
-                  onClick={(e) => { e.stopPropagation(); handleDelete(); }}
-                  className="rounded p-1 text-muted hover:bg-destructive/10 hover:text-destructive"
-                  aria-label="Supprimer"
-                >
-                  <IconTrash />
-                </button>
+                />
+                <IconButton
+                  icon={<IconTrash />}
+                  label="Supprimer"
+                  variant="destructive"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    handleDelete();
+                  }}
+                />
               </div>
             </>
           )}
diff --git a/src/components/weekly-checkin/WeeklyCheckInSection.tsx b/src/components/weekly-checkin/WeeklyCheckInSection.tsx
index 87c2cde..ea1d31d 100644
--- a/src/components/weekly-checkin/WeeklyCheckInSection.tsx
+++ b/src/components/weekly-checkin/WeeklyCheckInSection.tsx
@@ -4,7 +4,7 @@ import { forwardRef, useState, useTransition, useRef, ReactNode } from 'react';
 import type { WeeklyCheckInCategory } from '@prisma/client';
 import { createWeeklyCheckInItem } from '@/actions/weekly-checkin';
 import { WEEKLY_CHECK_IN_BY_CATEGORY, EMOTION_BY_TYPE } from '@/lib/types';
-import { IconPlus, InlineFormActions } from '@/components/ui';
+import { IconPlus, InlineAddItem } from '@/components/ui';
 import { Select } from '@/components/ui/Select';
 
 interface WeeklyCheckInSectionProps {
@@ -44,17 +44,6 @@ export const WeeklyCheckInSection = forwardRef<HTMLDivElement, WeeklyCheckInSect
       });
     }
 
-    function handleKeyDown(e: React.KeyboardEvent) {
-      if (e.key === 'Enter' && !e.shiftKey) {
-        e.preventDefault();
-        handleAdd();
-      } else if (e.key === 'Escape') {
-        setIsAdding(false);
-        setNewContent('');
-        setNewEmotion('NONE');
-      }
-    }
-
     return (
       <div
         ref={ref}
@@ -93,53 +82,31 @@ export const WeeklyCheckInSection = forwardRef<HTMLDivElement, WeeklyCheckInSect
 
           {/* Add Form */}
           {isAdding && (
-            <div
-              className="rounded-lg border border-border bg-card p-2 shadow-sm"
-              onBlur={(e) => {
-                // Don't close if focus moves to another element in this container
-                const currentTarget = e.currentTarget;
-                const relatedTarget = e.relatedTarget as Node | null;
-                if (relatedTarget && currentTarget.contains(relatedTarget)) {
-                  return;
-                }
-                // Only add on blur if content is not empty
-                if (newContent.trim()) {
-                  handleAdd();
-                } else {
-                  setIsAdding(false);
-                  setNewContent('');
-                  setNewEmotion('NONE');
-                }
+            <InlineAddItem
+              value={newContent}
+              onChange={setNewContent}
+              onSubmit={handleAdd}
+              onCancel={() => {
+                setIsAdding(false);
+                setNewContent('');
+                setNewEmotion('NONE');
               }}
-            >
-              <textarea
-                autoFocus
-                value={newContent}
-                onChange={(e) => setNewContent(e.target.value)}
-                onKeyDown={handleKeyDown}
-                placeholder={`Décrivez ${config.title.toLowerCase()}...`}
-                className="w-full resize-none rounded border-0 bg-transparent p-1 text-sm text-foreground placeholder:text-muted focus:outline-none focus:ring-0"
-                rows={2}
-                disabled={isPending}
-              />
-              <div className="mt-2 flex items-center justify-between gap-2">
+              isPending={isPending}
+              placeholder={`Décrivez ${config.title.toLowerCase()}...`}
+              extra={
+                <div className="mt-2">
                 <Select
                   value={newEmotion}
                   onChange={(e) => setNewEmotion(e.target.value as typeof newEmotion)}
-                  className="text-xs flex-1"
+                  className="text-xs"
                   options={Object.values(EMOTION_BY_TYPE).map((em) => ({
                     value: em.emotion,
                     label: `${em.icon} ${em.label}`,
                   }))}
                 />
-                <InlineFormActions
-                  onCancel={() => { setIsAdding(false); setNewContent(''); setNewEmotion('NONE'); }}
-                  onSubmit={handleAdd}
-                  isPending={isPending}
-                  disabled={!newContent.trim()}
-                />
               </div>
-            </div>
+              }
+            />
           )}
         </div>
       </div>
diff --git a/src/components/year-review/YearReviewCard.tsx b/src/components/year-review/YearReviewCard.tsx
index 063bef9..79943d2 100644
--- a/src/components/year-review/YearReviewCard.tsx
+++ b/src/components/year-review/YearReviewCard.tsx
@@ -4,7 +4,7 @@ import { forwardRef, memo, useState, useTransition } from 'react';
 import type { YearReviewItem } from '@prisma/client';
 import { updateYearReviewItem, deleteYearReviewItem } from '@/actions/year-review';
 import { YEAR_REVIEW_BY_CATEGORY } from '@/lib/types';
-import { IconEdit, IconTrash } from '@/components/ui';
+import { IconEdit, IconTrash, IconButton } from '@/components/ui';
 
 interface YearReviewCardProps {
   item: YearReviewItem;
@@ -88,23 +88,23 @@ export const YearReviewCard = memo(
 
               {/* Actions (visible on hover) */}
               <div className="absolute right-1 top-1 flex gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-                <button
+                <IconButton
+                  icon={<IconEdit />}
+                  label="Modifier"
                   onClick={(e) => {
                     e.stopPropagation();
                     setIsEditing(true);
                   }}
-                  className="rounded p-1 text-muted hover:bg-card-hover hover:text-foreground"
-                  aria-label="Modifier"
-                >
-                  <IconEdit />
-                </button>
-                <button
-                  onClick={(e) => { e.stopPropagation(); handleDelete(); }}
-                  className="rounded p-1 text-muted hover:bg-destructive/10 hover:text-destructive"
-                  aria-label="Supprimer"
-                >
-                  <IconTrash />
-                </button>
+                />
+                <IconButton
+                  icon={<IconTrash />}
+                  label="Supprimer"
+                  variant="destructive"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    handleDelete();
+                  }}
+                />
               </div>
             </>
           )}
diff --git a/src/components/year-review/YearReviewSection.tsx b/src/components/year-review/YearReviewSection.tsx
index ec80146..989d9be 100644
--- a/src/components/year-review/YearReviewSection.tsx
+++ b/src/components/year-review/YearReviewSection.tsx
@@ -4,7 +4,7 @@ import { forwardRef, useState, useTransition, useRef, ReactNode } from 'react';
 import type { YearReviewCategory } from '@prisma/client';
 import { createYearReviewItem } from '@/actions/year-review';
 import { YEAR_REVIEW_BY_CATEGORY } from '@/lib/types';
-import { IconPlus, InlineFormActions } from '@/components/ui';
+import { IconPlus, InlineAddItem } from '@/components/ui';
 
 interface YearReviewSectionProps {
   category: YearReviewCategory;
@@ -40,16 +40,6 @@ export const YearReviewSection = forwardRef<HTMLDivElement, YearReviewSectionPro
       });
     }
 
-    function handleKeyDown(e: React.KeyboardEvent) {
-      if (e.key === 'Enter' && !e.shiftKey) {
-        e.preventDefault();
-        handleAdd();
-      } else if (e.key === 'Escape') {
-        setIsAdding(false);
-        setNewContent('');
-      }
-    }
-
     return (
       <div
         ref={ref}
@@ -88,31 +78,17 @@ export const YearReviewSection = forwardRef<HTMLDivElement, YearReviewSectionPro
 
           {/* Add Form */}
           {isAdding && (
-            <div className="rounded-lg border border-border bg-card p-2 shadow-sm">
-              <textarea
-                autoFocus
-                value={newContent}
-                onChange={(e) => setNewContent(e.target.value)}
-                onKeyDown={handleKeyDown}
-                onBlur={(e) => {
-                  // Don't trigger on blur if clicking on a button
-                  if (!e.currentTarget.contains(e.relatedTarget as Node)) {
-                    handleAdd();
-                  }
-                }}
-                placeholder={`Décrivez ${config.title.toLowerCase()}...`}
-                className="w-full resize-none rounded border-0 bg-transparent p-1 text-sm text-foreground placeholder:text-muted focus:outline-none focus:ring-0"
-                rows={2}
-                disabled={isPending}
-              />
-              <InlineFormActions
-                onCancel={() => { setIsAdding(false); setNewContent(''); }}
-                onSubmit={handleAdd}
-                isPending={isPending}
-                disabled={!newContent.trim()}
-                className="mt-1"
-              />
-            </div>
+            <InlineAddItem
+              value={newContent}
+              onChange={setNewContent}
+              onSubmit={handleAdd}
+              onCancel={() => {
+                setIsAdding(false);
+                setNewContent('');
+              }}
+              isPending={isPending}
+              placeholder={`Décrivez ${config.title.toLowerCase()}...`}
+            />
           )}
         </div>
       </div>