changed icons and fixed #24