My workaround is to create a Shutdown script in gpedit.msc so that the two registries will be revised automatically in each shutdown (and hence all icons will be at right positions next boot). Steps...