revert unrelated changes in previous commit
Button and ToolButton were't supposed to be touched by previous commit