3383631-button-ui-fix

Maria Fisherrequested to merge
issue/drupal-3383631:3383631-10.5.x into 10.5.x

Closes #3383631 for the 10.5.x branch.

Merge request reports