CMF-34: Scaling for complex diagram elements