cleanup and icons