Better icons
Better icons and a bugfix