sync up with svn trunk - icons are piling up locally :)