Simplifies the species picking
Adds an update_icons() to minimize the effects of #4252, but it's still a problem