Issue #23261: Fixed problem with ontap originator not being icon-button