CMS-2705 Content Manager - Fix content icon handling