Merge "Update button strings for new design" into main