Fix undesired scrollbars in toolbars.
Merge pull request #1407 from Gozala/bug/toolbar-scroll

fix Bug 968814 - Fix undesired scrollbars in toolbars. r=@ZER0