Fixes #1803. Made sure .expand doesn't override padding on button size classes