Collapsible: fix the bug about collapsedIcon

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

Closes gh-7081