Created attachment 622496[details][diff][review]
patch
Removed the "small" selectors and gave the small rules to the normal definitions. I've also removed the workaround for bug 562608 because this doesn't apply. The buttons have no .button-box to make the selectors working.