Icon Picker updated, again