Clean up in preparation for presentation, add icon