new icon and some fixes