Collapsible: fix the bug about collapsedIcon

Closes gh-6708
Collapsible: Handle icon-related option setting uniformly