icon and minor fixes