icons, some fixes