move click handler to button. when on the icon it wasn't triggered in firefox

Closes #35164

See merge request !12905