After you have completed your upgrade
Restore your system settings.
Restore your Desktop objects, being sure to select
Skip if Exists
.
Save all the objects on your desktop.