Make start-tor-browser or Tor Browser the primary "dock" icon?

http://petsymposium.org/2012/papers/hotpets12-1-usability.pdf suggests that the Vidalia icon is rather confusing to users, especially when both it and Firefox are present, and the start-tor-browser script isn't dockable.

I see a few possibilities:

1. Make a Firefox Addon be the Tor controller, instead of Vidalia. Then, we can ship just Tor Browser with a Tor binary and Tor Browser would be the primary dock app.

2. Rig Vidalia and Tor Browser not to show up on the dock (how do you switch to their windows then?), and only allow start-tor-browser to be the dockable app.

3. Hide the Vidalia icon on the dock, and hack the Tor Browser binary to relaunch start-tor-browser if called directly.