Styling of button bar on small screens

On small screens, or when there are too many buttons on a button bar in a display form, buttons are wrapped over multiple lines resulting in some ugly styling.

As a workaround, I now set the button bar's orientation to 'vertical' if a small screen is detected, but this isn't ideal.

Could the styling of buttons be improved?