more or less completed move to icons