Updated toolbar to use revised icons (two more to go).