Icons and some cleanup