bug fixes and icon