diff --git a/package.json b/package.json
index fbbc30e..3cb192a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "homepage",
-	"version": "1.18.0",
+	"version": "1.19.0",
 	"private": true,
 	"type": "module",
 	"scripts": {
diff --git a/src/lib/components/fitness/MuscleMap.svelte b/src/lib/components/fitness/MuscleMap.svelte
new file mode 100644
index 0000000..b35584d
--- /dev/null
+++ b/src/lib/components/fitness/MuscleMap.svelte
@@ -0,0 +1,198 @@
+<script>
+	import { onMount } from 'svelte';
+	import frontSvgRaw from '$lib/assets/muscle-front.svg?raw';
+	import backSvgRaw from '$lib/assets/muscle-back.svg?raw';
+
+	let { primaryGroups = [], secondaryGroups = [], lang = 'en' } = $props();
+
+	const isEn = $derived(lang === 'en');
+
+	const FRONT_MAP = {
+		'traps':            { groups: ['traps'],                                   label: { en: 'Traps', de: 'Trapez' } },
+		'front-shoulders':  { groups: ['anterior deltoids', 'lateral deltoids'],   label: { en: 'Front Delts', de: 'Vord. Schultern' } },
+		'chest':            { groups: ['pectorals'],                               label: { en: 'Chest', de: 'Brust' } },
+		'biceps':           { groups: ['biceps', 'brachioradialis'],               label: { en: 'Biceps', de: 'Bizeps' } },
+		'forearms':         { groups: ['forearms'],                                label: { en: 'Forearms', de: 'Unterarme' } },
+		'abdominals':       { groups: ['abdominals'],                              label: { en: 'Abs', de: 'Bauchmuskeln' } },
+		'obliques':         { groups: ['obliques'],                                label: { en: 'Obliques', de: 'Seitl. Bauch' } },
+		'quads':            { groups: ['quadriceps', 'hip flexors'],               label: { en: 'Quads', de: 'Quadrizeps' } },
+		'calves':           { groups: ['calves'],                                  label: { en: 'Calves', de: 'Waden' } },
+	};
+
+	const BACK_MAP = {
+		'traps':            { groups: ['traps'],                                   label: { en: 'Traps', de: 'Trapez' } },
+		'traps-middle':     { groups: ['traps'],                                   label: { en: 'Mid Traps', de: 'Mittl. Trapez' } },
+		'rear-shoulders':   { groups: ['rear deltoids', 'rotator cuff'],           label: { en: 'Rear Delts', de: 'Hint. Schultern' } },
+		'lats':             { groups: ['lats'],                                    label: { en: 'Lats', de: 'Latissimus' } },
+		'triceps':          { groups: ['triceps'],                                 label: { en: 'Triceps', de: 'Trizeps' } },
+		'forearms':         { groups: ['forearms'],                                label: { en: 'Forearms', de: 'Unterarme' } },
+		'lowerback':        { groups: ['erector spinae'],                          label: { en: 'Lower Back', de: 'Rückenstrecker' } },
+		'glutes':           { groups: ['glutes'],                                  label: { en: 'Glutes', de: 'Gesäss' } },
+		'hamstrings':       { groups: ['hamstrings'],                              label: { en: 'Hamstrings', de: 'Beinbeuger' } },
+		'calves':           { groups: ['calves'],                                  label: { en: 'Calves', de: 'Waden' } },
+	};
+
+	const primarySet = $derived(new Set(primaryGroups));
+	const secondarySet = $derived(new Set(secondaryGroups));
+
+	function regionState(groups) {
+		if (groups.some(g => primarySet.has(g))) return 'primary';
+		if (groups.some(g => secondarySet.has(g))) return 'secondary';
+		return 'inactive';
+	}
+
+	function regionFill(groups) {
+		const state = regionState(groups);
+		if (state === 'primary') return 'var(--color-primary)';
+		if (state === 'secondary') return 'var(--color-primary-secondary, color-mix(in srgb, var(--color-primary) 40%, var(--color-bg-tertiary)))';
+		return 'var(--color-bg-tertiary)';
+	}
+
+	function injectFills(svgStr, map) {
+		let result = svgStr;
+		for (const [svgId, region] of Object.entries(map)) {
+			const fill = regionFill(region.groups);
+			const re = new RegExp(`(<g\\s+id="${svgId}")([^>]*>)`);
+			result = result.replace(re, `$1 style="--region-fill: ${fill};"$2`);
+		}
+		return result;
+	}
+
+	const frontSvg = $derived(injectFills(frontSvgRaw, FRONT_MAP));
+	const backSvg = $derived(injectFills(backSvgRaw, BACK_MAP));
+
+	let hovered = $state(null);
+	let hoveredSide = $state('front');
+	const hoveredLabel = $derived.by(() => {
+		if (!hovered) return null;
+		const state = regionState(hovered.groups);
+		const label = isEn ? hovered.label.en : hovered.label.de;
+		const suffix = state === 'primary' ? '' : state === 'secondary' ? (isEn ? ' (secondary)' : ' (sekundär)') : '';
+		return label + suffix;
+	});
+
+	let frontEl = $state(null);
+	let backEl = $state(null);
+
+	function setupEvents(container, map, side) {
+		if (!container) return;
+		container.addEventListener('mouseover', (e) => {
+			const g = e.target.closest('g[id]');
+			if (g && map[g.id]) {
+				hovered = map[g.id];
+				hoveredSide = side;
+				g.classList.add('highlighted');
+			}
+		});
+		container.addEventListener('mouseout', (e) => {
+			const g = e.target.closest('g[id]');
+			if (g) g.classList.remove('highlighted');
+		});
+		container.addEventListener('mouseleave', () => { hovered = null; });
+	}
+
+	onMount(() => {
+		setupEvents(frontEl, FRONT_MAP, 'front');
+		setupEvents(backEl, BACK_MAP, 'back');
+	});
+
+	// Check if any muscles are on front/back to decide which to show
+	function hasActiveRegions(map) {
+		return Object.values(map).some(r => regionState(r.groups) !== 'inactive');
+	}
+	const hasFront = $derived(hasActiveRegions(FRONT_MAP));
+	const hasBack = $derived(hasActiveRegions(BACK_MAP));
+</script>
+
+<div class="muscle-map">
+	<div class="body-figures">
+		{#if hasFront}
+			<div class="figure">
+				<div class="svg-wrap" bind:this={frontEl}>
+					{@html frontSvg}
+				</div>
+				<span class="side-label">{isEn ? 'Front' : 'Vorne'}</span>
+			</div>
+		{/if}
+		{#if hasBack}
+			<div class="figure">
+				<div class="svg-wrap" bind:this={backEl}>
+					{@html backSvg}
+				</div>
+				<span class="side-label">{isEn ? 'Back' : 'Hinten'}</span>
+			</div>
+		{/if}
+	</div>
+
+	{#if hoveredLabel}
+		<div class="hover-label">{hoveredLabel}</div>
+	{/if}
+</div>
+
+<style>
+	.muscle-map {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 0.25rem;
+	}
+
+	.body-figures {
+		display: flex;
+		gap: 0.5rem;
+		justify-content: center;
+		width: 100%;
+	}
+
+	.figure {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		flex: 1;
+		max-width: 120px;
+	}
+
+	.side-label {
+		font-size: 0.6rem;
+		color: var(--color-text-tertiary);
+		text-transform: uppercase;
+		letter-spacing: 0.08em;
+		font-weight: 600;
+		margin-top: 0.15rem;
+	}
+
+	.svg-wrap {
+		width: 100%;
+	}
+
+	.svg-wrap :global(svg) {
+		width: 100%;
+		height: auto;
+		display: block;
+	}
+
+	.svg-wrap :global(g:not(#body):not(#head) path) {
+		fill: var(--region-fill, var(--color-bg-tertiary));
+		stroke: var(--color-text-primary);
+		stroke-width: 0.5;
+		stroke-linejoin: round;
+		transition: fill 0.15s;
+	}
+
+	.svg-wrap :global(g.highlighted:not(#body):not(#head) path) {
+		stroke: var(--color-primary);
+		stroke-width: 2;
+	}
+
+	.svg-wrap :global(#body path),
+	.svg-wrap :global(#body line) {
+		stroke: var(--color-text-primary) !important;
+	}
+
+	.hover-label {
+		font-size: 0.7rem;
+		font-weight: 600;
+		color: var(--color-text-primary);
+		text-align: center;
+	}
+</style>
diff --git a/src/routes/fitness/[exercises=fitnessExercises]/[id]/+page.svelte b/src/routes/fitness/[exercises=fitnessExercises]/[id]/+page.svelte
index 67bf7d7..eccdff9 100644
--- a/src/routes/fitness/[exercises=fitnessExercises]/[id]/+page.svelte
+++ b/src/routes/fitness/[exercises=fitnessExercises]/[id]/+page.svelte
@@ -8,6 +8,7 @@
 	const lang = $derived(detectFitnessLang($page.url.pathname));
 	const s = $derived(fitnessSlugs(lang));
 	import FitnessChart from '$lib/components/fitness/FitnessChart.svelte';
+	import MuscleMap from '$lib/components/fitness/MuscleMap.svelte';
 	import { onMount } from 'svelte';
 
 	let { data } = $props();
@@ -128,18 +129,76 @@
 	</div>
 
 	{#if activeTab === 'about'}
-		<div class="tab-content">
-			<!-- Tags -->
-			<div class="tags">
-				<span class="tag body-part">{exercise?.localBodyPart}</span>
-				<span class="tag equipment">{exercise?.localEquipment}</span>
-				<span class="tag target">{exercise?.localTarget}</span>
+		<div class="tab-content about-layout">
+			<div class="about-main">
+				<!-- Tags -->
+				<div class="tags">
+					<span class="tag body-part">{exercise?.localBodyPart}</span>
+					<span class="tag equipment">{exercise?.localEquipment}</span>
+					<span class="tag target">{exercise?.localTarget}</span>
+				</div>
+
+				<!-- Muscle map (mobile only — shown inline) -->
+				{#if exercise?.localSecondaryMuscles?.length || exercise?.localTarget}
+					<div class="muscle-section-mobile">
+						<MuscleMap
+							primaryGroups={[exercise?.target].filter(Boolean)}
+							secondaryGroups={exercise?.secondaryMuscles ?? []}
+							{lang}
+						/>
+						<div class="muscle-pills">
+							{#if exercise?.localTarget}
+								<span class="muscle-pill primary">{exercise.localTarget}</span>
+							{/if}
+							{#each exercise?.localSecondaryMuscles ?? [] as muscle}
+								<span class="muscle-pill secondary">{muscle}</span>
+							{/each}
+						</div>
+					</div>
+				{/if}
+
+				<!-- Overview -->
+				{#if exercise?.overview}
+					<p class="overview">{exercise.overview}</p>
+				{/if}
+
+				<!-- Instructions -->
+				{#if exercise?.localInstructions?.length}
+					<h3>{t('instructions', lang)}</h3>
+					<ol class="instructions">
+						{#each exercise.localInstructions as step}
+							<li>{step}</li>
+						{/each}
+					</ol>
+				{/if}
+
+				<!-- Similar exercises -->
+				{#if similar.length > 0}
+					<div class="similar-section">
+						<h3>{lang === 'en' ? 'Similar Exercises' : 'Ähnliche Übungen'}</h3>
+						<div class="similar-scroll">
+							{#each similar as sim}
+								<a class="similar-card" href="/fitness/{s.exercises}/{sim.id}">
+									<div class="similar-info">
+										<span class="similar-name">{sim.localName}</span>
+										<span class="similar-meta">{sim.localBodyPart} · {sim.localEquipment}</span>
+									</div>
+									<ChevronRight size={14} />
+								</a>
+							{/each}
+						</div>
+					</div>
+				{/if}
 			</div>
 
-			<!-- Muscle pills -->
+			<!-- Muscle map sidebar (desktop only) -->
 			{#if exercise?.localSecondaryMuscles?.length || exercise?.localTarget}
-				<div class="muscle-section">
-					<h3>{lang === 'en' ? 'Muscles' : 'Muskeln'}</h3>
+				<aside class="muscle-sidebar">
+					<MuscleMap
+						primaryGroups={[exercise?.target].filter(Boolean)}
+						secondaryGroups={exercise?.secondaryMuscles ?? []}
+						{lang}
+					/>
 					<div class="muscle-pills">
 						{#if exercise?.localTarget}
 							<span class="muscle-pill primary">{exercise.localTarget}</span>
@@ -148,40 +207,7 @@
 							<span class="muscle-pill secondary">{muscle}</span>
 						{/each}
 					</div>
-				</div>
-			{/if}
-
-			<!-- Overview -->
-			{#if exercise?.overview}
-				<p class="overview">{exercise.overview}</p>
-			{/if}
-
-			<!-- Instructions -->
-			{#if exercise?.localInstructions?.length}
-				<h3>{t('instructions', lang)}</h3>
-				<ol class="instructions">
-					{#each exercise.localInstructions as step}
-						<li>{step}</li>
-					{/each}
-				</ol>
-			{/if}
-
-			<!-- Similar exercises -->
-			{#if similar.length > 0}
-				<div class="similar-section">
-					<h3>{lang === 'en' ? 'Similar Exercises' : 'Ähnliche Übungen'}</h3>
-					<div class="similar-scroll">
-						{#each similar as sim}
-							<a class="similar-card" href="/fitness/{s.exercises}/{sim.id}">
-								<div class="similar-info">
-									<span class="similar-name">{sim.localName}</span>
-									<span class="similar-meta">{sim.localBodyPart} · {sim.localEquipment}</span>
-								</div>
-								<ChevronRight size={14} />
-							</a>
-						{/each}
-					</div>
-				</div>
+				</aside>
 			{/if}
 		</div>
 	{:else if activeTab === 'history'}
@@ -325,14 +351,53 @@
 	.equipment { background: rgba(163, 190, 140, 0.2); color: var(--nord14); }
 	.target { background: rgba(208, 135, 112, 0.2); color: var(--nord12); }
 
-	/* Muscle pills */
-	.muscle-section {
-		margin-bottom: 0.25rem;
+	/* About layout — two-column on wide screens */
+	.about-layout {
+		display: flex;
+		flex-direction: column;
 	}
+	.about-main {
+		flex: 1;
+		min-width: 0;
+	}
+	.muscle-sidebar {
+		display: none;
+	}
+	.muscle-section-mobile {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 0.5rem;
+		margin-bottom: 0.5rem;
+	}
+
+	@media (min-width: 600px) {
+		.about-layout {
+			flex-direction: row-reverse;
+			gap: 1.5rem;
+			align-items: flex-start;
+		}
+		.muscle-sidebar {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			gap: 0.5rem;
+			position: sticky;
+			top: 1rem;
+			flex-shrink: 0;
+			width: 180px;
+		}
+		.muscle-section-mobile {
+			display: none;
+		}
+	}
+
+	/* Muscle pills */
 	.muscle-pills {
 		display: flex;
 		flex-wrap: wrap;
 		gap: 0.3rem;
+		justify-content: center;
 	}
 	.muscle-pill {
 		padding: 0.2rem 0.55rem;