IDEA-132462 Improve Button Labels