new icon + clean-up