new icons, cleanup etc.