Updated handling of workstation icons within cluster icons.