icons and minor bug fixes