CMS-1275 Make Icon class immutable