Small clean up in mixins - again.

I've cancelled old pull request because there were many changes after. So I created fresh one.

Nothing major. I just moved some styles from button-height mixin so it's not getting duplicated.