Collapsible: Handle icon-related option setting uniformly

This adds tests for <commitid>

Closes gh-7081