They still don't get created in time for adding to the toolbar
on startup, but now they have icons. Plus, references to tools
that have been removed have been removed.

(cherry picked from commit 378afe5b1af7ac55e96c08e30eb7945f209c59c1)