diff --git a/lib/ui/task/edit/task_edit_times.dart b/lib/ui/task/edit/task_edit_times.dart
index 97ef04150..93a732166 100644
--- a/lib/ui/task/edit/task_edit_times.dart
+++ b/lib/ui/task/edit/task_edit_times.dart
@@ -51,7 +51,8 @@ class _TaskEditTimesState extends State<TaskEditTimes> {
     final localization = AppLocalization.of(context);
     final viewModel = widget.viewModel;
     final task = viewModel.task;
-    final taskTime = viewModel.taskTimeIndex != null
+    final taskTime = viewModel.taskTimeIndex != null &&
+            task.taskTimes.length > viewModel.taskTimeIndex
         ? task.taskTimes[viewModel.taskTimeIndex]
         : null;
 
diff --git a/lib/ui/task/task_list_item.dart b/lib/ui/task/task_list_item.dart
index a45b6acd1..769cd3af9 100644
--- a/lib/ui/task/task_list_item.dart
+++ b/lib/ui/task/task_list_item.dart
@@ -172,8 +172,12 @@ class TaskListItem extends StatelessWidget {
                       )
                     : null,
                 trailing: IconButton(
-                  icon: Icon(getEntityActionIcon(
-                      task.isRunning ? EntityAction.stop : EntityAction.start)),
+                  icon: Icon(
+                    getEntityActionIcon(task.isRunning
+                        ? EntityAction.stop
+                        : EntityAction.start),
+                    color: task.isRunning ? state.accentColor : null,
+                  ),
                   onPressed: () => handleEntityAction(context, task,
                       task.isRunning ? EntityAction.stop : EntityAction.start),
                   visualDensity: VisualDensity.compact,