Cleanup and icon for C++ download x2