Cancel icon and tooltip now reappear on rerun