Story 1714: Revert back to using VisualEditors toolbar buttons

Dependency: Ic9e4c5d12c3c75fcb195432c9155ec0a7eecac04

Change-Id: Ib3c94d19231b018a509b78269001223ad0568795
Merge "Story 1714: Revert back to using VisualEditors toolbar buttons"