null ptr fix

and icon change