WeMo icon in Things not updating

I’m not sure when this started exactly, but somewhere along the lines of having to reinstall the WeMo bit, my WeMo devices no longer want to update their icon. Sort of. If I configure the device, I can see the icon I have selected, and if I click the icon in the Things list, while it is toggling, I can see the icon I selected briefly. But then it always returns to the default outlet icon. I have enough WeMo devices that this makes it difficult to tell which thing I want to click on since there are no names or anything either. Any ideas on how to fix this? Do I have to uninstall and reinstall it? Because having to recreate all my geofence rules and all my Hello states is getting a bit old.