Improved support for rendering of icons for actions, and for dealing
with encoded collection names.