Performance increase for replacing icons

Instead of modifying the return value we now generate the return value
ourself and don't allow execution of the method.
A1.7.1 Build 1
Update to A1.7.1 Build 1