Change editor switcher to cog icon and move to right side

Also add a drop-down indicator and a line next to the close button.

Change-Id: I938b7fe673ef68378529711848c0931262fbf352
Merge "Change editor switcher to cog icon and move to right side"