Some more clean-up. New icon.