cleanup and new icons