add icon and minor fix