diff --git a/app/src/lib/components/LanguageAvailability.svelte b/app/src/lib/components/LanguageAvailability.svelte
index 288f21a..12a4c08 100644
--- a/app/src/lib/components/LanguageAvailability.svelte
+++ b/app/src/lib/components/LanguageAvailability.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { NostrEvent, TranslationInfo } from '$lib/nostr/loaders';
   import { loadTranslations } from '$lib/nostr/loaders';
-  import { displayLanguage } from '$lib/nostr/languageNames';
-  import { t } from '$lib/i18n';
+  import { activeLocale } from '$lib/i18n';
+  import type { SupportedLocale } from '$lib/i18n/activeLocale';
 
   interface Props {
     event: NostrEvent;
@@ -25,28 +25,83 @@
         if (event.id === currentId) loading = false;
       });
   });
+
+  function currentLang(): string {
+    return event.tags.find((tag) => tag[0] === 'l')?.[1] ?? 'de';
+  }
+
+  interface Option {
+    code: string;
+    href: string | null; // null = aktueller post, kein klick-ziel
+  }
+
+  const options = $derived.by<Option[]>(() => {
+    const self: Option = { code: currentLang(), href: null };
+    const others: Option[] = translations.map((t) => ({
+      code: t.lang,
+      href: `/${t.slug}/`
+    }));
+    // aktuelle sprache zuerst, dann rest sortiert nach code
+    return [self, ...others.sort((a, b) => a.code.localeCompare(b.code))];
+  });
+
+  function selectOther(code: string, href: string) {
+    activeLocale.set(code as SupportedLocale);
+    // hartes location-setzen, damit svelte-kit-router den post-load triggert
+    window.location.href = href;
+  }
 </script>
 
 {#if !loading && translations.length > 0}
-  <p class="availability">
-    {$t('post.also_available_in')}
-    {#each translations as t, i}
-      <a href="/{t.slug}/" title={t.title}>{displayLanguage(t.lang)}</a>{#if i < translations.length - 1}, {/if}
+  <p class="lang-switch" role="group" aria-label="Article language">
+    <span class="icon" aria-hidden="true">📖</span>
+    {#each options as opt, i}
+      {#if opt.href === null}
+        <span class="btn active" aria-current="true">{opt.code.toUpperCase()}</span>
+      {:else}
+        <button
+          type="button"
+          class="btn"
+          onclick={() => selectOther(opt.code, opt.href!)}
+        >{opt.code.toUpperCase()}</button>
+      {/if}
+      {#if i < options.length - 1}<span class="sep" aria-hidden="true">|</span>{/if}
     {/each}
   </p>
 {/if}
 
 <style>
-  .availability {
+  .lang-switch {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.35rem;
     font-size: 0.88rem;
     color: var(--muted);
     margin: 0.25rem 0 1rem;
   }
-  .availability a {
-    color: var(--accent);
-    text-decoration: none;
+  .icon {
+    font-size: 1rem;
+    line-height: 1;
   }
-  .availability a:hover {
-    text-decoration: underline;
+  .btn {
+    background: transparent;
+    border: 1px solid var(--border);
+    color: var(--muted);
+    border-radius: 3px;
+    padding: 1px 7px;
+    font-size: 0.8rem;
+    font-family: inherit;
+    cursor: pointer;
+  }
+  .btn:hover:not(.active) {
+    color: var(--fg);
+  }
+  .btn.active {
+    color: var(--accent);
+    border-color: var(--accent);
+    cursor: default;
+  }
+  .sep {
+    opacity: 0.4;
   }
 </style>
diff --git a/app/src/lib/i18n/messages/de.json b/app/src/lib/i18n/messages/de.json
index 4717865..79428d4 100644
--- a/app/src/lib/i18n/messages/de.json
+++ b/app/src/lib/i18n/messages/de.json
@@ -20,7 +20,6 @@
     "back_to_overview": "← Zurück zur Übersicht",
     "untitled": "(ohne Titel)",
     "published_on": "Veröffentlicht am {date}",
-    "also_available_in": "Auch verfügbar in:",
     "not_found": "Post \"{slug}\" nicht gefunden.",
     "unknown_error": "Unbekannter Fehler"
   },
@@ -28,8 +27,6 @@
     "doc_title": "Impressum – Jörg Lohrer"
   },
   "lang": {
-    "de": "Deutsch",
-    "en": "English",
     "switch_aria": "Sprache wechseln"
   }
 }
diff --git a/app/src/lib/i18n/messages/en.json b/app/src/lib/i18n/messages/en.json
index be201de..21f367f 100644
--- a/app/src/lib/i18n/messages/en.json
+++ b/app/src/lib/i18n/messages/en.json
@@ -20,7 +20,6 @@
     "back_to_overview": "← Back to overview",
     "untitled": "(untitled)",
     "published_on": "Published on {date}",
-    "also_available_in": "Also available in:",
     "not_found": "Post \"{slug}\" not found.",
     "unknown_error": "Unknown error"
   },
@@ -28,8 +27,6 @@
     "doc_title": "Imprint – Jörg Lohrer"
   },
   "lang": {
-    "de": "German",
-    "en": "English",
     "switch_aria": "Switch language"
   }
 }
diff --git a/app/src/lib/nostr/languageNames.test.ts b/app/src/lib/nostr/languageNames.test.ts
deleted file mode 100644
index 8d64698..0000000
--- a/app/src/lib/nostr/languageNames.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { displayLanguage } from './languageNames';
-
-describe('displayLanguage', () => {
-  it('kennt deutsch', () => {
-    expect(displayLanguage('de')).toBe('Deutsch');
-  });
-  it('kennt english', () => {
-    expect(displayLanguage('en')).toBe('English');
-  });
-  it('fällt bei unbekanntem code auf uppercase-code zurück', () => {
-    expect(displayLanguage('fr')).toBe('FR');
-  });
-  it('fällt bei leerer sprache auf ? zurück', () => {
-    expect(displayLanguage('')).toBe('?');
-  });
-});
diff --git a/app/src/lib/nostr/languageNames.ts b/app/src/lib/nostr/languageNames.ts
deleted file mode 100644
index 1e2d44b..0000000
--- a/app/src/lib/nostr/languageNames.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-const NAMES: Record<string, string> = {
-  de: 'Deutsch',
-  en: 'English'
-};
-
-export function displayLanguage(code: string): string {
-  if (!code) return '?';
-  return NAMES[code] ?? code.toUpperCase();
-}