Cleaning UI

I started the icon round up... but it went deeper than expected. Will be in a further commit