Thanks Anca! That's also an issue we stumbled upon when discussing this PR with a proposed solution for XWIKI-21584.

I agree with your opinion, we now have variables for this at the skin level, so they should be used in all places where we could expect them to be used.