diff --git a/_includes/components/post-navigation.njk b/_includes/components/post-navigation.njk
index fb22bab..0103704 100644
--- a/_includes/components/post-navigation.njk
+++ b/_includes/components/post-navigation.njk
@@ -1,78 +1,103 @@
-{# Post Navigation - Previous/Next (main content area, below post) #}
+{# Post Navigation - Previous/Next (image-first, inspired by zachleat.com) #}
 {% set _prevPost = collections.posts | previousInCollection(page) %}
 {% set _nextPost = collections.posts | nextInCollection(page) %}
 
 {% if _prevPost or _nextPost %}
 <nav class="post-navigation mt-8 pt-6 border-t border-surface-200 dark:border-surface-700" aria-label="Post navigation">
-  <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+  <div class="grid grid-cols-2 gap-3 sm:gap-4">
+
+    {# ── Previous Post ── #}
     {% if _prevPost %}
-    <div>
-      <span class="text-xs text-surface-500 uppercase tracking-wide block mb-1">Previous</span>
-      {% set _likedUrl = _prevPost.data.likeOf or _prevPost.data.like_of %}
-      {% set _bookmarkedUrl = _prevPost.data.bookmarkOf or _prevPost.data.bookmark_of %}
-      {% set _repostedUrl = _prevPost.data.repostOf or _prevPost.data.repost_of %}
-      {% set _replyToUrl = _prevPost.data.inReplyTo or _prevPost.data.in_reply_to %}
-      {% set _prevOgSlug = _prevPost.url | ogSlug %}
-      {% set _prevHasOg = _prevOgSlug | hasOgImage %}
-      <a href="{{ _prevPost.url }}" class="group flex items-start gap-3 text-sm text-accent-600 dark:text-accent-400 hover:underline">
-        {% if _prevHasOg %}
-        <img src="/og/{{ _prevOgSlug }}.png" alt="" class="w-20 h-[42px] object-cover rounded flex-shrink-0 opacity-80 group-hover:opacity-100 transition-opacity" loading="lazy" eleventy:ignore>
-        {% endif %}
-        <span class="line-clamp-2 flex items-center gap-1.5">
-          {% if _likedUrl %}
-          <svg class="w-3.5 h-3.5 text-red-500 flex-shrink-0" fill="currentColor" viewBox="0 0 24 24"><path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/></svg>
-          Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
-          {% elif _bookmarkedUrl %}
-          <svg class="w-3.5 h-3.5 text-amber-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 5a2 2 0 012-2h10a2 2 0 012 2v16l-7-3.5L5 21V5z"/></svg>
-          {{ _prevPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
-          {% elif _repostedUrl %}
-          <svg class="w-3.5 h-3.5 text-green-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/></svg>
-          Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
-          {% elif _replyToUrl %}
-          <svg class="w-3.5 h-3.5 text-accent-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/></svg>
-          Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
-          {% else %}
-          {{ _prevPost.data.title or _prevPost.data.name or (_prevPost.templateContent | striptags | truncate(50)) or "Note" }}
-          {% endif %}
+    {% set _prevOgSlug = _prevPost.url | ogSlug %}
+    {% set _prevHasOg = _prevOgSlug | hasOgImage %}
+    {% set _prevTitle = _prevPost.data.title or _prevPost.data.name %}
+
+    {# Derive display text for non-article post types #}
+    {% set _likedUrl = _prevPost.data.likeOf or _prevPost.data.like_of %}
+    {% set _bookmarkedUrl = _prevPost.data.bookmarkOf or _prevPost.data.bookmark_of %}
+    {% set _repostedUrl = _prevPost.data.repostOf or _prevPost.data.repost_of %}
+    {% set _replyToUrl = _prevPost.data.inReplyTo or _prevPost.data.in_reply_to %}
+    {% if not _prevTitle %}
+      {% if _likedUrl %}
+        {% set _prevTitle = "Liked " + (_likedUrl | replace("https://", "") | truncate(40)) %}
+      {% elif _bookmarkedUrl %}
+        {% set _prevTitle = "Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(35)) %}
+      {% elif _repostedUrl %}
+        {% set _prevTitle = "Reposted " + (_repostedUrl | replace("https://", "") | truncate(35)) %}
+      {% elif _replyToUrl %}
+        {% set _prevTitle = "Reply to " + (_replyToUrl | replace("https://", "") | truncate(35)) %}
+      {% else %}
+        {% set _prevTitle = (_prevPost.templateContent | striptags | truncate(60)) or "Note" %}
+      {% endif %}
+    {% endif %}
+
+    <a href="{{ _prevPost.url }}" class="group relative block rounded-lg overflow-hidden bg-surface-100 dark:bg-surface-800 border border-surface-200 dark:border-surface-700 hover:border-accent-400 dark:hover:border-accent-600 transition-colors">
+      {% if _prevHasOg %}
+      <img src="/og/{{ _prevOgSlug }}.png" alt="{{ _prevTitle }}" class="w-full aspect-[1.91/1] object-cover opacity-85 group-hover:opacity-100 transition-opacity" loading="lazy" decoding="async" eleventy:ignore>
+      <span class="absolute top-2 left-2 text-[10px] sm:text-xs font-semibold uppercase tracking-wide bg-white/90 dark:bg-surface-900/90 text-surface-700 dark:text-surface-300 px-2 py-0.5 rounded">
+        &larr; Previous
+      </span>
+      {% else %}
+      <div class="p-4 sm:p-5">
+        <span class="text-[10px] sm:text-xs font-semibold uppercase tracking-wide text-surface-500 block mb-2">&larr; Previous</span>
+        <span class="text-sm sm:text-base font-medium text-surface-900 dark:text-surface-100 group-hover:text-accent-600 dark:group-hover:text-accent-400 line-clamp-2 transition-colors">
+          {{ _prevTitle }}
         </span>
-      </a>
-    </div>
+        <time class="text-xs text-surface-500 mt-1 block" datetime="{{ _prevPost.date | isoDate }}">{{ _prevPost.date | dateDisplay }}</time>
+      </div>
+      {% endif %}
+    </a>
+
     {% else %}
-    <div></div>
+    <div class="rounded-lg bg-surface-50 dark:bg-surface-800/50 border border-surface-200/50 dark:border-surface-700/50"></div>
     {% endif %}
+
+    {# ── Next Post ── #}
     {% if _nextPost %}
-    <div class="{% if _prevPost %}text-right{% endif %}">
-      <span class="text-xs text-surface-500 uppercase tracking-wide block mb-1">Next</span>
-      {% set _likedUrl = _nextPost.data.likeOf or _nextPost.data.like_of %}
-      {% set _bookmarkedUrl = _nextPost.data.bookmarkOf or _nextPost.data.bookmark_of %}
-      {% set _repostedUrl = _nextPost.data.repostOf or _nextPost.data.repost_of %}
-      {% set _replyToUrl = _nextPost.data.inReplyTo or _nextPost.data.in_reply_to %}
-      {% set _nextOgSlug = _nextPost.url | ogSlug %}
-      {% set _nextHasOg = _nextOgSlug | hasOgImage %}
-      <a href="{{ _nextPost.url }}" class="group flex items-start gap-3 text-sm text-accent-600 dark:text-accent-400 hover:underline {% if _prevPost %}justify-end{% endif %}">
-        <span class="line-clamp-2 flex items-center gap-1.5 {% if _prevPost %}justify-end{% endif %}">
-          {% if _likedUrl %}
-          <svg class="w-3.5 h-3.5 text-red-500 flex-shrink-0" fill="currentColor" viewBox="0 0 24 24"><path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/></svg>
-          Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
-          {% elif _bookmarkedUrl %}
-          <svg class="w-3.5 h-3.5 text-amber-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 5a2 2 0 012-2h10a2 2 0 012 2v16l-7-3.5L5 21V5z"/></svg>
-          {{ _nextPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
-          {% elif _repostedUrl %}
-          <svg class="w-3.5 h-3.5 text-green-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/></svg>
-          Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
-          {% elif _replyToUrl %}
-          <svg class="w-3.5 h-3.5 text-accent-500 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/></svg>
-          Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
-          {% else %}
-          {{ _nextPost.data.title or _nextPost.data.name or (_nextPost.templateContent | striptags | truncate(50)) or "Note" }}
-          {% endif %}
-        </span>
-        {% if _nextHasOg %}
-        <img src="/og/{{ _nextOgSlug }}.png" alt="" class="w-20 h-[42px] object-cover rounded flex-shrink-0 opacity-80 group-hover:opacity-100 transition-opacity" loading="lazy" eleventy:ignore>
-        {% endif %}
-      </a>
-    </div>
+    {% set _nextOgSlug = _nextPost.url | ogSlug %}
+    {% set _nextHasOg = _nextOgSlug | hasOgImage %}
+    {% set _nextTitle = _nextPost.data.title or _nextPost.data.name %}
+
+    {# Derive display text for non-article post types #}
+    {% set _likedUrl = _nextPost.data.likeOf or _nextPost.data.like_of %}
+    {% set _bookmarkedUrl = _nextPost.data.bookmarkOf or _nextPost.data.bookmark_of %}
+    {% set _repostedUrl = _nextPost.data.repostOf or _nextPost.data.repost_of %}
+    {% set _replyToUrl = _nextPost.data.inReplyTo or _nextPost.data.in_reply_to %}
+    {% if not _nextTitle %}
+      {% if _likedUrl %}
+        {% set _nextTitle = "Liked " + (_likedUrl | replace("https://", "") | truncate(40)) %}
+      {% elif _bookmarkedUrl %}
+        {% set _nextTitle = "Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(35)) %}
+      {% elif _repostedUrl %}
+        {% set _nextTitle = "Reposted " + (_repostedUrl | replace("https://", "") | truncate(35)) %}
+      {% elif _replyToUrl %}
+        {% set _nextTitle = "Reply to " + (_replyToUrl | replace("https://", "") | truncate(35)) %}
+      {% else %}
+        {% set _nextTitle = (_nextPost.templateContent | striptags | truncate(60)) or "Note" %}
+      {% endif %}
     {% endif %}
+
+    <a href="{{ _nextPost.url }}" class="group relative block rounded-lg overflow-hidden bg-surface-100 dark:bg-surface-800 border border-surface-200 dark:border-surface-700 hover:border-accent-400 dark:hover:border-accent-600 transition-colors">
+      {% if _nextHasOg %}
+      <img src="/og/{{ _nextOgSlug }}.png" alt="{{ _nextTitle }}" class="w-full aspect-[1.91/1] object-cover opacity-85 group-hover:opacity-100 transition-opacity" loading="lazy" decoding="async" eleventy:ignore>
+      <span class="absolute top-2 right-2 text-[10px] sm:text-xs font-semibold uppercase tracking-wide bg-white/90 dark:bg-surface-900/90 text-surface-700 dark:text-surface-300 px-2 py-0.5 rounded">
+        Next &rarr;
+      </span>
+      {% else %}
+      <div class="p-4 sm:p-5 text-right">
+        <span class="text-[10px] sm:text-xs font-semibold uppercase tracking-wide text-surface-500 block mb-2">Next &rarr;</span>
+        <span class="text-sm sm:text-base font-medium text-surface-900 dark:text-surface-100 group-hover:text-accent-600 dark:group-hover:text-accent-400 line-clamp-2 transition-colors">
+          {{ _nextTitle }}
+        </span>
+        <time class="text-xs text-surface-500 mt-1 block" datetime="{{ _nextPost.date | isoDate }}">{{ _nextPost.date | dateDisplay }}</time>
+      </div>
+      {% endif %}
+    </a>
+
+    {% else %}
+    <div class="rounded-lg bg-surface-50 dark:bg-surface-800/50 border border-surface-200/50 dark:border-surface-700/50"></div>
+    {% endif %}
+
   </div>
 </nav>
 {% endif %}