Fix editor switcher

* Use icon's the way we do icons everywhere else (don't have a separate
element in the button for the label)

Bug: 73057
Change-Id: I6177c113e4e0a82ace36ef88fa73520ca1415894
Merge "Fix editor switcher"