Icon spacing and margins grow too large when app names are shown

With app names turned on, the minimum icon spacing and edge margin settings no longer tighten the grid: icons end up far apart with large margins. It's most visible inside subfolders. With app names off, the same settings work as expected.

We're reworking the label layout so spacing and margins behave the same either way.