diff --git a/src/components/HelpAndAccountMenu.tsx b/src/components/HelpAndAccountMenu.tsx
index 0eb50f56..8b6f1f9e 100644
--- a/src/components/HelpAndAccountMenu.tsx
+++ b/src/components/HelpAndAccountMenu.tsx
@@ -14,6 +14,7 @@ import {
 } from '@/components/ui/dropdown-menu'
 import { Skeleton } from '@/components/ui/skeleton'
 import { formatPubkey, formatNpub, generateImageByPubkey, pubkeyToNpub } from '@/lib/pubkey'
+import { isVideo } from '@/lib/url'
 import { cn } from '@/lib/utils'
 import { usePrimaryPage } from '@/contexts/primary-page-context'
 import { useFetchProfile } from '@/hooks/useFetchProfile'
@@ -93,12 +94,18 @@ function SidebarAccountMenu({
             active && 'bg-accent/50'
           )}
         >
-          <Avatar className="size-8 shrink-0">
-            <AvatarImage src={avatar} />
-            <AvatarFallback>
-              <img src={defaultAvatar} alt="" />
-            </AvatarFallback>
-          </Avatar>
+          {isVideo(avatar ?? '') ? (
+            <div className="size-8 shrink-0 overflow-hidden rounded-full">
+              <video src={avatar} className="h-full w-full object-cover object-center" autoPlay muted loop playsInline />
+            </div>
+          ) : (
+            <Avatar className="size-8 shrink-0">
+              <AvatarImage src={avatar} />
+              <AvatarFallback>
+                <img src={defaultAvatar} alt="" />
+              </AvatarFallback>
+            </Avatar>
+          )}
           <span className="truncate max-xl:hidden">{username}</span>
         </Button>
       </DropdownMenuTrigger>
@@ -139,12 +146,18 @@ function TitlebarAccountMenu({
           aria-label={t('Account menu')}
         >
           {resolvedProfile ? (
-            <Avatar className={cn('w-6 h-6', active ? 'ring-primary ring-1' : '')}>
-              <AvatarImage src={resolvedProfile.avatar} className="object-cover object-center" />
-              <AvatarFallback>
-                <img src={defaultAvatar} alt="" />
-              </AvatarFallback>
-            </Avatar>
+            isVideo(resolvedProfile.avatar ?? '') ? (
+              <div className={cn('w-6 h-6 overflow-hidden rounded-full', active ? 'ring-primary ring-1' : '')}>
+                <video src={resolvedProfile.avatar} className="h-full w-full object-cover object-center" autoPlay muted loop playsInline />
+              </div>
+            ) : (
+              <Avatar className={cn('w-6 h-6', active ? 'ring-primary ring-1' : '')}>
+                <AvatarImage src={resolvedProfile.avatar} className="object-cover object-center" />
+                <AvatarFallback>
+                  <img src={defaultAvatar} alt="" />
+                </AvatarFallback>
+              </Avatar>
+            )
           ) : (
             <Skeleton className={cn('w-6 h-6 rounded-full', active ? 'ring-primary ring-1' : '')} />
           )}
diff --git a/src/components/MediaGridItem/index.tsx b/src/components/MediaGridItem/index.tsx
new file mode 100644
index 00000000..d9f4efad
--- /dev/null
+++ b/src/components/MediaGridItem/index.tsx
@@ -0,0 +1,76 @@
+import { getCachedThreadContextEvents } from '@/lib/navigation-related-events'
+import { toNote } from '@/lib/link'
+import client from '@/services/client.service'
+import { extractAllMediaFromEvent } from '@/services/media-extraction.service'
+import { useSmartNoteNavigationOptional } from '@/PageManager'
+import { Images, Music, Play } from 'lucide-react'
+import { type Event } from 'nostr-tools'
+import { useMemo } from 'react'
+
+export default function MediaGridItem({ event }: { event: Event }) {
+  const { navigateToNote } = useSmartNoteNavigationOptional()
+
+  const media = useMemo(() => extractAllMediaFromEvent(event), [event])
+  const first = media.all[0]
+
+  const isVideo =
+    first?.m?.startsWith('video/') || event.kind === 21 || event.kind === 22
+  const isAudio = first?.m?.startsWith('audio/') || event.kind === 1222
+  const hasMultiple = media.all.length > 1
+
+  // For videos prefer the poster image; fall back to video URL (browser extracts frame)
+  const displayUrl = isVideo
+    ? (first?.image ?? first?.url)
+    : (first?.thumb ?? first?.url)
+
+  const handleClick = () => {
+    client.addEventToCache(event)
+    navigateToNote(toNote(event), event, getCachedThreadContextEvents(event))
+  }
+
+  return (
+    <div
+      className="relative aspect-square cursor-pointer overflow-hidden bg-muted"
+      onClick={handleClick}
+    >
+      {displayUrl ? (
+        isVideo && !first?.image ? (
+          <video
+            src={displayUrl}
+            className="h-full w-full object-cover"
+            muted
+            preload="metadata"
+          />
+        ) : (
+          <img
+            src={displayUrl}
+            alt={first?.alt ?? ''}
+            className="h-full w-full object-cover"
+            loading="lazy"
+          />
+        )
+      ) : (
+        <div className="flex h-full w-full items-center justify-center text-muted-foreground/40">
+          {isAudio ? <Music className="size-8" /> : <Play className="size-8" />}
+        </div>
+      )}
+
+      {/* Top-right badge */}
+      {isVideo && (
+        <div className="absolute right-2 top-2 rounded bg-black/60 p-1">
+          <Play className="size-6 fill-white text-white" />
+        </div>
+      )}
+      {isAudio && (
+        <div className="absolute right-2 top-2 rounded bg-black/60 p-1">
+          <Music className="size-6 text-white" />
+        </div>
+      )}
+      {hasMultiple && !isVideo && !isAudio && (
+        <div className="absolute right-2 top-2 rounded bg-black/60 p-1">
+          <Images className="size-6 text-white" />
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/src/components/NormalFeed/index.tsx b/src/components/NormalFeed/index.tsx
index 6aeab324..849b51ee 100644
--- a/src/components/NormalFeed/index.tsx
+++ b/src/components/NormalFeed/index.tsx
@@ -119,14 +119,29 @@ const NormalFeed = forwardRef<TNoteListRef, {
     setFeedFilterTabRowHost(node)
   }, [])
 
+  const MEDIA_KINDS = useMemo(() => [20, 21, 22, 1222], [])
+
   const tabs = useMemo(
-    (): TabDefinition[] => [
-      { value: 'posts', label: 'Notes' },
-      { value: 'postsAndReplies', label: 'Replies' }
-    ],
-    []
+    (): TabDefinition[] => {
+      const base: TabDefinition[] = [
+        { value: 'posts', label: 'Notes' },
+        { value: 'postsAndReplies', label: 'Replies' }
+      ]
+      if (isMainFeed) base.push({ value: 'media', label: 'Media' })
+      return base
+    },
+    [isMainFeed]
   )
 
+  /** When in media mode, replace each shard's kinds with the media set. */
+  const effectiveSubRequests = useMemo(() => {
+    if (listMode !== 'media') return subRequests
+    return subRequests.map((req) => ({
+      ...req,
+      filter: { ...req.filter, kinds: MEDIA_KINDS }
+    }))
+  }, [listMode, subRequests, MEDIA_KINDS])
+
   const handleListModeChange = useCallback(
     (mode: TNoteListMode | string) => {
       const noteListMode = mode as TNoteListMode
@@ -248,8 +263,7 @@ const NormalFeed = forwardRef<TNoteListRef, {
           showKind1111={showKind1111}
           seeAllFeedEvents={feedKindFilterBypass}
           withKindFilter={withKindFilter}
-          showAllKinds={listShowAllKinds}
-          subRequests={subRequests}
+          subRequests={effectiveSubRequests}
           hideReplies={listMode === 'posts'}
           hideUntrustedNotes={hideUntrustedNotes}
           areAlgoRelays={areAlgoRelays}
@@ -259,9 +273,11 @@ const NormalFeed = forwardRef<TNoteListRef, {
           mergeTimelineWhenSubRequestFiltersMatch={mergeTimelineWhenSubRequestFiltersMatch}
           followingFeedDeltaSubRequests={followingFeedDeltaSubRequests}
           feedTimelineScopeKey={feedTimelineScopeKey}
-          useFilterAsIs={useFilterAsIs}
-          clientSideKindFilter={clientSideKindFilter}
-          allowKindlessRelayExplore={allowKindlessRelayExplore}
+          gridLayout={listMode === 'media'}
+          useFilterAsIs={listMode === 'media' ? true : useFilterAsIs}
+          clientSideKindFilter={listMode === 'media' ? false : clientSideKindFilter}
+          allowKindlessRelayExplore={listMode === 'media' ? false : allowKindlessRelayExplore}
+          showAllKinds={listMode === 'media' ? true : listShowAllKinds}
           showFeedClientFilter={showFeedClientFilter}
           hostPrimaryPageName={hostPrimaryPageName}
           feedClientFilterTabRowHost={mergeFilterWithTabsRow ? feedFilterTabRowHost : undefined}
diff --git a/src/components/NoteList/index.tsx b/src/components/NoteList/index.tsx
index b7189000..57e9bb95 100644
--- a/src/components/NoteList/index.tsx
+++ b/src/components/NoteList/index.tsx
@@ -78,6 +78,7 @@ import {
   SelectValue
 } from '@/components/ui/select'
 import NoteCard, { NoteCardLoadingSkeleton } from '../NoteCard'
+import MediaGridItem from '../MediaGridItem'
 
 const LIMIT = 100 // Increased from 200 to load more events per request
 const ALGO_LIMIT = 200 // Increased from 500 for algorithm feeds
@@ -468,7 +469,8 @@ const NoteList = forwardRef(
        */
       feedClientFilterTabRowHost,
       onSingleRelayKindlessEmpty,
-      feedTopNotice
+      feedTopNotice,
+      gridLayout = false
     }: {
       subRequests: TFeedSubRequest[]
       showKinds: number[]
@@ -521,6 +523,8 @@ const NoteList = forwardRef(
       onSingleRelayKindlessEmpty?: () => void
       /** Optional banner above the feed (e.g. kindless→kinds fallback). */
       feedTopNotice?: ReactNode
+      /** When true, render events as an Instagram-style 3-column square media grid. */
+      gridLayout?: boolean
     },
     ref
   ) => {
@@ -1475,16 +1479,9 @@ const NoteList = forwardRef(
         return () => {}
       }
 
-      if (!relayCapabilityReady && !oneShotFetch) {
-        setLoading(true)
-        return () => {}
-      }
-
-      // Synchronous offline check — must run before the async init() so state
-      // updates happen in the same React batch as the effect itself.
-      // If every relay URL in every shard is non-local while offline, show an
-      // immediate empty state instead of spinning while waiting for connections
-      // that can never succeed.
+      // Offline check must come before relayCapabilityReady: for internet relay
+      // shards, relayCapabilityReady never becomes true while offline (NIP-11
+      // fetch cannot complete), so checking it first causes an infinite loading spin.
       if (isOfflineRef.current && subRequestsRef.current.length > 0) {
         const hasAnyLocalRelay = subRequestsRef.current.some((req) =>
           req.urls.some((u) => isLocalNetworkUrl(u))
@@ -1500,6 +1497,11 @@ const NoteList = forwardRef(
         }
       }
 
+      if (!relayCapabilityReady && !oneShotFetch) {
+        setLoading(true)
+        return () => {}
+      }
+
       const prevSubKey = prevSubRequestsKeyForTimelineRef.current
       const userPulledRefresh = refreshCount !== timelineEffectLastRefreshCountRef.current
       if (userPulledRefresh) {
@@ -3140,28 +3142,40 @@ const NoteList = forwardRef(
             {t('Feed full search empty')}
           </div>
         ) : null}
-        {clientFilteredEvents.map((event) => (
-          <NoteCard
-            key={event.id}
-            className="w-full"
-            event={event}
-            filterMutedNotes={filterMutedNotes}
-            bottomNoteLabel={eventReasonLabelMap.get(event.id)}
-          />
-        ))}
+        {gridLayout ? (
+          <div className="grid grid-cols-3 gap-0.5 pr-4">
+            {clientFilteredEvents.map((event) => (
+              <MediaGridItem key={event.id} event={event} />
+            ))}
+          </div>
+        ) : (
+          clientFilteredEvents.map((event) => (
+            <NoteCard
+              key={event.id}
+              className="w-full"
+              event={event}
+              filterMutedNotes={filterMutedNotes}
+              bottomNoteLabel={eventReasonLabelMap.get(event.id)}
+            />
+          ))
+        )}
         {listSourceEvents.length === 0 &&
         !feedFullSearchActive &&
         (loading || (subRequests.length > 0 && !feedTimelineEmptyUiReady)) ? (
           <div
             ref={bottomRef}
-            className="min-h-[40vh] space-y-2 px-1 py-4"
+            className={gridLayout ? 'grid grid-cols-3 gap-0.5 pr-4 min-h-[40vh]' : 'min-h-[40vh] space-y-2 px-1 py-4'}
             role="status"
             aria-live="polite"
             aria-busy="true"
           >
-            {Array.from({ length: 5 }).map((_, i) => (
-              <NoteCardLoadingSkeleton key={i} />
-            ))}
+            {gridLayout
+              ? Array.from({ length: 9 }).map((_, i) => (
+                  <div key={i} className="aspect-square animate-pulse bg-muted" />
+                ))
+              : Array.from({ length: 5 }).map((_, i) => (
+                  <NoteCardLoadingSkeleton key={i} />
+                ))}
           </div>
         ) : listSourceEvents.length > 0 &&
           (feedFullSearchActive ? showCount < listSourceEvents.length : hasMore) ? (
diff --git a/src/components/Profile/index.tsx b/src/components/Profile/index.tsx
index ba31ab82..9cbca91d 100644
--- a/src/components/Profile/index.tsx
+++ b/src/components/Profile/index.tsx
@@ -18,6 +18,7 @@ import { getPaymentInfoFromEvent } from '@/lib/event-metadata'
 import { showSimplePublishSuccess, toastPublishPromise } from '@/lib/publishing-feedback'
 import { toProfileEditor } from '@/lib/link'
 import { generateImageByPubkey } from '@/lib/pubkey'
+import { isVideo } from '@/lib/url'
 import { usePrimaryPage } from '@/contexts/primary-page-context'
 import { useSecondaryPage } from '@/PageManager'
 import { useNostr } from '@/providers/NostrProvider'
@@ -405,12 +406,18 @@ export default function Profile({
       <div>
         <div className="relative bg-cover bg-center mb-2">
           <ProfileBanner banner={banner} pubkey={pubkey} className="w-full aspect-[3/1]" />
-          <Avatar className="w-24 h-24 md:w-48 md:h-48 absolute left-3 bottom-0 translate-y-1/2 border-4 border-background">
-            <AvatarImage src={avatar} className="object-cover object-center" />
-            <AvatarFallback>
-              <img src={defaultImage} />
-            </AvatarFallback>
-          </Avatar>
+          {isVideo(avatar ?? '') ? (
+            <div className="w-24 h-24 md:w-48 md:h-48 absolute left-3 bottom-0 translate-y-1/2 border-4 border-background overflow-hidden rounded-full bg-muted">
+              <video src={avatar} className="h-full w-full object-cover object-center" autoPlay muted loop playsInline />
+            </div>
+          ) : (
+            <Avatar className="w-24 h-24 md:w-48 md:h-48 absolute left-3 bottom-0 translate-y-1/2 border-4 border-background">
+              <AvatarImage src={avatar} className="object-cover object-center" />
+              <AvatarFallback>
+                <img src={defaultImage} />
+              </AvatarFallback>
+            </Avatar>
+          )}
         </div>
         <div className="px-4">
           <div className="flex justify-end h-8 gap-2 items-center">
diff --git a/src/components/UserAvatar/index.tsx b/src/components/UserAvatar/index.tsx
index e3756c98..ad3be03c 100644
--- a/src/components/UserAvatar/index.tsx
+++ b/src/components/UserAvatar/index.tsx
@@ -1,6 +1,7 @@
 import { Skeleton } from '@/components/ui/skeleton'
 import { useFetchProfile } from '@/hooks'
 import { toNostrBuildThumbUrl } from '@/lib/nostr-build'
+import { isVideo } from '@/lib/url'
 import { generateImageByPubkey, userIdToPubkey } from '@/lib/pubkey'
 import { toProfile } from '@/lib/link'
 import { cn } from '@/lib/utils'
@@ -56,13 +57,13 @@ function useDeferRemoteProfileAvatar(
   const remoteHttp = useMemo(() => {
     const a = profileAvatar?.trim()
     if (!a || !isHttpOrHttpsUrl(a)) return ''
+    // Video files don't have a /thumb/ route — serve them as-is.
+    if (isVideo(a)) return a
     // Always use the nostr.build thumbnail route for profile pictures — it's
     // typically < 50 KB regardless of the original file size.
     return toNostrBuildThumbUrl(a)
   }, [profileAvatar])
 
-  // If this URL loaded successfully earlier this session it's already in the browser's
-  // HTTP cache — skip both the viewport delay and the size check.
   const alreadyCached = remoteHttp ? loadedAvatarUrls.has(remoteHttp) : false
 
   const [sizeBlocked, setSizeBlocked] = useState(false)
@@ -88,7 +89,6 @@ function useDeferRemoteProfileAvatar(
     return ''
   }, [profileAvatar])
 
-  // Already cached → show immediately without waiting for IntersectionObserver.
   const [allowRemote, setAllowRemote] = useState(() => remoteHttp === '' || alreadyCached)
 
   useEffect(() => {
@@ -195,6 +195,8 @@ export default function UserAvatar({
   const [imgError, setImgError] = useState(false)
   const [currentSrc, setCurrentSrc] = useState(avatarSrc)
 
+  const isVideoAvatar = useMemo(() => isVideo(profile?.avatar?.trim() ?? ''), [profile?.avatar])
+
   // Reset error state when src changes
   useEffect(() => {
     setImgError(false)
@@ -239,16 +241,31 @@ export default function UserAvatar({
       }}
     >
       {!imgError && currentSrc ? (
-        <img 
-          src={currentSrc}
-          alt=""
-          className="block w-full h-full object-cover object-center"
-          style={{ display: 'block', position: 'static', margin: 0, padding: 0, top: 0, left: 0, right: 0, bottom: 0 }}
-          onError={handleImageError}
-          onLoad={handleImageLoad}
-          loading="lazy"
-          decoding="async"
-        />
+        isVideoAvatar ? (
+          <video
+            src={currentSrc}
+            className="block w-full h-full object-cover object-center"
+            autoPlay
+            muted
+            loop
+            playsInline
+            onCanPlay={() => {
+              if (currentSrc && isHttpOrHttpsUrl(currentSrc)) loadedAvatarUrls.add(currentSrc)
+            }}
+            onError={handleImageError}
+          />
+        ) : (
+          <img 
+            src={currentSrc}
+            alt=""
+            className="block w-full h-full object-cover object-center"
+            style={{ display: 'block', position: 'static', margin: 0, padding: 0, top: 0, left: 0, right: 0, bottom: 0 }}
+            onError={handleImageError}
+            onLoad={handleImageLoad}
+            loading="lazy"
+            decoding="async"
+          />
+        )
       ) : (
         // Show initials or placeholder when image fails
         <div className="h-full w-full flex items-center justify-center text-xs font-medium text-muted-foreground">
@@ -314,6 +331,8 @@ export function SimpleUserAvatar({
   const [imgError, setImgError] = useState(false)
   const [currentSrc, setCurrentSrc] = useState(avatarSrc)
 
+  const isVideoAvatar = useMemo(() => isVideo(profile?.avatar?.trim() ?? ''), [profile?.avatar])
+
   // Reset error state when src changes
   useEffect(() => {
     setImgError(false)
@@ -352,16 +371,31 @@ export function SimpleUserAvatar({
       className={cn('shrink-0 relative overflow-hidden rounded-full bg-muted', UserAvatarSizeCnMap[size], className)}
     >
       {!imgError && currentSrc ? (
-        <img 
-          src={currentSrc}
-          alt=""
-          className="block w-full h-full object-cover object-center"
-          style={{ display: 'block', position: 'static', margin: 0, padding: 0, top: 0, left: 0, right: 0, bottom: 0 }}
-          onError={handleImageError}
-          onLoad={handleImageLoad}
-          loading="lazy"
-          decoding="async"
-        />
+        isVideoAvatar ? (
+          <video
+            src={currentSrc}
+            className="block w-full h-full object-cover object-center"
+            autoPlay
+            muted
+            loop
+            playsInline
+            onCanPlay={() => {
+              if (currentSrc && isHttpOrHttpsUrl(currentSrc)) loadedAvatarUrls.add(currentSrc)
+            }}
+            onError={handleImageError}
+          />
+        ) : (
+          <img 
+            src={currentSrc}
+            alt=""
+            className="block w-full h-full object-cover object-center"
+            style={{ display: 'block', position: 'static', margin: 0, padding: 0, top: 0, left: 0, right: 0, bottom: 0 }}
+            onError={handleImageError}
+            onLoad={handleImageLoad}
+            loading="lazy"
+            decoding="async"
+          />
+        )
       ) : (
         // Show initials or placeholder when image fails
         <div className="h-full w-full flex items-center justify-center text-xs font-medium text-muted-foreground">
diff --git a/src/lib/nostr-build.ts b/src/lib/nostr-build.ts
index 03790a8f..e1edb782 100644
--- a/src/lib/nostr-build.ts
+++ b/src/lib/nostr-build.ts
@@ -4,8 +4,11 @@
  * nostr.build generates a lightweight thumbnail at /thumb/<filename> for every
  * uploaded image. Thumbnails are typically < 50 KB regardless of the original
  * file size — a huge bandwidth win for profile pictures and feed previews.
+ * Note: the /thumb/ route only works for image files — never apply it to video URLs.
  */
 
+import { isVideo } from './url'
+
 /** Returns true when a URL is hosted on any nostr.build domain. */
 export function isNostrBuildUrl(url: string): boolean {
   const u = (url ?? '').trim()
@@ -17,10 +20,12 @@ export function isNostrBuildUrl(url: string): boolean {
   }
 }
 
-/** Returns true when the URL is on nostr.build but does NOT yet use the /thumb/ path. */
+/** Returns true when the URL is on nostr.build but does NOT yet use the /thumb/ path, and is not a video file. */
 export function canUseNostrBuildThumb(url: string): boolean {
   const u = (url ?? '').trim()
   if (!u) return false
+  // /thumb/ is image-only on nostr.build — never apply it to video files
+  if (isVideo(u)) return false
   try {
     const parsed = new URL(u)
     if (!parsed.hostname.endsWith('nostr.build')) return false
diff --git a/src/pages/secondary/ProfileEditorPage/index.tsx b/src/pages/secondary/ProfileEditorPage/index.tsx
index 889ee988..cf739d72 100644
--- a/src/pages/secondary/ProfileEditorPage/index.tsx
+++ b/src/pages/secondary/ProfileEditorPage/index.tsx
@@ -33,6 +33,7 @@ import {
   SelectValue
 } from '@/components/ui/select'
 import { canUseNostrBuildThumb, toNostrBuildThumbUrl } from '@/lib/nostr-build'
+import { isVideo } from '@/lib/url'
 import { ChevronDown, Fingerprint, Pencil, Plus, RefreshCw, Trash2, Upload } from 'lucide-react'
 import type { Event } from 'nostr-tools'
 import { forwardRef, useCallback, useEffect, useMemo, useState } from 'react'
@@ -457,14 +458,28 @@ const ProfileEditorPage = forwardRef(({ index }: { index?: number }, ref) => {
           onUploadStart={() => setUploadingAvatar(true)}
           onUploadEnd={() => setUploadingAvatar(false)}
           className="w-24 h-24 absolute bottom-0 left-4 translate-y-1/2 border-4 border-background cursor-pointer rounded-full"
+          accept="image/*,video/mp4,video/webm,video/quicktime"
           maxFileSizeMb={2}
         >
-          <Avatar className="w-full h-full">
-            <AvatarImage src={avatar} className="object-cover object-center" />
-            <AvatarFallback>
-              <img src={defaultImage} />
-            </AvatarFallback>
-          </Avatar>
+          <div className="w-full h-full overflow-hidden rounded-full bg-muted">
+            {isVideo(avatar) ? (
+              <video
+                src={avatar}
+                className="w-full h-full object-cover object-center"
+                autoPlay
+                muted
+                loop
+                playsInline
+              />
+            ) : (
+              <Avatar className="w-full h-full">
+                <AvatarImage src={avatar} className="object-cover object-center" />
+                <AvatarFallback>
+                  <img src={defaultImage} />
+                </AvatarFallback>
+              </Avatar>
+            )}
+          </div>
           <div className="absolute top-0 bg-muted/30 w-full h-full rounded-full flex flex-col justify-center items-center">
             {uploadingAvatar ? (
               <Skeleton className="size-4 shrink-0 rounded-sm" aria-hidden />
diff --git a/src/services/local-storage.service.ts b/src/services/local-storage.service.ts
index a322343b..7f6c4eb5 100644
--- a/src/services/local-storage.service.ts
+++ b/src/services/local-storage.service.ts
@@ -147,7 +147,7 @@ class LocalStorageService {
     }
     const noteListModeStr = window.localStorage.getItem(StorageKey.NOTE_LIST_MODE)
     this.noteListMode =
-      noteListModeStr && ['posts', 'postsAndReplies', 'pictures'].includes(noteListModeStr)
+      noteListModeStr && ['posts', 'postsAndReplies', 'media'].includes(noteListModeStr)
         ? (noteListModeStr as TNoteListMode)
         : 'posts'
     const relaySetsStr = window.localStorage.getItem(StorageKey.RELAY_SETS)
@@ -487,7 +487,7 @@ class LocalStorageService {
       this.fontSize = (get(StorageKey.FONT_SIZE) as TFontSize) ?? this.fontSize
     }
     const noteListModeStr = get(StorageKey.NOTE_LIST_MODE)
-    if (noteListModeStr != null && ['posts', 'postsAndReplies', 'pictures'].includes(noteListModeStr)) {
+    if (noteListModeStr != null && ['posts', 'postsAndReplies', 'media'].includes(noteListModeStr)) {
       this.noteListMode = noteListModeStr as TNoteListMode
     }
     const accountsStr = get(StorageKey.ACCOUNTS)
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 86e08df8..2784a9b8 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -205,7 +205,7 @@ export type TPublishEventExtras = {
   publishBatchLabel?: string
 }
 
-export type TNoteListMode = 'posts' | 'postsAndReplies' | 'you' | 'bookmarksAndHashtags'
+export type TNoteListMode = 'posts' | 'postsAndReplies' | 'media'
 
 export type TNotificationType = 'all' | 'mentions' | 'reactions' | 'zaps'