diff --git a/package.json b/package.json
index 28896179..ed35ab84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "impro",
-  "version": "0.20.104",
+  "version": "0.20.105",
   "type": "module",
   "scripts": {
     "start": "rm -rf \"${BUILD_DIR:-build}\" && NODE_ENV=development eleventy --serve",
diff --git a/src/css/style.css b/src/css/style.css
index 6225f0f4..2b332dfd 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -7076,6 +7076,15 @@ sidebar-search {
   top: -2px;
 }
 
+#feed-detail-view .feed-detail-avatar-skeleton {
+  display: inline-block;
+}
+
+#feed-detail-view .feed-detail-header-skeleton-line {
+  display: inline-block;
+  vertical-align: middle;
+}
+
 #feed-detail-view .pin-feed-button,
 #list-detail-view .pin-feed-button {
   width: 24px;
diff --git a/src/js/views/feedDetail.view.js b/src/js/views/feedDetail.view.js
index 2720a24f..e1922b1f 100644
--- a/src/js/views/feedDetail.view.js
+++ b/src/js/views/feedDetail.view.js
@@ -1,6 +1,7 @@
 import { html, render } from "/js/lib/lit-html.js";
 import { resolveDidFromHandleOrDid } from "/js/atproto.js";
 import { classnames } from "/js/utils.js";
+import { cdnImageUrl } from "/js/dataHelpers.js";
 import { postFeedTemplate } from "/js/templates/postFeed.template.js";
 import "/js/components/infinite-scroll-container.js";
 import { headerTemplate } from "/js/templates/header.template.js";
@@ -12,6 +13,34 @@ import "/js/components/context-menu.js";
 import "/js/components/context-menu-item.js";
 import "/js/components/context-menu-item-group.js";
 
+function feedAvatarTemplate({ feedGenerator }) {
+  return html`<img
+    src=${cdnImageUrl(feedGenerator.avatar) || "/img/feed-avatar-fallback.svg"}
+    alt=""
+    class="feed-avatar"
+    data-testid="feed-detail-avatar"
+  />`;
+}
+
+function feedAvatarSkeletonTemplate() {
+  return html`<span
+    class="feed-avatar feed-detail-avatar-skeleton skeleton-animate"
+    data-testid="feed-detail-avatar-skeleton"
+  ></span>`;
+}
+
+function feedHeaderTitleSkeletonTemplate() {
+  return html`&#8203;<span
+      class="skeleton-line-short skeleton-animate feed-detail-header-skeleton-line"
+    ></span>`;
+}
+
+function feedHeaderSubtitleSkeletonTemplate() {
+  return html`&#8203;<span
+      class="skeleton-line-shorter skeleton-animate feed-detail-header-skeleton-line"
+    ></span>`;
+}
+
 export default async function feedDetailView({
   root,
   params,
@@ -55,8 +84,17 @@ export default async function feedDetailView({
     render(
       html`<div id="feed-detail-view">
         ${headerTemplate({
-          title: feedName,
-          subtitle: feedAuthorHandle ? `@${feedAuthorHandle}` : "",
+          ...(feedGenerator
+            ? {
+                title: feedName,
+                subtitle: feedAuthorHandle ? `@${feedAuthorHandle}` : "",
+                avatarTemplate: () => feedAvatarTemplate({ feedGenerator }),
+              }
+            : {
+                title: feedHeaderTitleSkeletonTemplate(),
+                subtitle: feedHeaderSubtitleSkeletonTemplate(),
+                avatarTemplate: () => feedAvatarSkeletonTemplate(),
+              }),
           rightItemTemplate: () => {
             const feedLink = `https://bsky.app/profile/${feedAuthorHandle || handleOrDid}/feed/${rkey}`;
             return html`<button
diff --git a/tests/e2e/mockServer.js b/tests/e2e/mockServer.js
index 7a1b73d7..1418ad1f 100644
--- a/tests/e2e/mockServer.js
+++ b/tests/e2e/mockServer.js
@@ -124,6 +124,7 @@ export class MockServer {
     this.threadViewPref = null;
     this.getProfilesDelayMs = 0;
     this.getStarterPackDelayMs = 0;
+    this.getFeedGeneratorDelayMs = 0;
     this.putPreferencesDelayMs = 0;
     this.getPreferencesDelayMs = 0;
     // Override the source served for the local test plugin's main.js; defaults
@@ -462,6 +463,10 @@ export class MockServer {
     this.getStarterPackDelayMs = delayMs;
   }
 
+  setGetFeedGeneratorDelay(delayMs) {
+    this.getFeedGeneratorDelayMs = delayMs;
+  }
+
   setNotificationsSeenAt(seenAt) {
     this.notificationsSeenAt = seenAt;
   }
@@ -2346,16 +2351,24 @@ export class MockServer {
       });
     });
 
-    await page.route("**/xrpc/app.bsky.feed.getFeedGenerator*", (route) => {
-      const url = new URL(route.request().url());
-      const feedUri = url.searchParams.get("feed");
-      const generator = this.feedGenerators.find((g) => g.uri === feedUri);
-      return route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ view: generator || {} }),
-      });
-    });
+    await page.route(
+      "**/xrpc/app.bsky.feed.getFeedGenerator*",
+      async (route) => {
+        if (this.getFeedGeneratorDelayMs > 0) {
+          await new Promise((resolve) =>
+            setTimeout(resolve, this.getFeedGeneratorDelayMs),
+          );
+        }
+        const url = new URL(route.request().url());
+        const feedUri = url.searchParams.get("feed");
+        const generator = this.feedGenerators.find((g) => g.uri === feedUri);
+        return route.fulfill({
+          status: 200,
+          contentType: "application/json",
+          body: JSON.stringify({ view: generator || {} }),
+        });
+      },
+    );
 
     await page.route("**/xrpc/app.bsky.feed.getFeedGenerators*", (route) => {
       const url = new URL(route.request().url());
diff --git a/tests/e2e/specs/views/feedDetail.view.test.js b/tests/e2e/specs/views/feedDetail.view.test.js
index 3b933953..252ba40b 100644
--- a/tests/e2e/specs/views/feedDetail.view.test.js
+++ b/tests/e2e/specs/views/feedDetail.view.test.js
@@ -48,6 +48,90 @@ test.describe("Feed Detail view", () => {
     await expect(view).toContainText("Second trending post");
   });
 
+  test("should display the feed avatar in the header", async ({ page }) => {
+    const mockServer = new MockServer();
+    const feed = createFeedGenerator({
+      uri: "at://did:plc:creator1/app.bsky.feed.generator/trending",
+      displayName: "Trending",
+      creatorHandle: "creator1.bsky.social",
+      avatar:
+        "https://cdn.bsky.app/img/avatar/plain/did:plc:creator1/feed@jpeg",
+    });
+    mockServer.addFeedGenerators([feed]);
+    await mockServer.setup(page);
+
+    await login(page);
+    await page.goto("/profile/creator1.bsky.social/feed/trending");
+
+    const view = page.locator("#feed-detail-view");
+    const avatar = view.locator(
+      '[data-testid="header"] [data-testid="feed-detail-avatar"]',
+    );
+    await expect(avatar).toBeVisible({ timeout: 10000 });
+    await expect(avatar).toHaveAttribute("src", /did:plc:creator1\/feed@jpeg/);
+  });
+
+  test("should display a fallback avatar when the feed has none", async ({
+    page,
+  }) => {
+    const mockServer = new MockServer();
+    const feed = createFeedGenerator({
+      uri: "at://did:plc:creator1/app.bsky.feed.generator/trending",
+      displayName: "Trending",
+      creatorHandle: "creator1.bsky.social",
+    });
+    mockServer.addFeedGenerators([feed]);
+    await mockServer.setup(page);
+
+    await login(page);
+    await page.goto("/profile/creator1.bsky.social/feed/trending");
+
+    const avatar = page.locator(
+      '#feed-detail-view [data-testid="feed-detail-avatar"]',
+    );
+    await expect(avatar).toBeVisible({ timeout: 10000 });
+    await expect(avatar).toHaveAttribute(
+      "src",
+      "/img/feed-avatar-fallback.svg",
+    );
+  });
+
+  test("should show a header skeleton with the loaded height while the feed loads", async ({
+    page,
+  }) => {
+    const mockServer = new MockServer();
+    const feed = createFeedGenerator({
+      uri: "at://did:plc:creator1/app.bsky.feed.generator/trending",
+      displayName: "Trending",
+      creatorHandle: "creator1.bsky.social",
+    });
+    mockServer.addFeedGenerators([feed]);
+    mockServer.setGetFeedGeneratorDelay(1000);
+    await mockServer.setup(page);
+
+    await login(page);
+    await page.goto("/profile/creator1.bsky.social/feed/trending");
+
+    const view = page.locator("#feed-detail-view");
+    const header = view.locator('[data-testid="header"]');
+    const skeleton = header.locator(
+      '[data-testid="feed-detail-avatar-skeleton"]',
+    );
+    await expect(skeleton).toBeVisible({ timeout: 10000 });
+    const skeletonHeight = (await header.boundingBox()).height;
+
+    await expect(view.locator('[data-testid="header-title"]')).toContainText(
+      "Trending",
+      { timeout: 10000 },
+    );
+    await expect(skeleton).toHaveCount(0);
+    await expect(
+      header.locator('[data-testid="feed-detail-avatar"]'),
+    ).toBeVisible();
+    const loadedHeight = (await header.boundingBox()).height;
+    expect(loadedHeight).toBe(skeletonHeight);
+  });
+
   test("should show pin button as unpinned when feed is not pinned", async ({
     page,
   }) => {
diff --git a/tests/shared/factories.js b/tests/shared/factories.js
index bf8c08a5..60cb2684 100644
--- a/tests/shared/factories.js
+++ b/tests/shared/factories.js
@@ -242,6 +242,7 @@ export function createFeedGenerator({
   displayName,
   creatorHandle,
   description,
+  avatar = "",
   acceptsInteractions = false,
 }) {
   const creatorDid = uri.split("/")[2];
@@ -260,7 +261,7 @@ export function createFeedGenerator({
     },
     displayName,
     description: description || "",
-    avatar: "",
+    avatar,
     acceptsInteractions,
     likeCount: 10,
     indexedAt: "2025-01-01T00:00:00.000Z",