icon and more minor changes