You could order them in folders so that when you're in the mood for icons you can c/p them onto your desktop.