Rearrange general-top toolbar

Like the new mode toolbar