Align icons a bit more nicely
reorder items