IDEA-132462 Improve Button Labels
(cherry picked from commit b49defb)