change icons and other bugs