Merge "Fix bug where folder with 1 icon can exist" into main