Fix: button_padding
when using image+text buttons
#2510
Merged
button_padding
when using image+text buttons
#2510