Collapsible: Handle icon-related option setting uniformly

Fixes gh-6708