Better fix for #6453 because icon-only buttons were getting width auto.