Change icon and fix some small things