o Reorder tray icons according new design. Closes #2919.