ORG-1129: Reorder size and add XXL