Rename icons and tidy code a little