new icon
fix possible NPE (Google, seriously, why do I need to do this?)
v1.6.4