Fix Move Machine + New icons