Start firefox.exe directly after install (the wrapper program is gone).
Create a shortcut at the top named "Start Tor Browser".