changing icons, fixing issues with null