what worked for me is easy : i created a new folder, put all icons but trashcan in it, then drag-drop them one-by-one on the desktop & rebooted. now it (re)saves every changes.

hope it helps !