Thank you for reporting this issue, it has now been resolved. We are aiming to include any changes that have been made in a future XF release (2.2.0 Beta 6).
Change log:
Improve button width calculation to prevent more toolbar buttons from wrapping unexpectedly.