Update to use new CountableIconItem