diff --git a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart
index fabf0c63e..27e41f08d 100644
--- a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart
+++ b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart
@@ -87,7 +87,7 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
   late final _tween = Matrix4Tween();
   late final _animatable = _tween.chain(CurveTween(curve: Curves.easeOut));
 
-  late final _horizontalDragGestureRecognizer;
+  late final ImageHorizontalDragGestureRecognizer _horizontalDragGestureRecognizer;
 
   late Offset _doubleTapLocalPosition;
 
diff --git a/lib/common/widgets/marquee.dart b/lib/common/widgets/marquee.dart
index 99dd2a09d..101a31f70 100644
--- a/lib/common/widgets/marquee.dart
+++ b/lib/common/widgets/marquee.dart
@@ -448,7 +448,7 @@ class ContextSingleTicker implements TickerProvider {
       onTick,
       debugLabel: kDebugMode ? 'created by ${describeIdentity(this)}' : null,
     );
-    _tickerModeNotifier = TickerMode.getNotifier(context)
+    _tickerModeNotifier = TickerMode.getValuesNotifier(context)
       ..addListener(updateTicker);
     updateTicker(); // Sets _ticker.mute correctly.
     return _ticker!;
@@ -467,9 +467,15 @@ class ContextSingleTicker implements TickerProvider {
     _tickerModeNotifier = null;
   }
 
-  ValueListenable<bool>? _tickerModeNotifier;
+  ValueListenable<TickerModeData>? _tickerModeNotifier;
 
-  void updateTicker() => _ticker?.muted = !_tickerModeNotifier!.value;
+  void updateTicker() {
+    final TickerModeData values = _tickerModeNotifier!.value;
+    if (_ticker != null) {
+      _ticker!.muted = !values.enabled;
+      _ticker!.forceFrames = values.forceFrames;
+    }
+  }
 
   set muted(bool value) => _ticker?.muted = value;
 }