Change some icons and fix the visualisation sorting