better job at merging the icons.. should all be there now.