I prefer the approach in PR #6227 since it more closely aligns with how the other buttons' corners are handled