Resolve icon toggle bug