s/shape/icon; icon names from core-icons; more icons
Remove -moz, -ms, and -o prefixes