diff --git a/lib/screens/timer/components/timeline/widget_timeline_timer.dart b/lib/screens/timer/components/timeline/widget_timeline_timer.dart
index 71c43f5..24acff8 100644
--- a/lib/screens/timer/components/timeline/widget_timeline_timer.dart
+++ b/lib/screens/timer/components/timeline/widget_timeline_timer.dart
@@ -16,11 +16,7 @@ class TimerTimeline extends StatelessWidget {
   Widget build(BuildContext context) {
     return CustomPaint(
       painter: _TimelinePainter(
-        backgroundColor: ElevationOverlay.applySurfaceTint(
-          Theme.of(context).cardTheme.color!,
-          Theme.of(context).cardTheme.surfaceTintColor,
-          Theme.of(context).cardTheme.elevation!,
-        ),
+        backgroundColor: Theme.of(context).colorScheme.surface,
         progressColor: Theme.of(context).colorScheme.primary,
         progress: progress,
       ),
diff --git a/test/screens/timer/goldens/timer_screen.png b/test/screens/timer/goldens/timer_screen.png
index a1af354..c2e3b3f 100644
Binary files a/test/screens/timer/goldens/timer_screen.png and b/test/screens/timer/goldens/timer_screen.png differ
diff --git a/test/screens/timer/screen_timer_golden_test.dart b/test/screens/timer/screen_timer_golden_test.dart
index 985edf8..4209388 100644
--- a/test/screens/timer/screen_timer_golden_test.dart
+++ b/test/screens/timer/screen_timer_golden_test.dart
@@ -97,14 +97,12 @@ void main() {
             if (scenarioWidgetKey.toString().contains('Dark')) {
               await setTheme(tester, scenarioWidgetKey, ThemeType.dark);
             }
-            await toggleTimer(tester, scenarioWidgetKey);
-            late final skipTimerDuration = Duration(
-              milliseconds: (scenario.shutterSpeedValue.value * 0.35 * Duration.millisecondsPerSecond).toInt(),
-            );
-            await tester.pump(skipTimerDuration);
-            if (scenario.isStopped) {
+            if (!scenario.isStopped) {
               await toggleTimer(tester, scenarioWidgetKey);
-            } else {
+              late final skipTimerDuration = Duration(
+                milliseconds: (scenario.shutterSpeedValue.value * 0.35 * Duration.millisecondsPerSecond).toInt(),
+              );
+              await tester.pump(skipTimerDuration);
               await mockResumedState(tester, scenarioWidgetKey);
             }
           },