Improve list icon selector