Fixing icon issues