Fix icon disappearing issue