expand-icon options

Which should we use?