cleanup + new icon