add icon and minor changes