clean-up and icons