You are right.
I didn't attempt to distinguish between trade dress and trade mark. It is difficult for a person studying IP to understand. I thought it would only confuse things.
But yes, you are right. And you explained it better than I would have.
The tests applied to meet the standard are distinctiveness, indication of origin and non-functionality. So for someone to claim elements of a design as protected trade dress, it cannot be a functional element of the design, and it must be a distinctive indicator of the origin of the product.
It's similar but not the same as trademark.