The hack to exclude them from dialog button styling needed updating fior the new class names
TooltipTarget
Tooltip
$spacing-