Just to let you know that after trying a few more things I attempted a "Repair Install of Windows 10 with an ISO file". I created an ISO file using MediaCreationTool on the HDD and repaired Windows 10. And, lo and behold, all my icons reappeared.
I must admit I was a bit wary of losing some settings but things went smoothly although the whole process took about 3 hours.