add icon; improve name