Attempt at fix of remote icon moving bug