better icon logic, small various fixes