Changed path, added no image handling and icon