Add an icon to the collapsible areas of the flexible theme (see #6958)