Cancel desktop folder enumeration on reload

Closes #320 (closed)

This also cleans up a bit of the icon management code in the model, and fixes an issue with volume icon removal.