fixed issue with empty icon path and NPE