New icon + window fix