Since we're using the same icon as rename we also updated the rename icon
Also in editing mode we now don't show sort and just have a Done button in the right corner

(closes #569)