PaceIconAndImage

[Antone Roundy]

+1 if <image> is changed to <logo> or, even better, if <image> is 
allowed in <entry>.  I don't care whether <icon> is allowed in entry, 
though I see no reason not to allow it.