That is not a fix it is a work around.
When you boot if you change display like docked and then bootup undocked the icon reset to a default layout.
I found that nview does it also and is most likely what is doing it during reboot.
If you setup desktop in nview each time you make any change it reset the desktop icons.
Maybe we can find a new version of nview that works