More re-ordering.
The editor will be post-7.0. Removing unused icons.