Icon, selection tweaks