diff --git a/supabase/migrations/20260525122151_app_feedback.sql b/supabase/migrations/20260525122151_app_feedback.sql
new file mode 100644
index 0000000..e1d1199
--- /dev/null
+++ b/supabase/migrations/20260525122151_app_feedback.sql
@@ -0,0 +1,18 @@
+-- app_feedback: user feedback submissions (bugs, features, other) with RLS
+create table if not exists public.app_feedback (
+  id uuid primary key default gen_random_uuid(),
+  user_id uuid not null references auth.users on delete cascade,
+  feedback_type text not null check (feedback_type in ('bug', 'feature', 'other')),
+  message text not null,
+  created_at timestamptz default now() not null
+);
+
+alter table public.app_feedback enable row level security;
+
+drop policy if exists "users_insert_own_feedback" on public.app_feedback;
+create policy "users_insert_own_feedback" on public.app_feedback
+  for insert with check (auth.uid() = user_id);
+
+drop policy if exists "users_select_own_feedback" on public.app_feedback;
+create policy "users_select_own_feedback" on public.app_feedback
+  for select using (auth.uid() = user_id);
diff --git a/supabase/migrations/20260525125310_polar_config.sql b/supabase/migrations/20260525125310_polar_config.sql
new file mode 100644
index 0000000..c7242bf
--- /dev/null
+++ b/supabase/migrations/20260525125310_polar_config.sql
@@ -0,0 +1,19 @@
+-- Support for Polar Flow connection.
+-- Update check constraint on provider_connections to support 'polar'.
+alter table public.provider_connections
+  drop constraint if exists provider_connections_provider_check;
+
+alter table public.provider_connections
+  add constraint provider_connections_provider_check
+  check (provider in ('strava', 'terra', 'garmin', 'polar'));
+
+-- Single-row configuration table for Polar App credentials.
+create table if not exists public.polar_config (
+  id            int       primary key default 1 check (id = 1),
+  client_id     text      not null default '',
+  client_secret text      not null default '',
+  updated_at    timestamptz default now() not null
+);
+
+-- Seed default empty row for Polar configuration.
+insert into public.polar_config (id) values (1) on conflict (id) do nothing;
diff --git a/web/app/(app)/connections/actions.ts b/web/app/(app)/connections/actions.ts
index df1ac67..1ae4bac 100644
--- a/web/app/(app)/connections/actions.ts
+++ b/web/app/(app)/connections/actions.ts
@@ -119,3 +119,42 @@ export async function disconnectStrava(): Promise<{ success?: boolean; error?: s
   revalidatePath("/connections")
   return { success: true }
 }
+
+export async function disconnectPolar(): Promise<{ success?: boolean; error?: string }> {
+  const supabase = await createClient()
+  const {
+    data: { user },
+  } = await supabase.auth.getUser()
+
+  if (!user) return { error: "Non authentifié" }
+
+  const { error } = await supabase
+    .from("provider_connections")
+    .update({ is_active: false })
+    .eq("user_id", user.id)
+    .eq("provider", "polar")
+
+  if (error) return { error: error.message }
+
+  revalidatePath("/connections")
+  return { success: true }
+}
+
+export async function syncPolarHistory(days = 30): Promise<{ synced?: number; error?: string }> {
+  const supabase = await createClient()
+  const {
+    data: { user },
+  } = await supabase.auth.getUser()
+
+  if (!user) return { error: "Non authentifié" }
+
+  try {
+    const { syncPolarMetrics } = await import("@/lib/server/polar/sync")
+    const synced = await syncPolarMetrics(user.id, days)
+    revalidatePath("/connections")
+    revalidatePath("/dashboard")
+    return { synced }
+  } catch (e) {
+    return { error: e instanceof Error ? e.message : "Synchronisation Polar échouée" }
+  }
+}
diff --git a/web/app/(app)/connections/connections-client.tsx b/web/app/(app)/connections/connections-client.tsx
index bfc9241..51b6145 100644
--- a/web/app/(app)/connections/connections-client.tsx
+++ b/web/app/(app)/connections/connections-client.tsx
@@ -11,7 +11,9 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import {
   disconnectStrava,
   disconnectTerra,
+  disconnectPolar,
   syncGarminHistory,
+  syncPolarHistory,
   syncAllStravaHistory,
   syncStrava,
   syncStravaHistory,
@@ -189,7 +191,7 @@ export function TerraCard({ connected, providerUserId, lastSyncAt }: TerraCardPr
               ))}
             </div>
             <a
-              href="/settings"
+              href="/connections/terra/connect"
               className="inline-flex items-center justify-center rounded-md bg-primary px-3 py-1.5 text-sm font-medium text-primary-foreground shadow hover:bg-primary/90"
             >
               Connecter mon appareil
@@ -372,7 +374,7 @@ export function StravaCard({
               Connectez votre compte Strava pour importer automatiquement vos activités.
             </p>
             <a
-              href="/settings"
+              href="/connections/strava/connect"
               className="inline-flex items-center justify-center rounded-md bg-primary px-3 py-1.5 text-sm font-medium text-primary-foreground shadow hover:bg-primary/90"
             >
               Connecter Strava
@@ -383,3 +385,110 @@ export function StravaCard({
     </Card>
   )
 }
+
+export function PolarCard({ connected, providerUserId, lastSyncAt }: TerraCardProps) {
+  const router = useRouter()
+  const [syncing, setSyncing] = useState(false)
+  const [disconnecting, setDisconnecting] = useState(false)
+
+  const lastSyncLabel = lastSyncAt
+    ? new Intl.DateTimeFormat("fr-FR", {
+        dateStyle: "short",
+        timeStyle: "short",
+      }).format(new Date(lastSyncAt))
+    : "Jamais"
+
+  async function handleDisconnect() {
+    setDisconnecting(true)
+    const result = await disconnectPolar()
+    setDisconnecting(false)
+    if (result.error) {
+      toast.error(result.error)
+    } else {
+      toast.success("Polar déconnecté")
+      router.refresh()
+    }
+  }
+
+  return (
+    <Card>
+      <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+        <div className="flex items-center gap-3">
+          <div className="flex h-10 w-10 items-center justify-center rounded-full bg-red-600 text-white font-bold text-sm">
+            P
+          </div>
+          <div>
+            <CardTitle className="text-lg">Polar Flow</CardTitle>
+            <CardDescription>Montres Polar — sommeil, récupération, FC repos</CardDescription>
+          </div>
+        </div>
+        <Badge variant={connected ? "default" : "secondary"}>
+          {connected ? "Connecté" : "Non connecté"}
+        </Badge>
+      </CardHeader>
+
+      <CardContent className="space-y-4">
+        {connected ? (
+          <>
+            <div className="grid grid-cols-2 gap-4 text-sm">
+              <div>
+                <p className="text-muted-foreground">ID Utilisateur Polar</p>
+                <p className="font-medium truncate">{providerUserId ?? "connecté"}</p>
+              </div>
+              <div>
+                <p className="text-muted-foreground">Dernière actualisation</p>
+                <p className="font-medium">{lastSyncLabel}</p>
+              </div>
+            </div>
+
+            <div className="rounded-md bg-muted/50 p-3 text-xs text-muted-foreground space-y-1">
+              <p className="font-medium text-foreground">Données synchronisées</p>
+              <p>FC repos · HRV nocturne · Score sommeil · Durée de sommeil</p>
+            </div>
+
+            <div className="flex gap-2">
+              <Button
+                size="sm"
+                variant="outline"
+                onClick={async () => {
+                  setSyncing(true)
+                  const result = await syncPolarHistory(30)
+                  setSyncing(false)
+                  if (result.error) {
+                    toast.error(result.error)
+                  } else {
+                    toast.success(`${result.synced ?? 0} journée(s) Polar synchronisée(s)`)
+                    router.refresh()
+                  }
+                }}
+                disabled={syncing || disconnecting}
+              >
+                {syncing ? "Synchronisation…" : "Importer 30 jours"}
+              </Button>
+              <Button
+                size="sm"
+                variant="destructive"
+                onClick={handleDisconnect}
+                disabled={syncing || disconnecting}
+              >
+                {disconnecting ? "Déconnexion…" : "Déconnecter"}
+              </Button>
+            </div>
+          </>
+        ) : (
+          <div className="space-y-3">
+            <p className="text-sm text-muted-foreground">
+              Connectez votre compte Polar Flow pour importer les données de récupération et de sommeil de votre montre Polar.
+            </p>
+            <a
+              href="/connections/polar/connect"
+              className="inline-flex items-center justify-center rounded-md bg-primary px-3 py-1.5 text-sm font-medium text-primary-foreground shadow hover:bg-primary/90"
+            >
+              Connecter Polar
+            </a>
+          </div>
+        )}
+      </CardContent>
+    </Card>
+  )
+}
diff --git a/web/app/(app)/connections/page.tsx b/web/app/(app)/connections/page.tsx
index b5b9945..a532ed2 100644
--- a/web/app/(app)/connections/page.tsx
+++ b/web/app/(app)/connections/page.tsx
@@ -2,50 +2,62 @@ import type { Metadata } from "next"
 
 import { createClient } from "@/lib/supabase/server"
 
-import { GarminCard, StravaCard, TerraCard } from "./connections-client"
+import { GarminCard, StravaCard, TerraCard, PolarCard } from "./connections-client"
 
 export const metadata: Metadata = { title: "Mes connexions · SportTrack" }
 
 export default async function ConnectionsPage({
   searchParams,
 }: {
-  searchParams: Promise<{ strava?: string; terra?: string }>
+  searchParams: Promise<{ strava?: string; terra?: string; polar?: string }>
 }) {
-  const { strava, terra } = await searchParams
+  const { strava, terra, polar } = await searchParams
   const supabase = await createClient()
   const {
     data: { user },
   } = await supabase.auth.getUser()
 
-  const [{ data: stravaConn }, { data: terraConn }, { data: garminConn }, { count: activitiesCount }] =
-    await Promise.all([
-      supabase
-        .from("provider_connections")
-        .select("provider_user_id,last_sync_at,is_active")
-        .eq("user_id", user!.id)
-        .eq("provider", "strava")
-        .eq("is_active", true)
-        .maybeSingle(),
-      supabase
-        .from("provider_connections")
-        .select("provider_user_id,last_sync_at,is_active")
-        .eq("user_id", user!.id)
-        .eq("provider", "terra")
-        .eq("is_active", true)
-        .maybeSingle(),
-      supabase
-        .from("provider_connections")
-        .select("provider_user_id,last_sync_at,is_active")
-        .eq("user_id", user!.id)
-        .eq("provider", "garmin")
-        .eq("is_active", true)
-        .maybeSingle(),
-      supabase
-        .from("activities")
-        .select("id", { count: "exact", head: true })
-        .eq("user_id", user!.id)
-        .eq("provider", "strava"),
-    ])
+  const [
+    { data: stravaConn },
+    { data: terraConn },
+    { data: garminConn },
+    { data: polarConn },
+    { count: activitiesCount },
+  ] = await Promise.all([
+    supabase
+      .from("provider_connections")
+      .select("provider_user_id,last_sync_at,is_active")
+      .eq("user_id", user!.id)
+      .eq("provider", "strava")
+      .eq("is_active", true)
+      .maybeSingle(),
+    supabase
+      .from("provider_connections")
+      .select("provider_user_id,last_sync_at,is_active")
+      .eq("user_id", user!.id)
+      .eq("provider", "terra")
+      .eq("is_active", true)
+      .maybeSingle(),
+    supabase
+      .from("provider_connections")
+      .select("provider_user_id,last_sync_at,is_active")
+      .eq("user_id", user!.id)
+      .eq("provider", "garmin")
+      .eq("is_active", true)
+      .maybeSingle(),
+    supabase
+      .from("provider_connections")
+      .select("provider_user_id,last_sync_at,is_active")
+      .eq("user_id", user!.id)
+      .eq("provider", "polar")
+      .eq("is_active", true)
+      .maybeSingle(),
+    supabase
+      .from("activities")
+      .select("id", { count: "exact", head: true })
+      .eq("user_id", user!.id)
+      .eq("provider", "strava"),
+  ])
 
   return (
     <div className="mx-auto max-w-2xl space-y-6">
@@ -81,6 +93,18 @@ export default async function ConnectionsPage({
         </div>
       ) : null}
 
+      {polar === "connected" ? (
+        <div className="rounded-md border border-green-200 bg-green-50 px-4 py-3 text-sm text-green-900">
+          Polar est connecté. Une première synchronisation des données de santé est en cours.
+        </div>
+      ) : null}
+
+      {polar === "error" ? (
+        <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-900">
+          La connexion Polar a échoué. Vérifiez la configuration du Client ID / Secret développeur Polar puis réessayez.
+        </div>
+      ) : null}
+
       <StravaCard
         connected={!!stravaConn}
         providerUserId={stravaConn?.provider_user_id}
@@ -94,6 +118,12 @@ export default async function ConnectionsPage({
         lastSyncAt={garminConn?.last_sync_at}
       />
 
+      <PolarCard
+        connected={!!polarConn}
+        providerUserId={polarConn?.provider_user_id}
+        lastSyncAt={polarConn?.last_sync_at}
+      />
+
       <TerraCard
         connected={!!terraConn}
         providerUserId={terraConn?.provider_user_id}
diff --git a/web/app/(app)/connections/polar/connect/route.ts b/web/app/(app)/connections/polar/connect/route.ts
new file mode 100644
index 0000000..1310ea4
--- /dev/null
+++ b/web/app/(app)/connections/polar/connect/route.ts
@@ -0,0 +1,52 @@
+import { createHmac, randomUUID } from "crypto"
+import { NextRequest, NextResponse } from "next/server"
+
+import { createServiceClient } from "@/lib/supabase/service"
+import { createClient } from "@/lib/supabase/server"
+
+function getStateSecret() {
+  return process.env.POLAR_STATE_SECRET ?? process.env.INTERNAL_SECRET ?? process.env.STRAVA_STATE_SECRET
+}
+
+function getBaseUrl(origin: string) {
+  return (process.env.NEXT_PUBLIC_BASE_URL ?? origin).replace(/\/$/, "")
+}
+
+export async function GET(request: NextRequest) {
+  const supabase = await createClient()
+  const {
+    data: { user },
+  } = await supabase.auth.getUser()
+
+  const baseUrl = getBaseUrl(request.nextUrl.origin)
+
+  if (!user) {
+    return NextResponse.redirect(`${baseUrl}/login`)
+  }
+
+  const service = createServiceClient()
+  const { data: cfg } = await service.from("polar_config").select("client_id").eq("id", 1).single()
+  const clientId = cfg?.client_id || ""
+
+  if (!clientId) {
+    return NextResponse.redirect(`${baseUrl}/settings?error=missing_polar_config`)
+  }
+
+  const nonce = randomUUID()
+  const payload = JSON.stringify({ user_id: user.id, nonce })
+  const stateSecret = getStateSecret()
+  if (!stateSecret) {
+    return NextResponse.redirect(`${baseUrl}/settings?error=missing_state_secret`)
+  }
+  const sig = createHmac("sha256", stateSecret).update(payload).digest("hex")
+  const state = Buffer.from(JSON.stringify({ payload, sig })).toString("base64url")
+
+  const polarUrl = new URL("https://flow.polar.com/oauth2/authorization")
+  polarUrl.searchParams.set("client_id", clientId)
+  polarUrl.searchParams.set("redirect_uri", `${baseUrl}/api/polar/callback`)
+  polarUrl.searchParams.set("response_type", "code")
+  polarUrl.searchParams.set("scope", "accesslink.read_all")
+  polarUrl.searchParams.set("state", state)
+
+  return NextResponse.redirect(polarUrl)
+}
diff --git a/web/app/(app)/injuries/actions.ts b/web/app/(app)/health/actions.ts
similarity index 96%
rename from web/app/(app)/injuries/actions.ts
rename to web/app/(app)/health/actions.ts
index e96d486..dd7a9c3 100644
--- a/web/app/(app)/injuries/actions.ts
+++ b/web/app/(app)/health/actions.ts
@@ -36,7 +36,7 @@ export async function createInjury(formData: FormData): Promise<InjuryFormState>
 
   if (error) return { error: error.message }
 
-  revalidatePath("/injuries")
+  revalidatePath("/health")
   return {}
 }
 
@@ -56,7 +56,7 @@ export async function updateInjuryEndDate(
 
   if (error) return { error: error.message }
 
-  revalidatePath("/injuries")
+  revalidatePath("/health")
   return {}
 }
 
@@ -73,6 +73,6 @@ export async function deleteInjury(injuryId: string): Promise<InjuryFormState> {
 
   if (error) return { error: error.message }
 
-  revalidatePath("/injuries")
+  revalidatePath("/health")
   return {}
 }
diff --git a/web/app/(app)/health/health-chart.tsx b/web/app/(app)/health/health-chart.tsx
new file mode 100644
index 0000000..91c3f1b
--- /dev/null
+++ b/web/app/(app)/health/health-chart.tsx
@@ -0,0 +1,146 @@
+"use client"
+
+import { useState } from "react"
+import { format, parseISO } from "date-fns"
+import { fr } from "date-fns/locale"
+import {
+  LineChart,
+  Line,
+  XAxis,
+  YAxis,
+  Tooltip,
+  ResponsiveContainer,
+  CartesianGrid,
+} from "recharts"
+
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+
+type DailyMetric = {
+  metric_date: string
+  resting_hr: number | null
+  hrv_rmssd: number | null
+}
+
+interface HealthChartProps {
+  data: DailyMetric[]
+}
+
+function CustomTooltip({
+  active,
+  payload,
+  label,
+  type,
+}: {
+  active?: boolean
+  payload?: any[]
+  label?: string
+  type: "hr" | "hrv"
+}) {
+  if (!active || !payload?.length) return null
+
+  const value = payload[0].value
+  const dateStr = label ? format(parseISO(label), "d MMMM yyyy", { locale: fr }) : ""
+
+  return (
+    <div className="rounded-lg border bg-card p-3 shadow-md border-border text-sm space-y-1">
+      <p className="text-xs text-muted-foreground">{dateStr}</p>
+      <p className="font-semibold text-foreground flex items-center gap-1.5">
+        <span
+          className="h-2 w-2 rounded-full"
+          style={{ backgroundColor: type === "hr" ? "#ef4444" : "#8b5cf6" }}
+        />
+        {type === "hr" ? "FC repos : " : "VFC (HRV) : "}
+        <span className="font-bold text-base">{value}</span>
+        <span className="text-xs font-normal text-muted-foreground">
+          {type === "hr" ? " bpm" : " ms"}
+        </span>
+      </p>
+    </div>
+  )
+}
+
+export function HealthChart({ data }: HealthChartProps) {
+  const [activeTab, setActiveTab] = useState<"hr" | "hrv">("hr")
+
+  // Filter metrics that have the active metric populated to avoid empty points
+  const chartData = data
+    .map((d) => ({
+      date: d.metric_date,
+      value: activeTab === "hr" ? d.resting_hr : d.hrv_rmssd,
+    }))
+    .filter((d) => d.value !== null)
+
+  const hasData = chartData.length > 0
+
+  return (
+    <Card>
+      <CardHeader className="pb-2 border-b border-border/40">
+        <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+          <CardTitle className="text-sm font-semibold tracking-wide text-muted-foreground uppercase">
+            📈 Tendances (30 jours)
+          </CardTitle>
+          <div className="flex rounded-lg bg-muted p-0.5 text-xs font-medium border border-border">
+            <button
+              onClick={() => setActiveTab("hr")}
+              className={`rounded-md px-3 py-1 transition-all cursor-pointer ${
+                activeTab === "hr"
+                  ? "bg-card text-foreground shadow-sm"
+                  : "text-muted-foreground hover:text-foreground"
+              }`}
+            >
+              FC repos
+            </button>
+            <button
+              onClick={() => setActiveTab("hrv")}
+              className={`rounded-md px-3 py-1 transition-all cursor-pointer ${
+                activeTab === "hrv"
+                  ? "bg-card text-foreground shadow-sm"
+                  : "text-muted-foreground hover:text-foreground"
+              }`}
+            >
+              VFC (HRV)
+            </button>
+          </div>
+        </div>
+      </CardHeader>
+      <CardContent className="pt-6 pr-4 pl-2">
+        {!hasData ? (
+          <div className="flex h-[200px] items-center justify-center text-xs text-muted-foreground text-center px-4">
+            Données insuffisantes sur les 30 derniers jours.<br />
+            Synchronisez votre montre connectée pour afficher le graphique.
+          </div>
+        ) : (
+          <ResponsiveContainer width="100%" height={180}>
+            <LineChart data={chartData} margin={{ top: 5, right: 5, bottom: 5, left: -25 }}>
+              <CartesianGrid strokeDasharray="3 3" vertical={false} stroke="var(--border)" opacity={0.3} />
+              <XAxis
+                dataKey="date"
+                tick={{ fontSize: 9, fill: "var(--muted-foreground)" }}
+                tickLine={false}
+                axisLine={false}
+                tickFormatter={(tick) => format(parseISO(tick), "d MMM", { locale: fr })}
+              />
+              <YAxis
+                domain={activeTab === "hr" ? ["dataMin - 5", "dataMax + 5"] : ["dataMin - 10", "dataMax + 10"]}
+                tick={{ fontSize: 9, fill: "var(--muted-foreground)" }}
+                tickLine={false}
+                axisLine={false}
+                width={35}
+                unit={activeTab === "hr" ? " bpm" : " ms"}
+              />
+              <Tooltip content={<CustomTooltip type={activeTab} />} />
+              <Line
+                type="monotone"
+                dataKey="value"
+                stroke={activeTab === "hr" ? "#ef4444" : "#8b5cf6"}
+                strokeWidth={2.5}
+                dot={{ r: 3, strokeWidth: 0, fill: activeTab === "hr" ? "#ef4444" : "#8b5cf6" }}
+                activeDot={{ r: 5, strokeWidth: 0 }}
+              />
+            </LineChart>
+          </ResponsiveContainer>
+        )}
+      </CardContent>
+    </Card>
+  )
+}
diff --git a/web/app/(app)/injuries/injury-actions.tsx b/web/app/(app)/health/injury-actions.tsx
similarity index 100%
rename from web/app/(app)/injuries/injury-actions.tsx
rename to web/app/(app)/health/injury-actions.tsx
diff --git a/web/app/(app)/injuries/injury-form-toggle.tsx b/web/app/(app)/health/injury-form-toggle.tsx
similarity index 100%
rename from web/app/(app)/injuries/injury-form-toggle.tsx
rename to web/app/(app)/health/injury-form-toggle.tsx
diff --git a/web/app/(app)/injuries/injury-form.tsx b/web/app/(app)/health/injury-form.tsx
similarity index 100%
rename from web/app/(app)/injuries/injury-form.tsx
rename to web/app/(app)/health/injury-form.tsx
diff --git a/web/app/(app)/health/page.tsx b/web/app/(app)/health/page.tsx
new file mode 100644
index 0000000..daee537
--- /dev/null
+++ b/web/app/(app)/health/page.tsx
@@ -0,0 +1,427 @@
+import type { Metadata } from "next"
+import { format, parseISO } from "date-fns"
+import { fr } from "date-fns/locale"
+import {
+  AlertTriangle,
+  CheckCircle2,
+  HeartPulse,
+  ShieldCheck,
+  Moon,
+  Activity,
+  Heart,
+  Zap,
+  Gauge,
+  Wind,
+  Droplet,
+  TrendingUp,
+  Info,
+} from "lucide-react"
+
+import { createClient } from "@/lib/supabase/server"
+import { Badge } from "@/components/ui/badge"
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { EmptyState } from "@/components/ui/empty-state"
+import { getAcwrContext } from "@/lib/server/injuries/acwr"
+
+import { InjuryActions } from "./injury-actions"
+import { InjuryFormToggle } from "./injury-form-toggle"
+import { HealthChart } from "./health-chart"
+
+export const metadata: Metadata = { title: "Santé · SportTrack" }
+
+type Injury = {
+  id: string
+  body_zone: string
+  injury_type: string | null
+  severity: number | null
+  start_date: string
+  end_date: string | null
+  description: string | null
+  treatment: string | null
+}
+
+const SEVERITY_CONFIG: Record<number, { label: string; className: string }> = {
+  1: { label: "Légère", className: "bg-yellow-100 text-yellow-800 border-yellow-200 dark:bg-yellow-950/30 dark:text-yellow-400 dark:border-yellow-900/50" },
+  2: { label: "Modérée", className: "bg-orange-100 text-orange-800 border-orange-200 dark:bg-orange-950/30 dark:text-orange-400 dark:border-orange-900/50" },
+  3: { label: "Sévère", className: "bg-red-100 text-red-800 border-red-200 dark:bg-red-950/30 dark:text-red-400 dark:border-red-900/50" },
+}
+
+const INJURY_TYPE_LABELS: Record<string, string> = {
+  muscular: "Musculaire",
+  tendinous: "Tendineux",
+  bone: "Osseux",
+  ligament: "Ligamentaire",
+  other: "Autre",
+}
+
+const HRV_STATUS_MAP: Record<string, { label: string; className: string }> = {
+  balanced: { label: "Équilibrée", className: "bg-emerald-100 text-emerald-800 border-emerald-200 dark:bg-emerald-950/30 dark:text-emerald-400 dark:border-emerald-800/50" },
+  low: { label: "Basse", className: "bg-amber-100 text-amber-800 border-amber-200 dark:bg-amber-950/30 dark:text-amber-400 dark:border-amber-800/50" },
+  unbalanced: { label: "Déséquilibrée", className: "bg-orange-100 text-orange-800 border-orange-200 dark:bg-orange-950/30 dark:text-orange-400 dark:border-orange-800/50" },
+  poor: { label: "Mauvaise", className: "bg-red-100 text-red-800 border-red-200 dark:bg-red-950/30 dark:text-red-400 dark:border-red-800/50" },
+  no_status: { label: "Pas de statut", className: "bg-muted text-muted-foreground border-border" },
+}
+
+function formatZone(zone: string): string {
+  return zone.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase())
+}
+
+function formatSleepDuration(minutes: number | null): string {
+  if (minutes == null) return "–"
+  const h = Math.floor(minutes / 60)
+  const m = minutes % 60
+  if (h > 0) return `${h}h${m.toString().padStart(2, "0")}`
+  return `${m}m`
+}
+
+function getLatestValue<T>(metrics: any[] | null, key: string): T | null {
+  if (!metrics) return null
+  for (let i = metrics.length - 1; i >= 0; i--) {
+    if (metrics[i][key] != null) {
+      return metrics[i][key] as T
+    }
+  }
+  return null
+}
+
+function HelpTooltip({ content }: { content: string }) {
+  return (
+    <div className="group relative inline-flex items-center ml-1 cursor-help">
+      <Info className="h-3.5 w-3.5 text-muted-foreground/50 hover:text-foreground transition-colors" />
+      <div className="pointer-events-none absolute bottom-full left-1/2 z-50 mb-2 w-64 -translate-x-1/2 rounded-lg border bg-popover p-3 text-xs text-popover-foreground shadow-md opacity-0 scale-95 origin-bottom transition-all duration-200 group-hover:pointer-events-auto group-hover:opacity-100 group-hover:scale-100 dark:bg-zinc-900 dark:border-zinc-800">
+        <div className="absolute top-full left-1/2 h-2 w-2 -translate-x-1/2 -translate-y-1 rotate-45 border-r border-b bg-popover dark:bg-zinc-900 dark:border-zinc-800" />
+        <p className="font-normal leading-relaxed">{content}</p>
+      </div>
+    </div>
+  )
+}
+
+function InjuryCard({ injury }: { injury: Injury }) {
+  const isActive = !injury.end_date
+  const sev = injury.severity ? SEVERITY_CONFIG[injury.severity] : null
+  const startFmt = format(parseISO(injury.start_date), "d MMM yyyy", { locale: fr })
+  const endFmt = injury.end_date
+    ? format(parseISO(injury.end_date), "d MMM yyyy", { locale: fr })
+    : null
+
+  return (
+    <Card className={isActive ? "border-orange-300 dark:border-orange-950/60" : ""}>
+      <CardContent className="pt-4">
+        <div className="flex items-start justify-between gap-3">
+          <div className="flex items-center gap-2">
+            {isActive ? (
+              <AlertTriangle className="h-4 w-4 shrink-0 text-orange-500 animate-pulse" />
+            ) : (
+              <CheckCircle2 className="h-4 w-4 shrink-0 text-emerald-500" />
+            )}
+            <div>
+              <p className="font-medium text-foreground">{formatZone(injury.body_zone)}</p>
+              <p className="text-xs text-muted-foreground">
+                {startFmt}
+                {endFmt ? ` → ${endFmt}` : " → en cours"}
+              </p>
+            </div>
+          </div>
+          <div className="flex shrink-0 items-center gap-2">
+            {sev && (
+              <span className={`rounded-full border px-2 py-0.5 text-[10px] font-semibold ${sev.className}`}>
+                {sev.label}
+              </span>
+            )}
+            {injury.injury_type && (
+              <Badge variant="secondary" className="text-[10px]">
+                {INJURY_TYPE_LABELS[injury.injury_type] ?? injury.injury_type}
+              </Badge>
+            )}
+            <InjuryActions injury={injury} />
+          </div>
+        </div>
+
+        {injury.description && (
+          <p className="mt-2 text-sm text-muted-foreground leading-relaxed">{injury.description}</p>
+        )}
+        {injury.treatment && (
+          <p className="mt-1 text-xs text-muted-foreground">
+            <span className="font-medium text-foreground">Traitement :</span> {injury.treatment}
+          </p>
+        )}
+      </CardContent>
+    </Card>
+  )
+}
+
+export default async function HealthPage() {
+  const supabase = await createClient()
+  const { data: { user } } = await supabase.auth.getUser()
+  if (!user) return null
+
+  const today = new Date().toISOString().slice(0, 10)
+  const thirtyDaysAgo = new Date()
+  thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)
+  const thirtyDaysAgoStr = thirtyDaysAgo.toISOString().slice(0, 10)
+
+  // Promise.all to fetch metrics, injuries and ACWR in parallel
+  const [dailyMetricsResult, injuriesResult, acwr] = await Promise.all([
+    supabase
+      .from("daily_metrics")
+      .select("metric_date, resting_hr, hrv_rmssd, hrv_status, sleep_score, sleep_duration_min, sleep_deep_min, sleep_rem_min, sleep_light_min, sleep_awake_min, body_battery_morning, body_battery_evening, training_readiness, stress_score_avg, spo2_avg, respiration_avg, vo2max_estimated")
+      .eq("user_id", user.id)
+      .gte("metric_date", thirtyDaysAgoStr)
+      .order("metric_date", { ascending: true }),
+    supabase
+      .from("injuries")
+      .select("id, body_zone, injury_type, severity, start_date, end_date, description, treatment")
+      .eq("user_id", user.id)
+      .order("start_date", { ascending: false }),
+    getAcwrContext(user.id),
+  ])
+
+  const dailyMetrics = dailyMetricsResult.data ?? []
+  const injuries = injuriesResult.data ?? []
+
+  // Extract active vs historical injuries
+  const active = injuries.filter((i) => !i.end_date || i.end_date >= today)
+  const historical = injuries.filter((i) => i.end_date && i.end_date < today)
+
+  // Get the latest values for key recovery metrics
+  const sleepScore = getLatestValue<number>(dailyMetrics, "sleep_score")
+  const sleepDuration = getLatestValue<number>(dailyMetrics, "sleep_duration_min")
+  const hrv = getLatestValue<number>(dailyMetrics, "hrv_rmssd")
+  const hrvStatus = getLatestValue<string>(dailyMetrics, "hrv_status")
+  const restingHr = getLatestValue<number>(dailyMetrics, "resting_hr")
+  const bodyBattery = getLatestValue<number>(dailyMetrics, "body_battery_morning")
+  const stressScore = getLatestValue<number>(dailyMetrics, "stress_score_avg")
+  const spo2 = getLatestValue<number>(dailyMetrics, "spo2_avg")
+  const respiration = getLatestValue<number>(dailyMetrics, "respiration_avg")
+  const vo2max = getLatestValue<number>(dailyMetrics, "vo2max_estimated")
+
+  return (
+    <div className="mx-auto max-w-5xl space-y-6">
+      {/* Page Header */}
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <HeartPulse className="h-5 w-5 text-rose-500 animate-pulse" style={{ animationDuration: '3s' }} />
+          <h1 className="text-xl font-semibold">Santé & Récupération</h1>
+        </div>
+        <InjuryFormToggle />
+      </div>
+
+      {/* Main recovery metrics grid */}
+      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+        {/* Sommeil */}
+        <Card className="relative overflow-hidden border border-border bg-card/50 backdrop-blur-sm transition-all hover:bg-card">
+          <CardContent className="pt-4 flex flex-col justify-between h-full min-h-[110px]">
+            <div className="flex items-center justify-between text-sm text-muted-foreground">
+              <span className="flex items-center gap-1.5 font-medium">
+                <Moon className="h-4 w-4 text-indigo-400" />
+                Sommeil
+              </span>
+              <HelpTooltip content="Indicateur global (0-100) combinant la durée, la structure des phases (sommeil profond pour la récupération musculaire, paradoxal pour le système nerveux) et les interruptions." />
+            </div>
+            <div className="mt-2 flex items-baseline gap-2">
+              <span className="text-3xl font-extrabold tracking-tight">
+                {sleepScore !== null ? `${sleepScore}` : "–"}
+              </span>
+              {sleepScore !== null && <span className="text-xs text-muted-foreground">/100</span>}
+            </div>
+            <p className="text-xs text-muted-foreground mt-1">
+              Durée : {formatSleepDuration(sleepDuration)}
+            </p>
+          </CardContent>
+        </Card>
+
+        {/* HRV */}
+        <Card className="relative overflow-hidden border border-border bg-card/50 backdrop-blur-sm transition-all hover:bg-card">
+          <CardContent className="pt-4 flex flex-col justify-between h-full min-h-[110px]">
+            <div className="flex items-center justify-between text-sm text-muted-foreground">
+              <span className="flex items-center gap-1.5 font-medium">
+                <Activity className="h-4 w-4 text-purple-400" />
+                VFC / HRV
+              </span>
+              <HelpTooltip content="Variabilité de la fréquence cardiaque (RMSSD en ms). Reflète l'activité de votre système nerveux autonome. Une valeur élevée ou 'équilibrée' est synonyme de bonne forme." />
+            </div>
+            <div className="mt-2 flex items-baseline gap-2">
+              <span className="text-3xl font-extrabold tracking-tight">
+                {hrv !== null ? `${Math.round(hrv)}` : "–"}
+              </span>
+              {hrv !== null && <span className="text-xs text-muted-foreground">ms</span>}
+            </div>
+            <div className="mt-1">
+              {hrvStatus ? (
+                <span className={`inline-block rounded-full border px-2 py-0.5 text-[10px] font-semibold ${HRV_STATUS_MAP[hrvStatus]?.className || ""}`}>
+                  {HRV_STATUS_MAP[hrvStatus]?.label || hrvStatus}
+                </span>
+              ) : (
+                <span className="text-xs text-muted-foreground">–</span>
+              )}
+            </div>
+          </CardContent>
+        </Card>
+
+        {/* FC de repos */}
+        <Card className="relative overflow-hidden border border-border bg-card/50 backdrop-blur-sm transition-all hover:bg-card">
+          <CardContent className="pt-4 flex flex-col justify-between h-full min-h-[110px]">
+            <div className="flex items-center justify-between text-sm text-muted-foreground">
+              <span className="flex items-center gap-1.5 font-medium">
+                <Heart className="h-4 w-4 text-rose-500" />
+                FC repos
+              </span>
+              <HelpTooltip content="Pulsations cardiaques par minute (bpm) mesurées au repos complet (généralement pendant le sommeil). Plus le niveau est bas, plus le muscle cardiaque est fort et économe." />
+            </div>
+            <div className="mt-2 flex items-baseline gap-2">
+              <span className="text-3xl font-extrabold tracking-tight">
+                {restingHr !== null ? `${Math.round(restingHr)}` : "–"}
+              </span>
+              {restingHr !== null && <span className="text-xs text-muted-foreground">bpm</span>}
+            </div>
+            <p className="text-xs text-muted-foreground mt-1">
+              Reflète la récupération globale
+            </p>
+          </CardContent>
+        </Card>
+
+        {/* Body Battery & Stress */}
+        <Card className="relative overflow-hidden border border-border bg-card/50 backdrop-blur-sm transition-all hover:bg-card">
+          <CardContent className="pt-4 flex flex-col justify-between h-full min-h-[110px]">
+            <div className="flex items-center justify-between text-sm text-muted-foreground">
+              <span className="flex items-center gap-1.5 font-medium">
+                <Zap className="h-4 w-4 text-yellow-400" />
+                Energie / Stress
+              </span>
+              <HelpTooltip content="Le niveau de batterie corporelle estime vos ressources (0-100) en combinant VFC, sommeil et activité. Le score de stress évalue les tensions physiologiques au cours du jour." />
+            </div>
+            <div className="mt-2 flex items-baseline gap-2">
+              <span className="text-3xl font-extrabold tracking-tight">
+                {bodyBattery !== null ? `${Math.round(bodyBattery)}` : "–"}
+              </span>
+              {bodyBattery !== null && <span className="text-xs text-muted-foreground">/100 (Battery)</span>}
+            </div>
+            <p className="text-xs text-muted-foreground mt-1">
+              Stress moyen : {stressScore !== null ? `${Math.round(stressScore)}/100` : "–"}
+            </p>
+          </CardContent>
+        </Card>
+      </div>
+
+      {/* Secondary metrics summary */}
+      <Card className="border border-border bg-card/30 backdrop-blur-sm">
+        <CardHeader className="py-2.5 px-4 border-b border-border/40">
+          <CardTitle className="text-xs font-semibold uppercase tracking-wider text-muted-foreground flex items-center gap-1.5">
+            <TrendingUp className="h-3.5 w-3.5" />
+            Autres indicateurs physiologiques
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="py-3 px-4 grid grid-cols-3 gap-4 text-center sm:text-left">
+          <div className="flex flex-col gap-1 border-r border-border/50 pr-4 last:border-r-0">
+            <div className="text-xs text-muted-foreground flex items-center justify-center sm:justify-start gap-1">
+              <Droplet className="h-3.5 w-3.5 text-cyan-400" />
+              SpO2 moyen
+              <HelpTooltip content="Saturation pulsée en oxygène dans le sang (%). Les valeurs entre 95% et 100% sont normales. Une baisse peut indiquer de la fatigue ou l'altitude." />
+            </div>
+            <p className="text-lg font-bold mt-0.5">
+              {spo2 !== null ? `${spo2.toFixed(1)}%` : "–"}
+            </p>
+          </div>
+          <div className="flex flex-col gap-1 border-r border-border/50 pr-4 last:border-r-0">
+            <div className="text-xs text-muted-foreground flex items-center justify-center sm:justify-start gap-1">
+              <Wind className="h-3.5 w-3.5 text-blue-300" />
+              Respiration
+              <HelpTooltip content="Fréquence respiratoire moyenne nocturne ou quotidienne (respirations par minute). Une hausse notable traduit un stress ou une défense immunitaire." />
+            </div>
+            <p className="text-lg font-bold mt-0.5">
+              {respiration !== null ? `${respiration.toFixed(1)} cpm` : "–"}
+            </p>
+          </div>
+          <div className="flex flex-col gap-1 last:border-r-0">
+            <div className="text-xs text-muted-foreground flex items-center justify-center sm:justify-start gap-1">
+              <Gauge className="h-3.5 w-3.5 text-emerald-400" />
+              VO2 Max
+              <HelpTooltip content="Débit maximal d'oxygène consommé lors d'un effort intense. Un score élevé reflète de bonnes capacités d'endurance aérobie." />
+            </div>
+            <p className="text-lg font-bold mt-0.5">
+              {vo2max !== null ? `${vo2max.toFixed(0)}` : "–"}
+            </p>
+          </div>
+        </CardContent>
+      </Card>
+
+      {/* Middle Grid - Trend Chart and Training Load Context */}
+      <div className="grid gap-4 lg:grid-cols-3">
+        {/* Trend Graph (2/3 width on desktop) */}
+        <div className="lg:col-span-2">
+          <HealthChart data={dailyMetrics} />
+        </div>
+
+        {/* Load Context Card (1/3 width on desktop) */}
+        <div>
+          <Card className="h-full">
+            <CardHeader className="pb-2 border-b border-border/40">
+              <CardTitle className="text-sm font-semibold tracking-wide text-muted-foreground uppercase">
+                Contexte charge
+              </CardTitle>
+            </CardHeader>
+            <CardContent className="pt-4 space-y-4 text-sm">
+              <div className="flex items-center justify-between border-b border-border/50 pb-2">
+                <span className="text-muted-foreground flex items-center gap-1">
+                  ACWR
+                  <HelpTooltip content="Acute Chronic Workload Ratio. Ratio entre votre fatigue récente (charge 7j) et votre historique de travail (charge 28j). Idéalement situé entre 0.8 et 1.3. Au-delà de 1.5, le risque de blessure augmente fortement." />
+                </span>
+                <span className="font-semibold text-base">{acwr.acwr.toFixed(2)}</span>
+              </div>
+              <div className="flex items-center justify-between border-b border-border/50 pb-2">
+                <span className="text-muted-foreground">Charge aiguë (7j)</span>
+                <span className="font-semibold">{acwr.acute_load_7d}</span>
+              </div>
+              <div className="flex items-center justify-between pb-1">
+                <span className="text-muted-foreground">Charge chronique (28j)</span>
+                <span className="font-semibold">{acwr.chronic_load_28d}</span>
+              </div>
+            </CardContent>
+          </Card>
+        </div>
+      </div>
+
+      {/* Injuries Registry Section */}
+      <div className="space-y-4">
+        <h2 className="text-sm font-semibold uppercase tracking-wider text-muted-foreground">
+          Registre des blessures
+        </h2>
+        {active.length === 0 && historical.length === 0 ? (
+          <EmptyState
+            icon={ShieldCheck}
+            title="Aucune blessure enregistrée"
+            description="Tout va bien ! Déclarez une blessure dès qu'elle survient pour suivre son évolution et adapter vos charges."
+          />
+        ) : (
+          <div className="space-y-6">
+            {/* Active Injuries */}
+            <section className="space-y-3">
+              <h3 className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">
+                En cours ({active.length})
+              </h3>
+              {active.length === 0 ? (
+                <p className="text-xs text-muted-foreground bg-card/25 rounded-lg border border-border p-4 text-center">Aucune blessure active signalée.</p>
+              ) : (
+                <div className="grid gap-3 sm:grid-cols-2">
+                  {active.map((i) => <InjuryCard key={i.id} injury={i} />)}
+                </div>
+              )}
+            </section>
+
+            {/* Historical Injuries */}
+            {historical.length > 0 && (
+              <section className="space-y-3">
+                <h3 className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">
+                  Historique ({historical.length})
+                </h3>
+                <div className="grid gap-3 sm:grid-cols-2">
+                  {historical.map((i) => <InjuryCard key={i.id} injury={i} />)}
+                </div>
+              </section>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/web/app/(app)/injuries/page.tsx b/web/app/(app)/injuries/page.tsx
deleted file mode 100644
index be89df1..0000000
--- a/web/app/(app)/injuries/page.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import type { Metadata } from "next"
-import { format, parseISO } from "date-fns"
-import { fr } from "date-fns/locale"
-import { AlertTriangle, CheckCircle2, HeartPulse, ShieldCheck } from "lucide-react"
-
-import { createClient } from "@/lib/supabase/server"
-import { Badge } from "@/components/ui/badge"
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
-import { EmptyState } from "@/components/ui/empty-state"
-import { getAcwrContext } from "@/lib/server/injuries/acwr"
-
-import { InjuryActions } from "./injury-actions"
-import { InjuryFormToggle } from "./injury-form-toggle"
-
-export const metadata: Metadata = { title: "Blessures · SportTrack" }
-
-type Injury = {
-  id: string
-  body_zone: string
-  injury_type: string | null
-  severity: number | null
-  start_date: string
-  end_date: string | null
-  description: string | null
-  treatment: string | null
-}
-
-const SEVERITY_CONFIG: Record<number, { label: string; className: string }> = {
-  1: { label: "Légère", className: "bg-yellow-100 text-yellow-800 border-yellow-200" },
-  2: { label: "Modérée", className: "bg-orange-100 text-orange-800 border-orange-200" },
-  3: { label: "Sévère", className: "bg-red-100 text-red-800 border-red-200" },
-}
-
-const INJURY_TYPE_LABELS: Record<string, string> = {
-  muscular: "Musculaire",
-  tendinous: "Tendineux",
-  bone: "Osseux",
-  ligament: "Ligamentaire",
-  other: "Autre",
-}
-
-function formatZone(zone: string): string {
-  return zone.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase())
-}
-
-function InjuryCard({ injury }: { injury: Injury }) {
-  const isActive = !injury.end_date
-  const sev = injury.severity ? SEVERITY_CONFIG[injury.severity] : null
-  const startFmt = format(parseISO(injury.start_date), "d MMM yyyy", { locale: fr })
-  const endFmt = injury.end_date
-    ? format(parseISO(injury.end_date), "d MMM yyyy", { locale: fr })
-    : null
-
-  return (
-    <Card className={isActive ? "border-orange-300" : ""}>
-      <CardContent className="pt-4">
-        <div className="flex items-start justify-between gap-3">
-          <div className="flex items-center gap-2">
-            {isActive ? (
-              <AlertTriangle className="h-4 w-4 shrink-0 text-orange-500" />
-            ) : (
-              <CheckCircle2 className="h-4 w-4 shrink-0 text-emerald-500" />
-            )}
-            <div>
-              <p className="font-medium">{formatZone(injury.body_zone)}</p>
-              <p className="text-xs text-muted-foreground">
-                {startFmt}
-                {endFmt ? ` → ${endFmt}` : " → en cours"}
-              </p>
-            </div>
-          </div>
-          <div className="flex shrink-0 items-center gap-2">
-            {sev && (
-              <span className={`rounded-full border px-2 py-0.5 text-xs font-medium ${sev.className}`}>
-                {sev.label}
-              </span>
-            )}
-            {injury.injury_type && (
-              <Badge variant="secondary" className="text-xs">
-                {INJURY_TYPE_LABELS[injury.injury_type] ?? injury.injury_type}
-              </Badge>
-            )}
-            <InjuryActions injury={injury} />
-          </div>
-        </div>
-
-        {injury.description && (
-          <p className="mt-2 text-sm text-muted-foreground">{injury.description}</p>
-        )}
-        {injury.treatment && (
-          <p className="mt-1 text-xs text-muted-foreground">
-            <span className="font-medium">Traitement :</span> {injury.treatment}
-          </p>
-        )}
-      </CardContent>
-    </Card>
-  )
-}
-
-export default async function InjuriesPage() {
-  const supabase = await createClient()
-  const { data: { user } } = await supabase.auth.getUser()
-  if (!user) return null
-
-  const today = new Date().toISOString().slice(0, 10)
-
-  const { data: injuries } = await supabase
-    .from("injuries")
-    .select("id, body_zone, injury_type, severity, start_date, end_date, description, treatment")
-    .eq("user_id", user.id)
-    .order("start_date", { ascending: false })
-
-  const acwr = await getAcwrContext(user.id)
-  const active = (injuries ?? []).filter((i) => !i.end_date || i.end_date >= today)
-  const historical = (injuries ?? []).filter((i) => i.end_date && i.end_date < today)
-
-  return (
-    <div className="mx-auto max-w-2xl space-y-6">
-      <div className="flex items-center justify-between">
-        <div className="flex items-center gap-2">
-          <HeartPulse className="h-5 w-5 text-primary" />
-          <h1 className="text-xl font-semibold">Blessures</h1>
-        </div>
-        <InjuryFormToggle />
-      </div>
-
-      <Card>
-        <CardHeader className="pb-2">
-          <CardTitle className="text-base">Contexte charge</CardTitle>
-        </CardHeader>
-        <CardContent className="grid grid-cols-3 gap-3 text-sm">
-          <div>
-            <p className="text-xs text-muted-foreground">ACWR</p>
-            <p className="font-semibold">{acwr.acwr.toFixed(2)}</p>
-          </div>
-          <div>
-            <p className="text-xs text-muted-foreground">Charge 7j</p>
-            <p className="font-semibold">{acwr.acute_load_7d}</p>
-          </div>
-          <div>
-            <p className="text-xs text-muted-foreground">Charge 28j</p>
-            <p className="font-semibold">{acwr.chronic_load_28d}</p>
-          </div>
-        </CardContent>
-      </Card>
-
-      {active.length === 0 && historical.length === 0 ? (
-        <EmptyState
-          icon={ShieldCheck}
-          title="Aucune blessure enregistrée"
-          description="Tout va bien ! Signalez une blessure dès qu'elle survient pour en suivre l'évolution."
-        />
-      ) : (
-        <>
-          {/* Blessures actives */}
-          <section className="space-y-3">
-            <h2 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-              En cours ({active.length})
-            </h2>
-            {active.length === 0 ? (
-              <p className="text-sm text-muted-foreground">Aucune blessure active.</p>
-            ) : (
-              active.map((i) => <InjuryCard key={i.id} injury={i} />)
-            )}
-          </section>
-
-          {/* Historique */}
-          {historical.length > 0 && (
-            <section className="space-y-3">
-              <h2 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">
-                Historique ({historical.length})
-              </h2>
-              {historical.map((i) => <InjuryCard key={i.id} injury={i} />)}
-            </section>
-          )}
-        </>
-      )}
-    </div>
-  )
-}
diff --git a/web/app/(app)/settings/feedback-actions.ts b/web/app/(app)/settings/feedback-actions.ts
new file mode 100644
index 0000000..59867c8
--- /dev/null
+++ b/web/app/(app)/settings/feedback-actions.ts
@@ -0,0 +1,43 @@
+"use server"
+
+import { revalidatePath } from "next/cache"
+import { createClient } from "@/lib/supabase/server"
+
+export async function submitAppFeedback(
+  formData: FormData,
+): Promise<{ success?: boolean; error?: string }> {
+  const supabase = await createClient()
+  const {
+    data: { user },
+  } = await supabase.auth.getUser()
+
+  if (!user) return { error: "Non authentifié" }
+
+  const feedbackType = formData.get("feedback_type") as string
+  const message = (formData.get("message") as string)?.trim() ?? ""
+
+  if (!feedbackType || !["bug", "feature", "other"].includes(feedbackType)) {
+    return { error: "Type de retour invalide." }
+  }
+
+  if (!message) {
+    return { error: "Le message ne peut pas être vide." }
+  }
+
+  if (message.length > 5000) {
+    return { error: "Le message est trop long (maximum 5000 caractères)." }
+  }
+
+  const { error } = await supabase.from("app_feedback").insert({
+    user_id: user.id,
+    feedback_type: feedbackType as "bug" | "feature" | "other",
+    message,
+  })
+
+  if (error) {
+    return { error: error.message }
+  }
+
+  revalidatePath("/settings")
+  return { success: true }
+}
diff --git a/web/app/(app)/settings/feedback-form.tsx b/web/app/(app)/settings/feedback-form.tsx
new file mode 100644
index 0000000..9f0179b
--- /dev/null
+++ b/web/app/(app)/settings/feedback-form.tsx
@@ -0,0 +1,139 @@
+"use client"
+
+import { useState, useTransition } from "react"
+import { toast } from "sonner"
+import { Bug, Lightbulb, MessageSquare, Send } from "lucide-react"
+
+import { Button } from "@/components/ui/button"
+import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "@/components/ui/card"
+
+import { submitAppFeedback } from "./feedback-actions"
+
+export function FeedbackForm() {
+  const [feedbackType, setFeedbackType] = useState<"bug" | "feature" | "other">("bug")
+  const [message, setMessage] = useState("")
+  const [isPending, startTransition] = useTransition()
+
+  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault()
+    if (!message.trim()) {
+      toast.error("Veuillez saisir un message.")
+      return
+    }
+
+    const formData = new FormData()
+    formData.set("feedback_type", feedbackType)
+    formData.set("message", message)
+
+    startTransition(async () => {
+      const result = await submitAppFeedback(formData)
+      if (result.error) {
+        toast.error(result.error)
+      } else {
+        toast.success("Merci ! Votre retour a bien été transmis.")
+        setMessage("")
+      }
+    })
+  }
+
+  const types = [
+    {
+      key: "bug",
+      label: "Bug / Problème",
+      icon: Bug,
+      color: "text-red-500",
+      bgColor: "bg-red-50/50 dark:bg-red-950/20 border-red-200 dark:border-red-900/30",
+    },
+    {
+      key: "feature",
+      label: "Idée / Amélioration",
+      icon: Lightbulb,
+      color: "text-yellow-500",
+      bgColor: "bg-yellow-50/50 dark:bg-yellow-950/20 border-yellow-200 dark:border-yellow-900/30",
+    },
+    {
+      key: "other",
+      label: "Autre remarque",
+      icon: MessageSquare,
+      color: "text-blue-500",
+      bgColor: "bg-blue-50/50 dark:bg-blue-950/20 border-blue-200 dark:border-blue-900/30",
+    },
+  ]
+
+  return (
+    <Card className="border border-border bg-card">
+      <CardHeader>
+        <CardTitle className="text-lg flex items-center gap-2">
+          <MessageSquare className="h-5 w-5 text-primary" />
+          Donner votre avis / Signaler un bug
+        </CardTitle>
+        <CardDescription>
+          Partagez vos impressions sur SportTrack, suggérez une nouvelle fonctionnalité ou signalez un bug.
+        </CardDescription>
+      </CardHeader>
+      <CardContent>
+        <form onSubmit={handleSubmit} className="space-y-5">
+          {/* Type selector */}
+          <div className="space-y-2">
+            <label className="text-xs font-semibold uppercase tracking-wider text-muted-foreground">Type de retour</label>
+            <div className="grid grid-cols-3 gap-3">
+              {types.map((t) => {
+                const isSelected = feedbackType === t.key
+                const Icon = t.icon
+                return (
+                  <button
+                    key={t.key}
+                    type="button"
+                    onClick={() => setFeedbackType(t.key as any)}
+                    className={`flex flex-col items-center justify-center rounded-xl border p-4 text-center transition-all cursor-pointer ${
+                      isSelected
+                        ? `${t.bgColor} border-primary ring-1 ring-primary/30 font-medium`
+                        : "border-border bg-card/30 hover:bg-muted/50 text-muted-foreground hover:text-foreground"
+                    }`}
+                  >
+                    <Icon className={`h-5 w-5 mb-1.5 ${t.color}`} />
+                    <span className="text-xs font-medium">{t.label}</span>
+                  </button>
+                )
+              })}
+            </div>
+          </div>
+
+          {/* Message content */}
+          <div className="space-y-2">
+            <label htmlFor="feedback_message" className="text-xs font-semibold uppercase tracking-wider text-muted-foreground">
+              Votre message
+            </label>
+            <div className="relative">
+              <textarea
+                id="feedback_message"
+                value={message}
+                onChange={(e) => setMessage(e.target.value)}
+                rows={4}
+                maxLength={5000}
+                placeholder={
+                  feedbackType === "bug"
+                    ? "Décrivez le problème rencontré et, si possible, les étapes pour le reproduire..."
+                    : feedbackType === "feature"
+                    ? "Quelle amélioration ou fonctionnalité aimeriez-vous voir sur l'application ?..."
+                    : "Dites-nous ce que vous pensez de l'application ou posez-nous vos questions..."
+                }
+                className="w-full rounded-lg border bg-background px-3.5 py-3 text-sm focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary border-border placeholder:text-muted-foreground/70"
+              />
+              <span className="absolute bottom-2.5 right-3 text-[10px] text-muted-foreground/60">
+                {message.length}/5000
+              </span>
+            </div>
+          </div>
+
+          <div className="flex justify-end pt-1">
+            <Button type="submit" disabled={isPending || !message.trim()} className="w-full sm:w-auto cursor-pointer">
+              <Send className="mr-1.5 h-4 w-4" />
+              {isPending ? "Envoi en cours..." : "Envoyer le retour"}
+            </Button>
+          </div>
+        </form>
+      </CardContent>
+    </Card>
+  )
+}
diff --git a/web/app/(app)/settings/page.tsx b/web/app/(app)/settings/page.tsx
index 3cee757..00cfb50 100644
--- a/web/app/(app)/settings/page.tsx
+++ b/web/app/(app)/settings/page.tsx
@@ -6,6 +6,9 @@ import { getStravaConfig } from "./strava/actions"
 import { GarminConfigForm } from "./garmin/garmin-config-form"
 import { TerraConfigForm } from "./terra/terra-config-form"
 import { getTerraConfig } from "./terra/actions"
+import { PolarConfigForm } from "./polar/polar-config-form"
+import { getPolarConfig } from "./polar/actions"
+import { FeedbackForm } from "./feedback-form"
 import { createClient } from "@/lib/supabase/server"
 
 export const metadata: Metadata = { title: "Paramètres · SportTrack" }
@@ -20,10 +23,30 @@ export default async function SettingsPage({
   const {
     data: { user },
   } = await supabase.auth.getUser()
-  const [stravaConfig, terraConfig] = await Promise.all([
-    getStravaConfig(),
-    getTerraConfig(),
-  ])
+
+  const { data: profile } = await supabase
+    .from("profiles")
+    .select("is_admin")
+    .eq("id", user!.id)
+    .maybeSingle()
+
+  const isAdmin = !!profile?.is_admin
+
+  let stravaConfig = { client_id: "", client_secret: "" }
+  let terraConfig = { dev_id: "", api_key: "", webhook_secret: "" }
+  let polarConfig = { client_id: "", client_secret: "" }
+
+  if (isAdmin) {
+    const [sc, tc, pc] = await Promise.all([
+      getStravaConfig(),
+      getTerraConfig(),
+      getPolarConfig(),
+    ])
+    stravaConfig = sc
+    terraConfig = tc
+    polarConfig = pc
+  }
+
   const { data: garminConn } = await supabase
     .from("provider_connections")
     .select("provider_user_id,last_sync_at")
@@ -38,57 +61,86 @@ export default async function SettingsPage({
       <div>
         <h1 className="text-2xl font-semibold">Paramètres</h1>
         <p className="text-sm text-muted-foreground">
-          Configurez les intégrations utilisées par SportTrack.
+          Configurez vos intégrations et options SportTrack.
         </p>
       </div>
 
-      {error === "missing_config" ? (
-        <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-900">
-          Enregistrez le Client ID et le Client Secret avant de lancer la connexion Strava.
-        </div>
-      ) : null}
+      {isAdmin && (
+        <>
+          {error === "missing_config" ? (
+            <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-900">
+              Enregistrez le Client ID et le Client Secret avant de lancer la connexion Strava.
+            </div>
+          ) : null}
 
-      {error === "missing_state_secret" ? (
-        <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-900">
-          La variable STRAVA_STATE_SECRET ou INTERNAL_SECRET doit être configurée côté serveur
-          avant de lancer la connexion Strava.
-        </div>
-      ) : null}
+          {error === "missing_state_secret" ? (
+            <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-900">
+              La variable STRAVA_STATE_SECRET ou INTERNAL_SECRET doit être configurée côté serveur
+              avant de lancer la connexion Strava.
+            </div>
+          ) : null}
 
-      {error === "terra_config" ? (
-        <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-900">
-          Enregistrez le Dev ID et l'API Key Terra avant de connecter une montre.
-        </div>
-      ) : null}
+          {error === "terra_config" ? (
+            <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-900">
+              Enregistrez le Dev ID et l'API Key Terra avant de connecter une montre.
+            </div>
+          ) : null}
 
-      <section className="space-y-4">
-        <div className="rounded-lg border bg-card p-5 text-sm">
-          <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
-            <div className="space-y-1">
-              <h2 className="font-semibold text-base">Connexion Strava</h2>
-              <p className="text-muted-foreground">
-                Lance le flux OAuth Strava pour connecter votre compte utilisateur. Cette action ne
-                recrée ni webhook ni identifiants d'application.
+          <section className="space-y-4">
+            <div className="rounded-lg border bg-card p-5 text-sm">
+              <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+                <div className="space-y-1">
+                  <h2 className="font-semibold text-base">Connexion Strava (Développeur)</h2>
+                  <p className="text-muted-foreground">
+                    Lance le flux OAuth Strava pour connecter votre compte utilisateur. Cette action ne
+                    recrée ni webhook ni identifiants d'application.
+                  </p>
+                </div>
+                <Link
+                  href="/connections/strava/connect"
+                  className="inline-flex shrink-0 items-center justify-center rounded-md bg-primary px-3 py-2 text-sm font-medium text-primary-foreground shadow hover:bg-primary/90"
+                >
+                  Connecter Strava
+                </Link>
+              </div>
+            </div>
+
+            <StravaConfigForm initialConfig={stravaConfig} />
+          </section>
+
+          <section className="space-y-4">
+            <div>
+              <h2 className="text-lg font-semibold">Clés API Terra</h2>
+              <p className="text-sm text-muted-foreground">
+                Configurez l'intégration d'API Terra pour Polar / Fitbit et autres appareils.
               </p>
             </div>
-            <Link
-              href="/connections/strava/connect"
-              className="inline-flex shrink-0 items-center justify-center rounded-md bg-primary px-3 py-2 text-sm font-medium text-primary-foreground shadow hover:bg-primary/90"
-            >
-              Connecter Strava
-            </Link>
-          </div>
-        </div>
 
-        <StravaConfigForm initialConfig={stravaConfig} />
-      </section>
+            <TerraConfigForm
+              callbackUrl={`${baseUrl}/api/terra/webhook`}
+              initialConfig={terraConfig}
+            />
+          </section>
+
+          <section className="space-y-4">
+            <div>
+              <h2 className="text-lg font-semibold">Clés API Polar Flow</h2>
+              <p className="text-sm text-muted-foreground">
+                Configurez l'intégration Polar Flow en direct par OAuth.
+              </p>
+            </div>
+
+            <PolarConfigForm initialConfig={polarConfig} />
+          </section>
+        </>
+      )}
 
+      {/* Garmin Connect connection card (accessible to all authenticated users) */}
       <section className="space-y-4">
         <div>
-          <h2 className="text-lg font-semibold">Montres connectées</h2>
+          <h2 className="text-lg font-semibold">Montre Garmin</h2>
           <p className="text-sm text-muted-foreground">
-            Garmin Connect est utilisé en priorité via une intégration non officielle. Terra reste
-            disponible si un accès API est configuré plus tard.
+            Saisissez vos identifiants Garmin Connect pour synchroniser vos métriques (sommeil, récupération, FC repos).
           </p>
         </div>
 
@@ -97,11 +149,11 @@ export default async function SettingsPage({
           providerUserId={garminConn?.provider_user_id}
           lastSyncAt={garminConn?.last_sync_at}
         />
+      </section>
 
-        <TerraConfigForm
-          callbackUrl={`${baseUrl}/api/terra/webhook`}
-          initialConfig={terraConfig}
-        />
+      {/* General feedback form (accessible to all authenticated users) */}
+      <section className="space-y-4">
+        <FeedbackForm />
       </section>
     </div>
   )
diff --git a/web/app/(app)/settings/polar/actions.ts b/web/app/(app)/settings/polar/actions.ts
new file mode 100644
index 0000000..a549b46
--- /dev/null
+++ b/web/app/(app)/settings/polar/actions.ts
@@ -0,0 +1,56 @@
+"use server"
+
+import { redirect } from "next/navigation"
+
+import { createClient } from "@/lib/supabase/server"
+import { createServiceClient } from "@/lib/supabase/service"
+
+export interface PolarConfigData {
+  client_id: string
+  client_secret: string
+}
+
+async function requireAdmin(): Promise<void> {
+  const supabase = await createClient()
+  const { data: { user } } = await supabase.auth.getUser()
+  if (!user) redirect("/login")
+
+  const { data: profile } = await supabase
+    .from("profiles")
+    .select("is_admin")
+    .eq("id", user.id)
+    .single()
+
+  if (!profile?.is_admin) redirect("/dashboard")
+}
+
+export async function getPolarConfig(): Promise<PolarConfigData> {
+  await requireAdmin()
+  const service = createServiceClient()
+  const { data } = await service
+    .from("polar_config")
+    .select("client_id, client_secret")
+    .eq("id", 1)
+    .single()
+
+  return {
+    client_id: data?.client_id ?? "",
+    client_secret: data?.client_secret ?? "",
+  }
+}
+
+export async function savePolarConfig(
+  formData: FormData,
+): Promise<{ error?: string }> {
+  await requireAdmin()
+  const client_id = (formData.get("client_id") as string | null)?.trim() ?? ""
+  const client_secret = (formData.get("client_secret") as string | null)?.trim() ?? ""
+
+  const service = createServiceClient()
+  const { error } = await service
+    .from("polar_config")
+    .upsert({ id: 1, client_id, client_secret }, { onConflict: "id" })
+
+  if (error) return { error: error.message }
+  return {}
+}
diff --git a/web/app/(app)/settings/polar/polar-config-form.tsx b/web/app/(app)/settings/polar/polar-config-form.tsx
new file mode 100644
index 0000000..c437bdb
--- /dev/null
+++ b/web/app/(app)/settings/polar/polar-config-form.tsx
@@ -0,0 +1,77 @@
+"use client"
+
+import { useRouter } from "next/navigation"
+import { useState } from "react"
+import { toast } from "sonner"
+
+import { Button } from "@/components/ui/button"
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+
+import { savePolarConfig, type PolarConfigData } from "./actions"
+
+interface Props {
+  initialConfig: PolarConfigData
+}
+
+export function PolarConfigForm({ initialConfig }: Props) {
+  const router = useRouter()
+  const [saving, setSaving] = useState(false)
+
+  async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault()
+    setSaving(true)
+    const result = await savePolarConfig(new FormData(e.currentTarget))
+    setSaving(false)
+    if (result.error) {
+      toast.error(result.error)
+    } else {
+      toast.success("Configuration Polar enregistrée")
+      router.refresh()
+    }
+  }
+
+  return (
+    <div className="space-y-6">
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-lg">Identifiants de l'application Polar Flow</CardTitle>
+        </CardHeader>
+        <CardContent>
+          <form onSubmit={handleSubmit} className="space-y-5">
+            <div className="space-y-2">
+              <Label htmlFor="polar_client_id">Client ID</Label>
+              <Input
+                id="polar_client_id"
+                name="client_id"
+                placeholder="Ex: 5c8bde34-8c88-466d-8888-888888888888"
+                defaultValue={initialConfig.client_id}
+                autoComplete="off"
+              />
+            </div>
+
+            <div className="space-y-2">
+              <Label htmlFor="polar_client_secret">Client Secret</Label>
+              <Input
+                id="polar_client_secret"
+                name="client_secret"
+                type="password"
+                placeholder="••••••••••••••••"
+                defaultValue={initialConfig.client_secret}
+                autoComplete="new-password"
+              />
+              <p className="text-xs text-muted-foreground">
+                Stocké de manière sécurisée côté serveur.
+              </p>
+            </div>
+
+            <Button type="submit" disabled={saving}>
+              {saving ? "Enregistrement…" : "Enregistrer la configuration"}
+            </Button>
+          </form>
+        </CardContent>
+      </Card>
+    </div>
+  )
+}
diff --git a/web/app/(app)/settings/strava/actions.ts b/web/app/(app)/settings/strava/actions.ts
index 20f9470..d2713b6 100644
--- a/web/app/(app)/settings/strava/actions.ts
+++ b/web/app/(app)/settings/strava/actions.ts
@@ -80,6 +80,17 @@ export async function saveStravaConfig(
     .upsert({ id: 1, client_id, client_secret, webhook_verify_token }, { onConflict: "id" })
 
   if (error) return { error: error.message }
+
+  // Automatically register webhook since credentials have changed
+  if (client_id && client_secret) {
+    const webhookResult = await registerStravaWebhook()
+    if (webhookResult.error) {
+      return {
+        error: `Configuration enregistrée, mais échec de l'activation du webhook : ${webhookResult.error}`,
+      }
+    }
+  }
+
   return {}
 }
 
diff --git a/web/app/(app)/settings/strava/strava-config-form.tsx b/web/app/(app)/settings/strava/strava-config-form.tsx
index 7746d93..47237f4 100644
--- a/web/app/(app)/settings/strava/strava-config-form.tsx
+++ b/web/app/(app)/settings/strava/strava-config-form.tsx
@@ -1,8 +1,7 @@
 "use client"
 
 import { useRouter } from "next/navigation"
-import { useRef, useState, useTransition } from "react"
-import { CheckCircle, Loader2, Webhook } from "lucide-react"
+import { useState } from "react"
 import { toast } from "sonner"
 
 import { Button } from "@/components/ui/button"
@@ -10,7 +9,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 
-import { registerStravaWebhook, saveStravaConfig, type StravaConfigData } from "./actions"
+import { saveStravaConfig, type StravaConfigData } from "./actions"
 
 interface Props {
   initialConfig: StravaConfigData
@@ -19,9 +18,6 @@ interface Props {
 export function StravaConfigForm({ initialConfig }: Props) {
   const router = useRouter()
   const [saving, setSaving] = useState(false)
-  const [isPendingWebhook, startWebhook] = useTransition()
-  const [webhookOk, setWebhookOk] = useState(false)
-  const formRef = useRef<HTMLFormElement>(null)
 
   async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault()
@@ -36,22 +32,6 @@ export function StravaConfigForm({ initialConfig }: Props) {
     }
   }
 
-  function handleRegisterWebhook() {
-    startWebhook(async () => {
-      const result = await registerStravaWebhook()
-      if (result.error) {
-        toast.error(`Webhook : ${result.error}`)
-      } else {
-        setWebhookOk(true)
-        toast.success(
-          result.subscription_id
-            ? `Webhook enregistré (ID ${result.subscription_id})`
-            : "Webhook enregistré avec succès",
-        )
-      }
-    })
-  }
-
   return (
     <div className="space-y-6">
       {/* Credentials form */}
@@ -60,7 +40,7 @@ export function StravaConfigForm({ initialConfig }: Props) {
           <CardTitle className="text-lg">Identifiants de l'application Strava</CardTitle>
         </CardHeader>
         <CardContent>
-          <form ref={formRef} onSubmit={handleSubmit} className="space-y-5">
+          <form onSubmit={handleSubmit} className="space-y-5">
             <div className="space-y-2">
               <Label htmlFor="client_id">Client ID</Label>
               <Input
@@ -94,39 +74,6 @@ export function StravaConfigForm({ initialConfig }: Props) {
           </form>
         </CardContent>
       </Card>
-
-      {/* Webhook registration */}
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-lg">Webhook Strava</CardTitle>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          <p className="text-sm text-muted-foreground">
-            Active le webhook global de l'application SportTrack auprès de Strava. À faire{" "}
-            <strong>une seule fois</strong>, indépendamment des connexions utilisateur.
-          </p>
-          <p className="text-xs text-muted-foreground">
-            Callback URL enregistrée :{" "}
-            <code className="rounded bg-muted px-1 py-0.5 text-foreground">
-              {process.env.NEXT_PUBLIC_BASE_URL ?? "…"}/api/strava/webhook
-            </code>
-          </p>
-          <Button
-            variant="outline"
-            onClick={handleRegisterWebhook}
-            disabled={isPendingWebhook || webhookOk}
-          >
-            {isPendingWebhook ? (
-              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-            ) : webhookOk ? (
-              <CheckCircle className="mr-2 h-4 w-4 text-green-500" />
-            ) : (
-              <Webhook className="mr-2 h-4 w-4" />
-            )}
-            {webhookOk ? "Webhook actif" : "Activer le webhook global"}
-          </Button>
-        </CardContent>
-      </Card>
     </div>
   )
 }
diff --git a/web/app/api/cron/polar/route.ts b/web/app/api/cron/polar/route.ts
new file mode 100644
index 0000000..53464e5
--- /dev/null
+++ b/web/app/api/cron/polar/route.ts
@@ -0,0 +1,36 @@
+import { NextRequest, NextResponse } from "next/server"
+
+import { getActivePolarUserIds, syncPolarMetrics } from "@/lib/server/polar/sync"
+
+export const maxDuration = 300
+
+function isAuthorized(request: NextRequest): boolean {
+  const expected = process.env.CRON_SECRET
+  return !!expected && request.headers.get("authorization") === `Bearer ${expected}`
+}
+
+export async function GET(request: NextRequest) {
+  if (!isAuthorized(request)) {
+    return NextResponse.json({ error: "unauthorized" }, { status: 401 })
+  }
+
+  const errors: string[] = []
+  const synced: Array<{ user_id: string; days: number }> = []
+  const ids = await getActivePolarUserIds()
+
+  for (const userId of ids) {
+    try {
+      const count = await syncPolarMetrics(userId, 7)
+      synced.push({ user_id: userId, days: count })
+    } catch (e) {
+      errors.push(`${userId}: ${e instanceof Error ? e.message : String(e)}`)
+    }
+  }
+
+  return NextResponse.json({
+    ok: errors.length === 0,
+    processed: ids.length,
+    synced,
+    errors,
+  })
+}
diff --git a/web/app/api/polar/callback/route.ts b/web/app/api/polar/callback/route.ts
new file mode 100644
index 0000000..de0d56f
--- /dev/null
+++ b/web/app/api/polar/callback/route.ts
@@ -0,0 +1,145 @@
+import { createHmac, timingSafeEqual } from "crypto"
+import { NextRequest, NextResponse } from "next/server"
+
+import { createServiceClient } from "@/lib/supabase/service"
+
+function getStateSecret() {
+  return process.env.POLAR_STATE_SECRET ?? process.env.INTERNAL_SECRET ?? process.env.STRAVA_STATE_SECRET
+}
+
+function getBaseUrl(origin: string) {
+  return (process.env.NEXT_PUBLIC_BASE_URL ?? origin).replace(/\/$/, "")
+}
+
+function verifyState(state: string): { user_id: string } {
+  const decoded = JSON.parse(Buffer.from(state, "base64url").toString("utf-8"))
+  const { payload, sig } = decoded as { payload: string; sig: string }
+
+  const stateSecret = getStateSecret()
+  if (!stateSecret) throw new Error("state secret manquant")
+  const expected = createHmac("sha256", stateSecret).update(payload).digest("hex")
+
+  let valid = false
+  try {
+    valid = timingSafeEqual(Buffer.from(sig, "hex"), Buffer.from(expected, "hex"))
+  } catch {
+    valid = false
+  }
+
+  if (!valid) throw new Error("state invalide")
+
+  return JSON.parse(payload) as { user_id: string }
+}
+
+export async function GET(request: NextRequest) {
+  const baseUrl = getBaseUrl(request.nextUrl.origin)
+  const { searchParams } = request.nextUrl
+
+  const error = searchParams.get("error")
+  const code = searchParams.get("code")
+  const state = searchParams.get("state")
+
+  if (error || !code || !state) {
+    console.error("Polar OAuth callback params missing or error", { error, code, state })
+    return NextResponse.redirect(`${baseUrl}/connections?polar=error`)
+  }
+
+  let user_id: string
+  try {
+    ;({ user_id } = verifyState(state))
+  } catch (err) {
+    console.error("Polar state verification failed", err)
+    return NextResponse.redirect(`${baseUrl}/connections?polar=error`)
+  }
+
+  const supabase = createServiceClient()
+
+  try {
+    // 1. Get credentials
+    const { data: cfg } = await supabase
+      .from("polar_config")
+      .select("client_id, client_secret")
+      .eq("id", 1)
+      .single()
+
+    if (!cfg?.client_id || !cfg?.client_secret) {
+      throw new Error("Polar app config missing")
+    }
+
+    const { client_id, client_secret } = cfg
+
+    // 2. Exchange authorization code
+    const authHeader = Buffer.from(`${client_id}:${client_secret}`).toString("base64")
+    const tokenResponse = await fetch("https://polarremote.com/v2/oauth2/token", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Authorization: `Basic ${authHeader}`,
+      },
+      body: new URLSearchParams({
+        grant_type: "authorization_code",
+        code,
+        redirect_uri: `${baseUrl}/api/polar/callback`,
+      }),
+    })
+
+    if (!tokenResponse.ok) {
+      const errText = await tokenResponse.text()
+      throw new Error(`Polar token exchange failed: ${tokenResponse.status} ${errText}`)
+    }
+
+    const tokenData = await tokenResponse.json()
+    const accessToken = tokenData.access_token
+    const polarUserId = String(tokenData.x_user_id)
+
+    if (!accessToken || !polarUserId) {
+      throw new Error("Invalid token exchange response")
+    }
+
+    // 3. Register user with Polar AccessLink
+    const regResponse = await fetch("https://www.polaraccesslink.com/v3/users", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        Authorization: `Bearer ${accessToken}`,
+      },
+      body: JSON.stringify({
+        "member-id": user_id,
+      }),
+    })
+
+    if (!regResponse.ok && regResponse.status !== 409) {
+      const errText = await regResponse.text()
+      throw new Error(`Polar user registration failed: ${regResponse.status} ${errText}`)
+    }
+
+    // 4. Save connection in Supabase
+    const { error: upsertError } = await supabase.from("provider_connections").upsert(
+      {
+        user_id,
+        provider: "polar",
+        provider_user_id: polarUserId,
+        access_token: accessToken,
+        is_active: true,
+        scopes: ["accesslink.read_all"],
+        last_sync_at: new Date().toISOString(),
+      },
+      { onConflict: "user_id,provider" }
+    )
+
+    if (upsertError) throw upsertError
+
+    // 5. Trigger initial sync
+    const { syncPolarMetrics } = await import("@/lib/server/polar/sync")
+    syncPolarMetrics(user_id, 30).catch((syncErr) => {
+      console.error("Initial Polar metrics sync failed", syncErr)
+    })
+
+  } catch (e) {
+    console.error("Polar callback error", e)
+    return NextResponse.redirect(`${baseUrl}/connections?polar=error`)
+  }
+
+  return NextResponse.redirect(`${baseUrl}/connections?polar=connected`)
+}
diff --git a/web/lib/nav.ts b/web/lib/nav.ts
index 10160a0..1051b4a 100644
--- a/web/lib/nav.ts
+++ b/web/lib/nav.ts
@@ -24,7 +24,7 @@ export const NAV_ITEMS: NavItem[] = [
   { href: "/activities", label: "Activités", icon: ListChecks },
   { href: "/planning", label: "Planning", icon: CalendarClock },
   { href: "/progression", label: "Progression", icon: LineChart },
-  { href: "/injuries", label: "Blessures", icon: HeartPulse },
+  { href: "/health", label: "Santé", icon: HeartPulse },
   { href: "/coaching", label: "Coaching & Groupes", icon: Users },
   { href: "/connections", label: "Connexions", icon: Plug },
   { href: "/profile", label: "Profil", icon: UserRound },
diff --git a/web/lib/server/polar/sync.ts b/web/lib/server/polar/sync.ts
new file mode 100644
index 0000000..abf5f14
--- /dev/null
+++ b/web/lib/server/polar/sync.ts
@@ -0,0 +1,150 @@
+import { createServiceClient } from "@/lib/supabase/service"
+
+async function callPolarApi(endpoint: string, accessToken: string) {
+  const url = `https://www.polaraccesslink.com${endpoint}`
+  const res = await fetch(url, {
+    headers: {
+      Accept: "application/json",
+      Authorization: `Bearer ${accessToken}`,
+    },
+  })
+  if (!res.ok) {
+    if (res.status === 404) return null
+    throw new Error(`Polar API error: ${res.status} for ${endpoint}`)
+  }
+  return res.json()
+}
+
+export async function syncPolarMetrics(userId: string, days = 30): Promise<number> {
+  const supabase = createServiceClient()
+
+  // 1. Get user Polar connection
+  const { data: conn, error: connError } = await supabase
+    .from("provider_connections")
+    .select("access_token, provider_user_id")
+    .eq("user_id", userId)
+    .eq("provider", "polar")
+    .eq("is_active", true)
+    .maybeSingle()
+
+  if (connError || !conn?.access_token) {
+    console.warn(`Polar connection not active or missing for user ${userId}`)
+    return 0
+  }
+
+  const { access_token } = conn
+
+  // 2. Fetch list of sleep and nightly recharge dates
+  const sleepList = await callPolarApi("/v3/users/sleep", access_token)
+  const rechargeList = await callPolarApi("/v3/users/nightly-recharge", access_token)
+
+  // 3. Filter dates to range (last 'days')
+  const cutoff = new Date()
+  cutoff.setDate(cutoff.getDate() - days)
+  const cutoffStr = cutoff.toISOString().split("T")[0] // "YYYY-MM-DD"
+
+  const sleepDates = ((sleepList?.["available-sleep-data"] || []) as string[]).filter(
+    (d) => d >= cutoffStr
+  )
+  const rechargeDates = ((rechargeList?.["available-nightly-recharge-data"] || []) as string[]).filter(
+    (d) => d >= cutoffStr
+  )
+
+  // 4. Fetch details in parallel
+  const sleepDetails = await Promise.all(
+    sleepDates.map(async (date) => {
+      try {
+        const data = await callPolarApi(`/v3/users/sleep/${date}`, access_token)
+        return { date, data }
+      } catch (e) {
+        console.error(`Error fetching Polar sleep for ${date}:`, e)
+        return { date, data: null }
+      }
+    })
+  )
+
+  const rechargeDetails = await Promise.all(
+    rechargeDates.map(async (date) => {
+      try {
+        const data = await callPolarApi(`/v3/users/nightly-recharge/${date}`, access_token)
+        return { date, data }
+      } catch (e) {
+        console.error(`Error fetching Polar recharge for ${date}:`, e)
+        return { date, data: null }
+      }
+    })
+  )
+
+  // 5. Combine and map metrics
+  const metricsByDate: Record<
+    string,
+    {
+      sleep_score?: number | null
+      sleep_duration_min?: number | null
+      resting_hr?: number | null
+      hrv_rmssd?: number | null
+    }
+  > = {}
+
+  for (const s of sleepDetails) {
+    if (!s.data) continue
+    if (!metricsByDate[s.date]) metricsByDate[s.date] = {}
+    metricsByDate[s.date].sleep_score = s.data.sleep_score ?? null
+    if (s.data.sleep_start_time && s.data.sleep_end_time) {
+      const start = new Date(s.data.sleep_start_time).getTime()
+      const end = new Date(s.data.sleep_end_time).getTime()
+      metricsByDate[s.date].sleep_duration_min = Math.round((end - start) / 60000)
+    }
+  }
+
+  for (const r of rechargeDetails) {
+    if (!r.data) continue
+    if (!metricsByDate[r.date]) metricsByDate[r.date] = {}
+    metricsByDate[r.date].resting_hr = r.data.heart_rate_avg ?? null
+    metricsByDate[r.date].hrv_rmssd = r.data.heart_rate_variability_avg ?? null
+  }
+
+  const rows = Object.entries(metricsByDate).map(([date, m]) => ({
+    user_id: userId,
+    metric_date: date,
+    sleep_score: m.sleep_score ?? null,
+    sleep_duration_min: m.sleep_duration_min ?? null,
+    resting_hr: m.resting_hr ?? null,
+    hrv_rmssd: m.hrv_rmssd ?? null,
+  }))
+
+  // 6. Upsert into daily_metrics
+  if (rows.length > 0) {
+    const { error: upsertError } = await supabase
+      .from("daily_metrics")
+      .upsert(rows, { onConflict: "user_id,metric_date" })
+
+    if (upsertError) throw upsertError
+  }
+
+  // 7. Update last sync time
+  await supabase
+    .from("provider_connections")
+    .update({ last_sync_at: new Date().toISOString() })
+    .eq("user_id", userId)
+    .eq("provider", "polar")
+
+  return rows.length
+}
+
+export async function getActivePolarUserIds(): Promise<string[]> {
+  const supabase = createServiceClient()
+  const { data, error } = await supabase
+    .from("provider_connections")
+    .select("user_id")
+    .eq("provider", "polar")
+    .eq("is_active", true)
+
+  if (error) throw error
+
+  const ids = new Set<string>()
+  for (const row of data ?? []) {
+    ids.add(row.user_id)
+  }
+  return Array.from(ids)
+}
diff --git a/web/lib/types/database.ts b/web/lib/types/database.ts
index a1d5611..e1041b5 100644
--- a/web/lib/types/database.ts
+++ b/web/lib/types/database.ts
@@ -142,7 +142,7 @@ export type Database = {
         Row: {
           id: string
           user_id: string
-          provider: "strava" | "terra" | "garmin"
+          provider: "strava" | "terra" | "garmin" | "polar"
           provider_user_id: string
           access_token: string | null
           refresh_token: string | null
@@ -156,7 +156,7 @@ export type Database = {
         Insert: {
           id?: string
           user_id: string
-          provider: "strava" | "terra" | "garmin"
+          provider: "strava" | "terra" | "garmin" | "polar"
           provider_user_id: string
           access_token?: string | null
           refresh_token?: string | null
@@ -532,6 +532,48 @@ export type Database = {
         }
         Relationships: []
       }
+      polar_config: {
+        Row: {
+          id: 1
+          client_id: string
+          client_secret: string
+          updated_at: string
+        }
+        Insert: {
+          id?: 1
+          client_id?: string
+          client_secret?: string
+        }
+        Update: {
+          client_id?: string
+          client_secret?: string
+        }
+        Relationships: []
+      }
+      app_feedback: {
+        Row: {
+          id: string
+          user_id: string
+          feedback_type: "bug" | "feature" | "other"
+          message: string
+          created_at: string
+        }
+        Insert: {
+          id?: string
+          user_id: string
+          feedback_type: "bug" | "feature" | "other"
+          message: string
+          created_at?: string
+        }
+        Update: {
+          id?: string
+          user_id?: string
+          feedback_type?: "bug" | "feature" | "other"
+          message?: string
+          created_at?: string
+        }
+        Relationships: []
+      }
     }
     Views: Record<string, never>
     Functions: Record<string, never>
diff --git a/web/vercel.json b/web/vercel.json
index 006d200..e25c50e 100644
--- a/web/vercel.json
+++ b/web/vercel.json
@@ -2,6 +2,7 @@
   "$schema": "https://openapi.vercel.sh/vercel.json",
   "crons": [
     { "path": "/api/cron/garmin", "schedule": "30 5 * * *" },
+    { "path": "/api/cron/polar", "schedule": "45 5 * * *" },
     { "path": "/api/cron/daily-risk", "schedule": "0 6 * * *" },
     { "path": "/api/cron/daily-injury", "schedule": "15 6 * * *" }
   ]