Minor bug fixes and new icon