Organizing graphics, icons and photos

I'm a UX developer and have 1000s of icons, ui designs and ui parts and the like and would like to better organize them. Currently I have them in well marked folders such as:

icons-currency icons-globes

ui-forms ui-navigation-tabs ui-scrollbars

I'm not happy with this method and am leaning more towards tagging individual graphics as opposed to putting into different directories. I think tagging will allow me to more easily "cross-pollinate" different ideas (meaning that I things won't be so rigidly separated).

In case it matters I work with Windows (as I suppose you got from my use of directories instead of folders).

I've looked at Adobe Bridge and it seems close to what I'm thinking about. Ideally I would like to be able to work on an icon or idea and keep it in the project working directory and tag it so I can find it easily later.

How do you keep your 1000s of icons, completed projects and ideas organized?