Maybe fixed the icon issues