icon manager + some fix and opt