Better, simpler SmartFolder icon handling