Hmm. I like the idea of clicking on the icon to change it. I'm not sure how we can make it obvious, though. But then the current system isn't explicit either.
Would it be possible (and useful) to have 'browse' change to 'change icon' if the mood isn't a pre-defined one? I have no idea whether this kind of detection is possible (and hard to implement).