more improvements and new icons