Fixed icon change bug