VE-1705: Toolbar fixes
Merge pull request #5632 from Wikia/VE-1705

VE-1705: Toolbar fixes