Ico support + cosmetics bugfix