bug fix & new icon