icon bug fix + touch bug fix