update icon and current active task.
resolved conflicts.