diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index d9d60f0..690d62a 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -177,9 +177,9 @@ class _ScaffoldWithNav extends ConsumerWidget {
             label: 'Discover',
           ),
           BottomNavigationBarItem(
-            icon: Icon(Icons.download_outlined),
-            activeIcon: Icon(Icons.download),
-            label: 'Downloads',
+            icon: Icon(Icons.offline_pin_outlined),
+            activeIcon: Icon(Icons.offline_pin),
+            label: 'Offline',
           ),
           BottomNavigationBarItem(
             icon: Icon(Icons.settings_outlined),
diff --git a/lib/providers/download_progress_provider.dart b/lib/providers/download_progress_provider.dart
deleted file mode 100644
index 45990c2..0000000
--- a/lib/providers/download_progress_provider.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-/// Ephemeral map of video_id → download percentage (0.0–100.0).
-/// Updated via WebSocket events, not persisted.
-class DownloadProgressNotifier extends Notifier<Map<String, double>> {
-  @override
-  Map<String, double> build() => {};
-
-  void updateProgress(String videoId, double pct) {
-    state = {...state, videoId: pct};
-  }
-
-  void removeProgress(String videoId) {
-    final current = Map<String, double>.from(state);
-    current.remove(videoId);
-    state = current;
-  }
-}
-
-final downloadProgressProvider =
-    NotifierProvider<DownloadProgressNotifier, Map<String, double>>(
-      DownloadProgressNotifier.new,
-    );
diff --git a/lib/providers/websocket_provider.dart b/lib/providers/websocket_provider.dart
index 0f8a3aa..054c53e 100644
--- a/lib/providers/websocket_provider.dart
+++ b/lib/providers/websocket_provider.dart
@@ -6,7 +6,6 @@ import '../services/offline_service.dart';
 import '../services/api_service.dart';
 import 'auth_provider.dart';
 import 'channel_provider.dart';
-import 'download_progress_provider.dart';
 import 'feed_provider.dart';
 import 'discover_provider.dart';
 import 'offline_provider.dart';
@@ -43,18 +42,12 @@ final webSocketConnectionProvider = Provider<void>((ref) {
   final subscription = wsService.events.listen((event) {
     switch (event.type) {
       case WebSocketEventType.downloadProgress:
-        final videoId = event.data['video_id'] as String?;
-        final pct = (event.data['percentage'] as num?)?.toDouble();
-        if (videoId != null && pct != null) {
-          ref
-              .read(downloadProgressProvider.notifier)
-              .updateProgress(videoId, pct);
-        }
+        // Caching is invisible — download progress is no longer surfaced.
+        break;
       case WebSocketEventType.downloadComplete:
         final videoId = event.data['video_id'] as String?;
         final channelId = event.data['channel_id'] as String?;
         if (videoId != null) {
-          ref.read(downloadProgressProvider.notifier).removeProgress(videoId);
           ref.invalidate(videoDetailProvider(videoId));
         }
         if (channelId != null) {
diff --git a/lib/screens/channel_detail_screen.dart b/lib/screens/channel_detail_screen.dart
index 156bed3..4a2ca33 100644
--- a/lib/screens/channel_detail_screen.dart
+++ b/lib/screens/channel_detail_screen.dart
@@ -1,14 +1,10 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import '../models/video.dart';
 import '../providers/channel_provider.dart';
-import '../providers/download_progress_provider.dart';
 import '../providers/feed_provider.dart';
-import '../providers/settings_provider.dart';
 import '../services/api_service.dart';
 import '../services/storage_service.dart';
 import '../widgets/queue_action.dart';
@@ -26,9 +22,6 @@ class ChannelDetailScreen extends ConsumerStatefulWidget {
 }
 
 class _ChannelDetailScreenState extends ConsumerState<ChannelDetailScreen> {
-  Timer? _pollTimer;
-  final Set<String> _pendingVideoIds = {};
-
   @override
   void initState() {
     super.initState();
@@ -62,52 +55,6 @@ class _ChannelDetailScreenState extends ConsumerState<ChannelDetailScreen> {
     }
   }
 
-  @override
-  void dispose() {
-    _pollTimer?.cancel();
-    super.dispose();
-  }
-
-  void _startPolling() {
-    if (_pollTimer?.isActive ?? false) return;
-    _pollTimer = Timer.periodic(const Duration(seconds: 5), (_) {
-      ref.invalidate(channelVideosProvider(widget.channelId));
-    });
-  }
-
-  void _stopPolling() {
-    _pollTimer?.cancel();
-    _pollTimer = null;
-  }
-
-  void _checkPollingNeeded(List<Video> videos) {
-    for (final id in _pendingVideoIds.toList()) {
-      final video = videos.where((v) => v.id == id).firstOrNull;
-      if (video != null && video.status != VideoStatus.cataloged) {
-        _pendingVideoIds.remove(id);
-      }
-    }
-
-    final hasInProgress =
-        videos.any((v) => v.isInProgress) || _pendingVideoIds.isNotEmpty;
-    if (hasInProgress) {
-      _startPolling();
-    } else {
-      _stopPolling();
-    }
-  }
-
-  List<Video> _applyOptimisticUpdates(List<Video> videos) {
-    if (_pendingVideoIds.isEmpty) return videos;
-    return videos.map((v) {
-      if (_pendingVideoIds.contains(v.id) &&
-          v.status == VideoStatus.cataloged) {
-        return v.copyWith(status: VideoStatus.pending);
-      }
-      return v;
-    }).toList();
-  }
-
   void _invalidateChannel() {
     ref.invalidate(channelDetailProvider(widget.channelId));
     ref.invalidate(channelVideosProvider(widget.channelId));
@@ -179,11 +126,8 @@ class _ChannelDetailScreenState extends ConsumerState<ChannelDetailScreen> {
   Widget build(BuildContext context) {
     final channelAsync = ref.watch(channelDetailProvider(widget.channelId));
     final videosAsync = ref.watch(channelVideosProvider(widget.channelId));
-    final progressMap = ref.watch(downloadProgressProvider);
     final padding = AdaptiveLayout.contentPadding(context);
 
-    videosAsync.whenData(_checkPollingNeeded);
-
     return Scaffold(
       // The loaded state brings its own SliverAppBar; loading/error states
       // still need a back button.
@@ -352,7 +296,7 @@ class _ChannelDetailScreenState extends ConsumerState<ChannelDetailScreen> {
               ),
               videosAsync.when(
                 data: (videos) {
-                  final displayVideos = _applyOptimisticUpdates(videos);
+                  final displayVideos = videos;
                   if (displayVideos.isEmpty) {
                     return SliverToBoxAdapter(
                       child: Padding(
@@ -371,23 +315,16 @@ class _ChannelDetailScreenState extends ConsumerState<ChannelDetailScreen> {
                       final video = displayVideos[index];
                       return VideoListTile(
                         video: video,
-                        downloadProgress: progressMap[video.id],
-                        onTap: (video.isPlayable || video.isInProgress)
-                            ? () async {
-                                await context.push('/player/${video.id}');
-                                if (!mounted) return;
-                                ref.invalidate(
-                                  channelVideosProvider(widget.channelId),
-                                );
-                                invalidateFeedProviders(ref);
-                              }
-                            : null,
-                        onDownload: video.isDownloadable
-                            ? () => _onDownload(video)
-                            : null,
-                        onCancel: video.isInProgress
-                            ? () => _onCancelDownload(video)
-                            : null,
+                        // Every episode plays on tap — cached or not (an
+                        // un-cached one starts via instant-stream).
+                        onTap: () async {
+                          await context.push('/player/${video.id}');
+                          if (!mounted) return;
+                          ref.invalidate(
+                            channelVideosProvider(widget.channelId),
+                          );
+                          invalidateFeedProviders(ref);
+                        },
                         onMenu: () => _showVideoMenu(video),
                       );
                     }, childCount: displayVideos.length),
@@ -485,16 +422,6 @@ class _ChannelDetailScreenState extends ConsumerState<ChannelDetailScreen> {
               video: video,
               onTap: () => Navigator.pop(sheetContext),
             ),
-            if (video.status == VideoStatus.complete)
-              ListTile(
-                leading: const Icon(Icons.download_rounded),
-                title: const Text('Re-download'),
-                subtitle: const Text('Fetch the video from YouTube again'),
-                onTap: () {
-                  Navigator.pop(sheetContext);
-                  _onDownload(video);
-                },
-              ),
             ListTile(
               leading: const Icon(
                 Icons.delete_outline,
@@ -553,41 +480,4 @@ class _ChannelDetailScreenState extends ConsumerState<ChannelDetailScreen> {
       ).showSnackBar(SnackBar(content: Text(e.message)));
     }
   }
-
-  Future<void> _onCancelDownload(Video video) async {
-    final api = ref.read(apiServiceProvider);
-    try {
-      await api.cancelDownload(video.id);
-      ref.invalidate(channelVideosProvider(widget.channelId));
-    } on ApiException catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Failed to cancel download: ${e.message}')),
-        );
-      }
-    }
-  }
-
-  Future<void> _onDownload(Video video) async {
-    final api = ref.read(apiServiceProvider);
-    final quality = ref.read(settingsProvider).preferredQuality;
-
-    setState(() {
-      _pendingVideoIds.add(video.id);
-    });
-
-    try {
-      await api.downloadVideo(video.id, quality: quality);
-      if (!mounted) return;
-      _startPolling();
-    } on ApiException catch (e) {
-      if (!mounted) return;
-      setState(() {
-        _pendingVideoIds.remove(video.id);
-      });
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Failed to start download: ${e.message}')),
-      );
-    }
-  }
 }
diff --git a/lib/screens/downloads_screen.dart b/lib/screens/downloads_screen.dart
index 671e62f..99cdd24 100644
--- a/lib/screens/downloads_screen.dart
+++ b/lib/screens/downloads_screen.dart
@@ -1,27 +1,18 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import '../models/video.dart';
-import '../providers/download_progress_provider.dart';
 import '../providers/feed_provider.dart';
 import '../providers/offline_provider.dart';
-import '../services/api_service.dart';
 import '../services/offline_service.dart';
 import '../widgets/adaptive_layout.dart';
 import '../config/theme.dart';
 
-/// Videos currently downloading on the server (plus just-finished ones).
-final activeDownloadsProvider = FutureProvider.autoDispose<List<Video>>((
-  ref,
-) async {
-  final api = ref.watch(apiServiceProvider);
-  return api.getActiveDownloads();
-});
-
-/// Downloads hub: server-side downloads and on-device offline videos.
+/// Offline library: videos the user has explicitly saved to this device.
+///
+/// Server-side caching (followed-channel prefetch, cold-press cache) is
+/// invisible background plumbing and never appears here — the only thing shown
+/// is what the user deliberately saved for offline playback.
 class DownloadsScreen extends ConsumerStatefulWidget {
   const DownloadsScreen({super.key});
 
@@ -30,43 +21,8 @@ class DownloadsScreen extends ConsumerStatefulWidget {
 }
 
 class _DownloadsScreenState extends ConsumerState<DownloadsScreen> {
-  Timer? _pollTimer;
-
-  @override
-  void initState() {
-    super.initState();
-    // The server list has no push channel for newly queued items, so poll
-    // while the screen is visible. Live percentages come over the WebSocket.
-    _pollTimer = Timer.periodic(const Duration(seconds: 5), (_) {
-      ref.invalidate(activeDownloadsProvider);
-    });
-  }
-
-  @override
-  void dispose() {
-    _pollTimer?.cancel();
-    super.dispose();
-  }
-
   Future<void> _refresh() async {
     ref.read(offlineVideosProvider.notifier).refresh();
-    try {
-      await Future.wait([ref.refresh(activeDownloadsProvider.future)]);
-    } catch (_) {
-      // The section renders its own inline error state.
-    }
-  }
-
-  Future<void> _cancelServerDownload(Video video) async {
-    try {
-      await ref.read(apiServiceProvider).cancelDownload(video.id);
-      ref.invalidate(activeDownloadsProvider);
-    } on ApiException catch (e) {
-      if (!mounted) return;
-      ScaffoldMessenger.of(
-        context,
-      ).showSnackBar(SnackBar(content: Text('Failed to cancel: ${e.message}')));
-    }
   }
 
   Future<void> _deleteDeviceDownload(Map<String, dynamic> entry) async {
@@ -124,8 +80,6 @@ class _DownloadsScreenState extends ConsumerState<DownloadsScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final serverDownloads = ref.watch(activeDownloadsProvider);
-    final progressMap = ref.watch(downloadProgressProvider);
     final offlineVideos = ref.watch(offlineVideosProvider);
     final offlineProgress = ref.watch(offlineProgressProvider);
     final padding = AdaptiveLayout.contentPadding(context);
@@ -139,84 +93,15 @@ class _DownloadsScreenState extends ConsumerState<DownloadsScreen> {
           slivers: [
             const SliverAppBar(
               floating: true,
-              title: Text('Downloads'),
+              title: Text('Offline'),
               backgroundColor: NullFeedTheme.backgroundColor,
             ),
-            SliverToBoxAdapter(
-              child: _SectionHeader(
-                title: 'Server downloads',
-                padding: padding,
-              ),
-            ),
-            serverDownloads.when(
-              data: (videos) {
-                if (videos.isEmpty) {
-                  return SliverToBoxAdapter(
-                    child: _EmptyNote(
-                      text: 'No active downloads on the server.',
-                      padding: padding,
-                    ),
-                  );
-                }
-                return SliverList(
-                  delegate: SliverChildBuilderDelegate((context, index) {
-                    final video = videos[index];
-                    return _ServerDownloadTile(
-                      video: video,
-                      percentage: progressMap[video.id],
-                      onCancel: video.isInProgress
-                          ? () => _cancelServerDownload(video)
-                          : null,
-                    );
-                  }, childCount: videos.length),
-                );
-              },
-              loading: () => const SliverToBoxAdapter(
-                child: Padding(
-                  padding: EdgeInsets.all(24),
-                  child: Center(child: CircularProgressIndicator()),
-                ),
-              ),
-              error: (error, _) => SliverToBoxAdapter(
-                child: Padding(
-                  padding: EdgeInsets.symmetric(
-                    horizontal: padding,
-                    vertical: 12,
-                  ),
-                  child: Row(
-                    children: [
-                      const Icon(
-                        Icons.error_outline,
-                        color: NullFeedTheme.errorColor,
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Text(
-                          '$error',
-                          maxLines: 2,
-                          overflow: TextOverflow.ellipsis,
-                          style: Theme.of(context).textTheme.bodyMedium,
-                        ),
-                      ),
-                      OutlinedButton(
-                        onPressed: () =>
-                            ref.invalidate(activeDownloadsProvider),
-                        child: const Text('Retry'),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-            SliverToBoxAdapter(
-              child: _SectionHeader(title: 'On this device', padding: padding),
-            ),
             if (offlineVideos.isEmpty)
               SliverToBoxAdapter(
                 child: _EmptyNote(
                   text:
-                      'Nothing saved for offline playback yet. Use the cloud '
-                      'icon on a video to save it to this device.',
+                      'Nothing saved for offline playback yet. Tap the cloud '
+                      'icon on a video to keep it on this device.',
                   padding: padding,
                 ),
               )
@@ -247,20 +132,6 @@ class _DownloadsScreenState extends ConsumerState<DownloadsScreen> {
   }
 }
 
-class _SectionHeader extends StatelessWidget {
-  final String title;
-  final double padding;
-  const _SectionHeader({required this.title, required this.padding});
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: EdgeInsets.fromLTRB(padding, 24, padding, 8),
-      child: Text(title, style: Theme.of(context).textTheme.titleLarge),
-    );
-  }
-}
-
 class _EmptyNote extends StatelessWidget {
   final String text;
   final double padding;
@@ -311,80 +182,6 @@ class _Thumbnail extends StatelessWidget {
   }
 }
 
-class _ServerDownloadTile extends StatelessWidget {
-  final Video video;
-
-  /// Live percentage (0–100) from the WebSocket, if any.
-  final double? percentage;
-  final VoidCallback? onCancel;
-
-  const _ServerDownloadTile({
-    required this.video,
-    required this.percentage,
-    required this.onCancel,
-  });
-
-  String get _statusLabel {
-    switch (video.status) {
-      case VideoStatus.pending:
-        return 'Queued';
-      case VideoStatus.downloading:
-        return percentage != null
-            ? 'Downloading ${percentage!.toStringAsFixed(0)}%'
-            : 'Downloading…';
-      case VideoStatus.complete:
-        return 'Completed';
-      case VideoStatus.failed:
-        return 'Failed';
-      case VideoStatus.cataloged:
-        return 'Cataloged';
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      leading: _Thumbnail(youtubeVideoId: video.youtubeVideoId),
-      title: Text(
-        video.title,
-        maxLines: 2,
-        overflow: TextOverflow.ellipsis,
-        style: const TextStyle(fontSize: 14),
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          if (video.channelName.isNotEmpty)
-            Text(video.channelName, style: const TextStyle(fontSize: 12)),
-          const SizedBox(height: 4),
-          if (video.isInProgress)
-            LinearProgressIndicator(
-              value: percentage != null ? percentage! / 100.0 : null,
-              minHeight: 3,
-            ),
-          const SizedBox(height: 2),
-          Text(
-            _statusLabel,
-            style: const TextStyle(
-              fontSize: 12,
-              color: NullFeedTheme.textMuted,
-            ),
-          ),
-        ],
-      ),
-      trailing: onCancel != null
-          ? IconButton(
-              icon: const Icon(Icons.close, color: NullFeedTheme.textMuted),
-              onPressed: onCancel,
-              tooltip: 'Cancel download',
-            )
-          : video.status == VideoStatus.complete
-          ? const Icon(Icons.check_circle, color: NullFeedTheme.successColor)
-          : null,
-    );
-  }
-}
-
 class _DeviceDownloadTile extends StatelessWidget {
   final Map<String, dynamic> entry;
 
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index 40aecab..87c1644 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -398,14 +398,6 @@ class ApiService {
     await _dio.delete('$_baseUrl${AppConstants.channelUnsubscribe(channelId)}');
   });
 
-  // Downloads
-  Future<List<Video>> getActiveDownloads() => _guard(() async {
-    final response = await _dio.get('$_baseUrl${AppConstants.activeDownloads}');
-    return (response.data as List)
-        .map((json) => Video.fromJson(json as Map<String, dynamic>))
-        .toList();
-  });
-
   // Videos
   Future<Video> getVideo(String id) => _guard(() async {
     final response = await _dio.get('$_baseUrl${AppConstants.videoDetail(id)}');
@@ -460,18 +452,6 @@ class ApiService {
     await _dio.delete('$_baseUrl${AppConstants.videoDetail(videoId)}');
   });
 
-  Future<void> downloadVideo(String videoId, {String? quality}) =>
-      _guard(() async {
-        await _dio.post(
-          '$_baseUrl${AppConstants.videoDownload(videoId)}',
-          data: quality != null ? {'quality': quality} : null,
-        );
-      });
-
-  Future<void> cancelDownload(String videoId) => _guard(() async {
-    await _dio.post('$_baseUrl${AppConstants.videoCancel(videoId)}');
-  });
-
   /// Records an evictable cache claim on [videoId] and (server-side) kicks off
   /// its HQ download, without it showing in the Downloads tab. Called when the
   /// user starts instant playback of a not-yet-downloaded video so the player
diff --git a/lib/widgets/video_list_tile.dart b/lib/widgets/video_list_tile.dart
index 6d65c19..427740c 100644
--- a/lib/widgets/video_list_tile.dart
+++ b/lib/widgets/video_list_tile.dart
@@ -12,21 +12,15 @@ import 'progress_bar.dart';
 class VideoListTile extends ConsumerStatefulWidget {
   final Video video;
   final VoidCallback? onTap;
-  final VoidCallback? onDownload;
-  final VoidCallback? onCancel;
 
   /// Opens the per-video actions menu (long-press or the ⋯ button).
   final VoidCallback? onMenu;
-  final double? downloadProgress;
 
   const VideoListTile({
     super.key,
     required this.video,
     this.onTap,
-    this.onDownload,
-    this.onCancel,
     this.onMenu,
-    this.downloadProgress,
   });
 
   @override
@@ -63,141 +57,75 @@ class _VideoListTileState extends ConsumerState<VideoListTile> {
   }
 
   String? _downloadStateLabel(String? offlineStatus) {
-    switch (widget.video.status) {
-      case VideoStatus.complete:
-        if (offlineStatus == 'complete') return 'downloaded';
-        if (offlineStatus == 'downloading') return 'downloading to device';
-        return null;
-      case VideoStatus.downloading:
-      case VideoStatus.pending:
-        return 'downloading';
-      case VideoStatus.cataloged:
-        return null;
-      case VideoStatus.failed:
-        return 'download failed';
-    }
+    // Server-side caching is invisible; only the explicit on-device "save
+    // offline" state is surfaced (and only for cached/complete videos).
+    if (widget.video.status != VideoStatus.complete) return null;
+    if (offlineStatus == 'complete') return 'saved offline';
+    if (offlineStatus == 'downloading') return 'saving offline';
+    return null;
   }
 
   Widget _buildTrailingWidget() {
+    // The only per-video action is "save offline", available once a video is
+    // cached (COMPLETE). Un-cached episodes show nothing — caching happens
+    // quietly in the background.
+    if (widget.video.status != VideoStatus.complete) {
+      return const SizedBox.shrink();
+    }
+
     final offlineStatus = ref.watch(offlineStatusProvider(widget.video.id));
     final offlineProgress = ref.watch(offlineProgressProvider);
 
-    switch (widget.video.status) {
-      case VideoStatus.complete:
-        if (offlineStatus == 'complete') {
-          return const Icon(
-            Icons.offline_pin,
-            color: NullFeedTheme.successColor,
-          );
-        }
-        if (offlineStatus == 'downloading') {
-          final progress = offlineProgress[widget.video.id];
-          return SizedBox(
-            width: 44,
-            height: 44,
-            child: Stack(
-              alignment: Alignment.center,
-              children: [
-                SizedBox(
-                  width: 24,
-                  height: 24,
-                  child: CircularProgressIndicator(
-                    strokeWidth: 2,
-                    value: progress,
-                  ),
-                ),
-                IconButton(
-                  icon: const Icon(
-                    Icons.stop_rounded,
-                    size: 14,
-                    color: NullFeedTheme.textMuted,
-                  ),
-                  padding: EdgeInsets.zero,
-                  constraints: const BoxConstraints(
-                    minWidth: 44,
-                    minHeight: 44,
-                  ),
-                  tooltip: 'Cancel download',
-                  onPressed: () {
-                    ref
-                        .read(offlineServiceProvider)
-                        .cancelDownload(widget.video.id);
-                    ref.read(offlineVideosProvider.notifier).refresh();
-                  },
-                ),
-              ],
+    if (offlineStatus == 'complete') {
+      return const Icon(Icons.offline_pin, color: NullFeedTheme.successColor);
+    }
+    if (offlineStatus == 'downloading') {
+      final progress = offlineProgress[widget.video.id];
+      return SizedBox(
+        width: 44,
+        height: 44,
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            SizedBox(
+              width: 24,
+              height: 24,
+              child: CircularProgressIndicator(strokeWidth: 2, value: progress),
             ),
-          );
-        }
-        return IconButton(
-          icon: const Icon(
-            Icons.cloud_download,
-            color: NullFeedTheme.textMuted,
-          ),
-          onPressed: () async {
-            final offlineService = ref.read(offlineServiceProvider);
-            await offlineService.downloadToDevice(
-              widget.video.id,
-              channelId: widget.video.channelId,
-              title: widget.video.title,
-              youtubeVideoId: widget.video.youtubeVideoId,
-            );
-            ref.read(offlineVideosProvider.notifier).refresh();
-          },
-          tooltip: 'Save for offline',
-        );
-      case VideoStatus.downloading:
-      case VideoStatus.pending:
-        return SizedBox(
-          width: 44,
-          height: 44,
-          child: Stack(
-            alignment: Alignment.center,
-            children: [
-              SizedBox(
-                width: 24,
-                height: 24,
-                child: CircularProgressIndicator(
-                  strokeWidth: 2,
-                  value: widget.downloadProgress != null
-                      ? widget.downloadProgress! / 100.0
-                      : null,
-                ),
+            IconButton(
+              icon: const Icon(
+                Icons.stop_rounded,
+                size: 14,
+                color: NullFeedTheme.textMuted,
               ),
-              if (widget.onCancel != null)
-                IconButton(
-                  icon: const Icon(
-                    Icons.stop_rounded,
-                    size: 14,
-                    color: NullFeedTheme.textMuted,
-                  ),
-                  padding: EdgeInsets.zero,
-                  constraints: const BoxConstraints(
-                    minWidth: 44,
-                    minHeight: 44,
-                  ),
-                  tooltip: 'Cancel download',
-                  onPressed: widget.onCancel,
-                ),
-            ],
-          ),
-        );
-      case VideoStatus.cataloged:
-        return IconButton(
-          icon: const Icon(
-            Icons.download_rounded,
-            color: NullFeedTheme.primaryColor,
-          ),
-          onPressed: widget.onDownload,
-          tooltip: 'Download to server',
-        );
-      case VideoStatus.failed:
-        return IconButton(
-          icon: const Icon(Icons.refresh, color: NullFeedTheme.errorColor),
-          onPressed: widget.onDownload,
-          tooltip: 'Retry download',
-        );
+              padding: EdgeInsets.zero,
+              constraints: const BoxConstraints(minWidth: 44, minHeight: 44),
+              tooltip: 'Cancel offline save',
+              onPressed: () {
+                ref
+                    .read(offlineServiceProvider)
+                    .cancelDownload(widget.video.id);
+                ref.read(offlineVideosProvider.notifier).refresh();
+              },
+            ),
+          ],
+        ),
+      );
     }
+    return IconButton(
+      icon: const Icon(Icons.cloud_download, color: NullFeedTheme.textMuted),
+      onPressed: () async {
+        final offlineService = ref.read(offlineServiceProvider);
+        await offlineService.downloadToDevice(
+          widget.video.id,
+          channelId: widget.video.channelId,
+          title: widget.video.title,
+          youtubeVideoId: widget.video.youtubeVideoId,
+        );
+        ref.read(offlineVideosProvider.notifier).refresh();
+      },
+      tooltip: 'Save for offline',
+    );
   }
 
   @override
diff --git a/test/widgets/accessibility_test.dart b/test/widgets/accessibility_test.dart
index 5c0a7b3..8ce265e 100644
--- a/test/widgets/accessibility_test.dart
+++ b/test/widgets/accessibility_test.dart
@@ -161,9 +161,7 @@ void main() {
     handle.dispose();
   });
 
-  testWidgets('list tile merges title, date and download state', (
-    tester,
-  ) async {
+  testWidgets('list tile merges title, date and offline state', (tester) async {
     final handle = tester.ensureSemantics();
     final uploaded = DateTime.utc(2026, 1, 2);
 
@@ -182,14 +180,14 @@ void main() {
 
     final date = DateFormat.yMMMd().format(uploaded);
     expect(
-      find.bySemanticsLabel('Big Buck Bunny, $date, downloaded'),
+      find.bySemanticsLabel('Big Buck Bunny, $date, saved offline'),
       findsOneWidget,
     );
 
     handle.dispose();
   });
 
-  testWidgets('list tile reflects a downloading state and an operable cancel', (
+  testWidgets('list tile shows no caching status for an un-cached episode', (
     tester,
   ) async {
     final handle = tester.ensureSemantics();
@@ -197,14 +195,16 @@ void main() {
     await pumpWidget(
       tester,
       VideoListTile(
-        video: makeVideo(title: 'Clip', status: VideoStatus.downloading),
+        video: makeVideo(title: 'Clip', status: VideoStatus.cataloged),
         onTap: () {},
-        onCancel: () {},
       ),
     );
 
-    expect(find.bySemanticsLabel('Clip, downloading'), findsOneWidget);
-    expect(find.byTooltip('Cancel download'), findsOneWidget);
+    // Caching is invisible: no download/cancel/progress affordance, and the
+    // semantic label carries no download state.
+    expect(find.bySemanticsLabel('Clip'), findsOneWidget);
+    expect(find.byTooltip('Cancel download'), findsNothing);
+    expect(find.byTooltip('Download to server'), findsNothing);
 
     handle.dispose();
   });