Yes, I agree. The whole concept of using a single sheet is always going to be messy. It is practical in some ways, but also kind of a pain to keep organized, and also annoying if we only intend to update certain icons.
On the Mac at least, the standard is that icons are always separate image or vector files, stored inside the app bundle - not one big icon sheet.