changed how extras are handled. They are now also toggled with the icon