Merge "Remove failed icon bindings on subsequent success" into main