Use a variable to set control-label padding

Fixes #8988