Issue #2285467 by neardark: Theming - Button issues.
Merge branch '7.x-2.x' of github.com:cyberswat/dcco into 7.x-2.x