Merge "Fix default icon" into main