[Bug 7905] Tool bar icons not all filled in with switcher cad III