Fix handling of icons.  Generate GUIDs.