Cleanup + track icon on insert.