Bug 1036368 - Javascript errors when icons are removed while they are be...

...ing decorated