Fix a bug with icon remove