diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 81cc8514aa70e23605867c8369646e4d16d647cf..1fab6f1e786c90e6b737fab7e8357d2ee9381471 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -134,7 +134,7 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED
                   bdw-gc #boehm-demers-weiser gc
                   lcms2)
 
-# remove this line and uncomment the doiuble-conversion above when double-conversion.pc file gets shipped on all platforms we support
+# remove this line and uncomment the double-conversion above when double-conversion.pc file gets shipped on all platforms we support
 find_package(DoubleConversion REQUIRED)  # lib2geom dependency
 
 sanitize_ldflags_for_libs(INKSCAPE_DEP_LDFLAGS)
@@ -142,6 +142,7 @@ list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS})
 list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS})
 
 add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER})
+add_compile_definitions(HAVE_GSL) # used by lib2geom headers
 
 if(WITH_JEMALLOC)
     find_package(JeMalloc)
diff --git a/po/POTFILES.src.in b/po/POTFILES.src.in
index 50e24abeea2267c9b6e920ab529e0c21d0ca2187..7d480f4d01693f9381526e0851b98eb77141d38a 100644
--- a/po/POTFILES.src.in
+++ b/po/POTFILES.src.in
@@ -338,7 +338,9 @@ ${_build_dir}/share/templates/templates.h
 ../src/ui/modifiers.cpp
 ../src/ui/shape-editor-knotholders.cpp
 ../src/ui/shortcuts.cpp
+../src/ui/tool/bezier-curve-handler.cpp
 ../src/ui/tool/curve-drag-point.cpp
+../src/ui/tool/elliptical-arc-handler.cpp
 ../src/ui/tool/multi-path-manipulator.cpp
 ../src/ui/tool/node.cpp
 ../src/ui/tool/path-manipulator.cpp
diff --git a/share/icons/Dash/symbolic/actions/node-segment-arc-symbolic.svg b/share/icons/Dash/symbolic/actions/node-segment-arc-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f09fed134cef6a372c1f2827196eb2531ac7f371
--- /dev/null
+++ b/share/icons/Dash/symbolic/actions/node-segment-arc-symbolic.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="node-segment-elipse-symbolic.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.83297817,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.1699194,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="arc"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="8"
+     inkscape:cx="-33.375"
+     inkscape:cy="6.125"
+     inkscape:window-width="1854"
+     inkscape:window-height="1177"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="node-segment-line"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="true" />
+  </sodipodi:namedview>
+  <g
+     transform="translate(-709,-558.36218)"
+     inkscape:label="00206"
+     id="node-segment-line">
+    <path
+       inkscape:connector-curvature="0"
+       id="rect16911"
+       d="m 709,558.36218 h 16 v 16 h -16 z"
+       style="opacity:0;fill:none" />
+    <use
+       xlink:href="#rect4374"
+       height="1250"
+       width="1250"
+       id="use16913"
+       y="0"
+       x="0"
+       transform="matrix(1,0,0,0.8000004,266,113.8722)" />
+    <use
+       xlink:href="#rect4374"
+       height="1250"
+       width="1250"
+       id="use16915"
+       y="0"
+       x="0"
+       transform="matrix(1,0,0,0.7999999,276,103.8725)" />
+    <path
+       d="m 717.06055,561.66296 c -2.47936,0 -4.5,2.02064 -4.5,4.5 0,2.10307 1.45375,3.8755 3.4082,4.36524 l -2,2.01562 0.70898,0.70508 2.56836,-2.58985 0.73587,-0.74238 a 0.20054868,0.20054868 58.380993 0 0 -0.20134,-0.32702 c -0.23223,0.0481 -0.47305,0.0733 -0.72007,0.0733 -0.0771,0 -0.15273,-0.003 -0.22852,-0.008 -1.83122,-0.11736 -3.27148,-1.63033 -3.27148,-3.49219 0,-1.93892 1.56108,-3.5 3.5,-3.5 1.85198,0 3.35879,1.42484 3.49023,3.24219 0.006,0.0853 0.01,0.17088 0.01,0.25781 0,0.12143 -0.006,0.24136 -0.018,0.35951 a 0.31421967,0.31421967 29.532555 0 0 0.51545,0.29201 l 0.49867,-0.50308 2.27539,-2.29492 -0.71094,-0.70313 -1.70507,1.71875 c -0.50334,-1.93487 -2.26633,-3.36914 -4.35547,-3.36914 z"
+       style="opacity:1"
+       id="path3"
+       inkscape:path-effect="#path-effect3"
+       inkscape:original-d="m 717.06055,561.66296 c -2.47936,0 -4.5,2.02064 -4.5,4.5 0,2.10307 1.45375,3.8755 3.4082,4.36524 l -2,2.01562 0.70898,0.70508 2.56836,-2.58985 1.32227,-1.33398 c -0.45624,0.2171 -0.96717,0.33789 -1.50781,0.33789 -0.0771,0 -0.15273,-0.003 -0.22852,-0.008 -1.83122,-0.11736 -3.27148,-1.63033 -3.27148,-3.49219 0,-1.93892 1.56108,-3.5 3.5,-3.5 1.85198,0 3.35879,1.42484 3.49023,3.24219 0.006,0.0853 0.01,0.17088 0.01,0.25781 0,0.53065 -0.11657,1.03263 -0.32618,1.48242 l 1.32227,-1.33398 2.27539,-2.29492 -0.71094,-0.70313 -1.70507,1.71875 c -0.50334,-1.93487 -2.26633,-3.36914 -4.35547,-3.36914 z"
+       transform="translate(-0.79549513,-0.88388348)" />
+  </g>
+</svg>
diff --git a/share/icons/Dash/symbolic/actions/node-type-elliptical-symbolic.svg b/share/icons/Dash/symbolic/actions/node-type-elliptical-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..93abaad1e2ef6c9dccfbe20be5fa580b0e5e5bd2
--- /dev/null
+++ b/share/icons/Dash/symbolic/actions/node-type-elliptical-symbolic.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="node-type-elipse-control-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <style
+     id="s0">
+   .success { fill: #009909; }
+   .warning { fill: #FF1990; }
+   .error   { fill: #00AAFF; }
+  </style>
+  <style
+     id="s2">
+     @import '../../highlights.css'; 
+  </style>
+  <metadata
+     id="metadata2052">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2050" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:current-layer="node-type-auto-smooth"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="1912"
+     inkscape:window-height="1177"
+     inkscape:window-width="1854"
+     inkscape:cy="1.9781986"
+     inkscape:cx="-6.0907694"
+     inkscape:zoom="19.209396"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       id="grid"
+       type="xygrid"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px" />
+  </sodipodi:namedview>
+  <g
+     inkscape:label="00204"
+     id="node-type-auto-smooth"
+     transform="matrix(0.998641,0,0,1,-648.09632,-558.36218)">
+    <path
+       style="opacity:0;fill:none"
+       d="m 649,558.36218 h 16 v 16 h -16 z"
+       id="rect16805"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path16803"
+       style="opacity:1;stroke-width:0.999997"
+       d="m 661.99597,559.35111 c 0,2.01107 -0.8663,6.01107 -5.0068,6.01107 -4.1405,0 -5.00681,-4 -5.00681,-6 h -3.00408 v 1 h 2.00272 c 0,2 1.52055,6.12884 6.00817,6.12884 4.48762,0 6.00816,-4.12884 6.00816,-6.12884 l 2.00273,-0.021 v -0.97898 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="czcccczcccc" />
+    <path
+       class="warning"
+       style="opacity:1;stroke-width:1.5"
+       d="m 660,571.38156 a 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 z"
+       id="path16809"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/node-segment-arc-symbolic.svg b/share/icons/hicolor/symbolic/actions/node-segment-arc-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f09fed134cef6a372c1f2827196eb2531ac7f371
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/node-segment-arc-symbolic.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="node-segment-elipse-symbolic.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.83297817,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.1699194,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="arc"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="8"
+     inkscape:cx="-33.375"
+     inkscape:cy="6.125"
+     inkscape:window-width="1854"
+     inkscape:window-height="1177"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="node-segment-line"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="true" />
+  </sodipodi:namedview>
+  <g
+     transform="translate(-709,-558.36218)"
+     inkscape:label="00206"
+     id="node-segment-line">
+    <path
+       inkscape:connector-curvature="0"
+       id="rect16911"
+       d="m 709,558.36218 h 16 v 16 h -16 z"
+       style="opacity:0;fill:none" />
+    <use
+       xlink:href="#rect4374"
+       height="1250"
+       width="1250"
+       id="use16913"
+       y="0"
+       x="0"
+       transform="matrix(1,0,0,0.8000004,266,113.8722)" />
+    <use
+       xlink:href="#rect4374"
+       height="1250"
+       width="1250"
+       id="use16915"
+       y="0"
+       x="0"
+       transform="matrix(1,0,0,0.7999999,276,103.8725)" />
+    <path
+       d="m 717.06055,561.66296 c -2.47936,0 -4.5,2.02064 -4.5,4.5 0,2.10307 1.45375,3.8755 3.4082,4.36524 l -2,2.01562 0.70898,0.70508 2.56836,-2.58985 0.73587,-0.74238 a 0.20054868,0.20054868 58.380993 0 0 -0.20134,-0.32702 c -0.23223,0.0481 -0.47305,0.0733 -0.72007,0.0733 -0.0771,0 -0.15273,-0.003 -0.22852,-0.008 -1.83122,-0.11736 -3.27148,-1.63033 -3.27148,-3.49219 0,-1.93892 1.56108,-3.5 3.5,-3.5 1.85198,0 3.35879,1.42484 3.49023,3.24219 0.006,0.0853 0.01,0.17088 0.01,0.25781 0,0.12143 -0.006,0.24136 -0.018,0.35951 a 0.31421967,0.31421967 29.532555 0 0 0.51545,0.29201 l 0.49867,-0.50308 2.27539,-2.29492 -0.71094,-0.70313 -1.70507,1.71875 c -0.50334,-1.93487 -2.26633,-3.36914 -4.35547,-3.36914 z"
+       style="opacity:1"
+       id="path3"
+       inkscape:path-effect="#path-effect3"
+       inkscape:original-d="m 717.06055,561.66296 c -2.47936,0 -4.5,2.02064 -4.5,4.5 0,2.10307 1.45375,3.8755 3.4082,4.36524 l -2,2.01562 0.70898,0.70508 2.56836,-2.58985 1.32227,-1.33398 c -0.45624,0.2171 -0.96717,0.33789 -1.50781,0.33789 -0.0771,0 -0.15273,-0.003 -0.22852,-0.008 -1.83122,-0.11736 -3.27148,-1.63033 -3.27148,-3.49219 0,-1.93892 1.56108,-3.5 3.5,-3.5 1.85198,0 3.35879,1.42484 3.49023,3.24219 0.006,0.0853 0.01,0.17088 0.01,0.25781 0,0.53065 -0.11657,1.03263 -0.32618,1.48242 l 1.32227,-1.33398 2.27539,-2.29492 -0.71094,-0.70313 -1.70507,1.71875 c -0.50334,-1.93487 -2.26633,-3.36914 -4.35547,-3.36914 z"
+       transform="translate(-0.79549513,-0.88388348)" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/node-type-elliptical-symbolic.svg b/share/icons/hicolor/symbolic/actions/node-type-elliptical-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..93abaad1e2ef6c9dccfbe20be5fa580b0e5e5bd2
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/node-type-elliptical-symbolic.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="node-type-elipse-control-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <style
+     id="s0">
+   .success { fill: #009909; }
+   .warning { fill: #FF1990; }
+   .error   { fill: #00AAFF; }
+  </style>
+  <style
+     id="s2">
+     @import '../../highlights.css'; 
+  </style>
+  <metadata
+     id="metadata2052">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2050" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:current-layer="node-type-auto-smooth"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="1912"
+     inkscape:window-height="1177"
+     inkscape:window-width="1854"
+     inkscape:cy="1.9781986"
+     inkscape:cx="-6.0907694"
+     inkscape:zoom="19.209396"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       id="grid"
+       type="xygrid"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px" />
+  </sodipodi:namedview>
+  <g
+     inkscape:label="00204"
+     id="node-type-auto-smooth"
+     transform="matrix(0.998641,0,0,1,-648.09632,-558.36218)">
+    <path
+       style="opacity:0;fill:none"
+       d="m 649,558.36218 h 16 v 16 h -16 z"
+       id="rect16805"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path16803"
+       style="opacity:1;stroke-width:0.999997"
+       d="m 661.99597,559.35111 c 0,2.01107 -0.8663,6.01107 -5.0068,6.01107 -4.1405,0 -5.00681,-4 -5.00681,-6 h -3.00408 v 1 h 2.00272 c 0,2 1.52055,6.12884 6.00817,6.12884 4.48762,0 6.00816,-4.12884 6.00816,-6.12884 l 2.00273,-0.021 v -0.97898 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="czcccczcccc" />
+    <path
+       class="warning"
+       style="opacity:1;stroke-width:1.5"
+       d="m 660,571.38156 a 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 z"
+       id="path16809"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/share/icons/multicolor/symbolic/actions/node-segment-arc-symbolic.svg b/share/icons/multicolor/symbolic/actions/node-segment-arc-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f09fed134cef6a372c1f2827196eb2531ac7f371
--- /dev/null
+++ b/share/icons/multicolor/symbolic/actions/node-segment-arc-symbolic.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="node-segment-elipse-symbolic.svg"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.83297817,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.1699194,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="arc"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="8"
+     inkscape:cx="-33.375"
+     inkscape:cy="6.125"
+     inkscape:window-width="1854"
+     inkscape:window-height="1177"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="node-segment-line"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="true" />
+  </sodipodi:namedview>
+  <g
+     transform="translate(-709,-558.36218)"
+     inkscape:label="00206"
+     id="node-segment-line">
+    <path
+       inkscape:connector-curvature="0"
+       id="rect16911"
+       d="m 709,558.36218 h 16 v 16 h -16 z"
+       style="opacity:0;fill:none" />
+    <use
+       xlink:href="#rect4374"
+       height="1250"
+       width="1250"
+       id="use16913"
+       y="0"
+       x="0"
+       transform="matrix(1,0,0,0.8000004,266,113.8722)" />
+    <use
+       xlink:href="#rect4374"
+       height="1250"
+       width="1250"
+       id="use16915"
+       y="0"
+       x="0"
+       transform="matrix(1,0,0,0.7999999,276,103.8725)" />
+    <path
+       d="m 717.06055,561.66296 c -2.47936,0 -4.5,2.02064 -4.5,4.5 0,2.10307 1.45375,3.8755 3.4082,4.36524 l -2,2.01562 0.70898,0.70508 2.56836,-2.58985 0.73587,-0.74238 a 0.20054868,0.20054868 58.380993 0 0 -0.20134,-0.32702 c -0.23223,0.0481 -0.47305,0.0733 -0.72007,0.0733 -0.0771,0 -0.15273,-0.003 -0.22852,-0.008 -1.83122,-0.11736 -3.27148,-1.63033 -3.27148,-3.49219 0,-1.93892 1.56108,-3.5 3.5,-3.5 1.85198,0 3.35879,1.42484 3.49023,3.24219 0.006,0.0853 0.01,0.17088 0.01,0.25781 0,0.12143 -0.006,0.24136 -0.018,0.35951 a 0.31421967,0.31421967 29.532555 0 0 0.51545,0.29201 l 0.49867,-0.50308 2.27539,-2.29492 -0.71094,-0.70313 -1.70507,1.71875 c -0.50334,-1.93487 -2.26633,-3.36914 -4.35547,-3.36914 z"
+       style="opacity:1"
+       id="path3"
+       inkscape:path-effect="#path-effect3"
+       inkscape:original-d="m 717.06055,561.66296 c -2.47936,0 -4.5,2.02064 -4.5,4.5 0,2.10307 1.45375,3.8755 3.4082,4.36524 l -2,2.01562 0.70898,0.70508 2.56836,-2.58985 1.32227,-1.33398 c -0.45624,0.2171 -0.96717,0.33789 -1.50781,0.33789 -0.0771,0 -0.15273,-0.003 -0.22852,-0.008 -1.83122,-0.11736 -3.27148,-1.63033 -3.27148,-3.49219 0,-1.93892 1.56108,-3.5 3.5,-3.5 1.85198,0 3.35879,1.42484 3.49023,3.24219 0.006,0.0853 0.01,0.17088 0.01,0.25781 0,0.53065 -0.11657,1.03263 -0.32618,1.48242 l 1.32227,-1.33398 2.27539,-2.29492 -0.71094,-0.70313 -1.70507,1.71875 c -0.50334,-1.93487 -2.26633,-3.36914 -4.35547,-3.36914 z"
+       transform="translate(-0.79549513,-0.88388348)" />
+  </g>
+</svg>
diff --git a/share/icons/multicolor/symbolic/actions/node-type-elliptical-symbolic.svg b/share/icons/multicolor/symbolic/actions/node-type-elliptical-symbolic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..93abaad1e2ef6c9dccfbe20be5fa580b0e5e5bd2
--- /dev/null
+++ b/share/icons/multicolor/symbolic/actions/node-type-elliptical-symbolic.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="node-type-elipse-control-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <style
+     id="s0">
+   .success { fill: #009909; }
+   .warning { fill: #FF1990; }
+   .error   { fill: #00AAFF; }
+  </style>
+  <style
+     id="s2">
+     @import '../../highlights.css'; 
+  </style>
+  <metadata
+     id="metadata2052">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2050" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:current-layer="node-type-auto-smooth"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="1912"
+     inkscape:window-height="1177"
+     inkscape:window-width="1854"
+     inkscape:cy="1.9781986"
+     inkscape:cx="-6.0907694"
+     inkscape:zoom="19.209396"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       id="grid"
+       type="xygrid"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px" />
+  </sodipodi:namedview>
+  <g
+     inkscape:label="00204"
+     id="node-type-auto-smooth"
+     transform="matrix(0.998641,0,0,1,-648.09632,-558.36218)">
+    <path
+       style="opacity:0;fill:none"
+       d="m 649,558.36218 h 16 v 16 h -16 z"
+       id="rect16805"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path16803"
+       style="opacity:1;stroke-width:0.999997"
+       d="m 661.99597,559.35111 c 0,2.01107 -0.8663,6.01107 -5.0068,6.01107 -4.1405,0 -5.00681,-4 -5.00681,-6 h -3.00408 v 1 h 2.00272 c 0,2 1.52055,6.12884 6.00817,6.12884 4.48762,0 6.00816,-4.12884 6.00816,-6.12884 l 2.00273,-0.021 v -0.97898 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="czcccczcccc" />
+    <path
+       class="warning"
+       style="opacity:1;stroke-width:1.5"
+       d="m 660,571.38156 a 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 z"
+       id="path16809"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/share/themes b/share/themes
index 0a8234085a2f55aabd02a0afb60c035823ef46a5..2fc6ece138323f905c9b475c3bcdef0d007eb233 160000
--- a/share/themes
+++ b/share/themes
@@ -1 +1 @@
-Subproject commit 0a8234085a2f55aabd02a0afb60c035823ef46a5
+Subproject commit 2fc6ece138323f905c9b475c3bcdef0d007eb233
diff --git a/share/ui/toolbar-node.ui b/share/ui/toolbar-node.ui
index f48308e3403a37564f19de6909744d10743f2105..1503054cc65f2619418d408b2a808951a61a7e2d 100644
--- a/share/ui/toolbar-node.ui
+++ b/share/ui/toolbar-node.ui
@@ -232,6 +232,22 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="GtkButton" id="elliptical_btn">
+        <property name="valign">center</property>
+        <property name="focusable">True</property>
+        <property name="tooltip-text" translatable="yes">Make selected nodes arc handles</property>
+        <property name="has-frame">False</property>
+        <style>
+            <class name="priority2"/>
+        </style>
+        <child>
+          <object class="GtkImage" id="image9.5">
+            <property name="icon-name">node-type-elliptical</property>
+          </object>
+        </child>
+      </object>
+    </child>
     <child>
       <object class="GtkSeparator">
         <style>
@@ -271,6 +287,22 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="GtkButton" id="arc_btn">
+        <property name="valign">center</property>
+        <property name="focusable">True</property>
+        <property name="tooltip-text" translatable="yes">Create arcs</property>
+        <property name="has-frame">False</property>
+        <style>
+            <class name="priority2"/>
+        </style>
+        <child>
+          <object class="GtkImage" id="image11.5">
+            <property name="icon-name">node-segment-arc</property>
+          </object>
+        </child>
+      </object>
+    </child>
     <child>
       <object class="GtkSeparator">
         <style>
diff --git a/src/3rdparty/2geom b/src/3rdparty/2geom
index 5957e3234b40da48d50bc5f90160541e129d5f08..dc53664856d10bdfcf4a5b0a18ebdd0e07fddd08 160000
--- a/src/3rdparty/2geom
+++ b/src/3rdparty/2geom
@@ -1 +1 @@
-Subproject commit 5957e3234b40da48d50bc5f90160541e129d5f08
+Subproject commit dc53664856d10bdfcf4a5b0a18ebdd0e07fddd08
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index cbd8158cd8f33307c38f1647a664403cb08f61ab..652a2841d33b0fe3747d19f9c04a51b9c15c1de2 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -15,32 +15,29 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include <cstring>
-#include <string>
+#include "path-chemistry.h"
+
 #include <boost/range/adaptor/reversed.hpp>
+#include <cstring>
 #include <glibmm/i18n.h>
+#include <string>
 
 #include "desktop.h"
+#include "display/curve.h"
 #include "document-undo.h"
 #include "document.h"
 #include "message-stack.h"
-#include "path-chemistry.h"
-#include "text-editing.h"
-
-#include "display/curve.h"
-
 #include "object/box3d.h"
 #include "object/object-set.h"
+#include "object/sp-ellipse.h"
 #include "object/sp-flowtext.h"
 #include "object/sp-path.h"
 #include "object/sp-root.h"
 #include "object/sp-text.h"
 #include "style.h"
-
-#include "ui/icon-names.h"
-
 #include "svg/svg.h"
-
+#include "text-editing.h"
+#include "ui/icon-names.h"
 #include "xml/repr.h"
 
 using Inkscape::DocumentUndo;
@@ -632,6 +629,11 @@ sp_selected_item_to_curved_repr(SPItem *item, guint32 /*text_grouping_policy*/)
     /* Transformation */
     repr->setAttribute("transform", item->getRepr()->attribute("transform"));
 
+    /* Manually specify symmetric nodes on an ellipse to preserve the historical look and feel in Node Tool */
+    if (is<SPGenericEllipse>(item)) {
+        repr->setAttribute("sodipodi:nodetypes", "sssss");
+    }
+
     /* Style */
     Glib::ustring style_str =
         item->style->writeIfDiff(item->parent ? item->parent->style : nullptr); // TODO investigate possibility
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index bb6c07e2901119c3d1271f6f67b3ea05f0a5a549..4e42f17f40f325659f330e1679611922f86cedbe 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -36,25 +36,33 @@ set(ui_SRC
 	knot/knot-holder-entity.cpp
 	knot/knot-ptr.cpp
 
+	tool/bezier-curve-handler.cpp
 	tool/control-point-selection.cpp
 	tool/control-point.cpp
 	tool/curve-drag-point.cpp
+	tool/elliptical-arc-end-node.cpp
+	tool/elliptical-arc-handler.cpp
+	tool/elliptical-manipulator.cpp
 	tool/modifier-tracker.cpp
 	tool/multi-path-manipulator.cpp
+	tool/node-factory.cpp
 	tool/node.cpp
 	tool/path-manipulator.cpp
+	tool/remove-elliptical-arcs.cpp
 	tool/selectable-control-point.cpp
 	tool/transform-handle-set.cpp
 
 	toolbar/arc-toolbar.cpp
+	toolbar/booleans-toolbar.cpp
 	toolbar/box3d-toolbar.cpp
 	toolbar/calligraphy-toolbar.cpp
+	toolbar/command-toolbar.cpp
 	toolbar/connector-toolbar.cpp
 	toolbar/dropper-toolbar.cpp
-	toolbar/marker-toolbar.cpp
 	toolbar/eraser-toolbar.cpp
 	toolbar/gradient-toolbar.cpp
 	toolbar/lpe-toolbar.cpp
+	toolbar/marker-toolbar.cpp
 	toolbar/measure-toolbar.cpp
 	toolbar/mesh-toolbar.cpp
 	toolbar/node-toolbar.cpp
@@ -64,20 +72,17 @@ set(ui_SRC
 	toolbar/pencil-toolbar.cpp
 	toolbar/rect-toolbar.cpp
 	toolbar/select-toolbar.cpp
-	toolbar/booleans-toolbar.cpp
+	toolbar/snap-toolbar.cpp
 	toolbar/spiral-toolbar.cpp
 	toolbar/spray-toolbar.cpp
 	toolbar/star-toolbar.cpp
 	toolbar/text-toolbar.cpp
+	toolbar/tool-toolbar.cpp
 	toolbar/toolbar.cpp
+	toolbar/toolbars.cpp
 	toolbar/tweak-toolbar.cpp
 	toolbar/zoom-toolbar.cpp
 
-	toolbar/command-toolbar.cpp
-	toolbar/tool-toolbar.cpp
-	toolbar/snap-toolbar.cpp
-	toolbar/toolbars.cpp
-
 	tools/arc-tool.cpp
 	tools/box3d-tool.cpp
 	tools/calligraphic-tool.cpp
@@ -142,7 +147,7 @@ set(ui_SRC
 	dialog/font-collections-manager.cpp
 	dialog/font-substitution.cpp
 	dialog/global-palettes.cpp
-    dialog/glyphs.cpp
+	dialog/glyphs.cpp
 	dialog/grid-arrange-tab.cpp
 	dialog/guides.cpp
 	dialog/icon-preview.cpp
@@ -312,7 +317,7 @@ set(ui_SRC
 	pack.h
 	popup-menu.h
 	shape-editor.h
-        shape-editor-knotholders.h
+	shape-editor-knotholders.h
 	simple-pref-pusher.h
 	shortcuts.h
 	svg-renderer.h
@@ -399,16 +404,23 @@ set(ui_SRC
 	knot/knot-holder-entity.h
 	knot/knot-ptr.h
 
+	tool/bezier-curve-handler.h
 	tool/commit-events.h
 	tool/control-point-selection.h
 	tool/control-point.h
 	tool/curve-drag-point.h
+	tool/curve-event-handler.h
+	tool/elliptical-arc-end-node.h
+	tool/elliptical-arc-handler.h
+	tool/elliptical-manipulator.h
 	tool/manipulator.h
 	tool/modifier-tracker.h
 	tool/multi-path-manipulator.h
+	tool/node-factory.h
 	tool/node-types.h
 	tool/node.h
 	tool/path-manipulator.h
+	tool/remove-elliptical-arcs.h
 	tool/selectable-control-point.h
 	tool/shape-record.h
 	tool/transform-handle-set.h
diff --git a/src/ui/tool/bezier-curve-handler.cpp b/src/ui/tool/bezier-curve-handler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5cb647f7125903cd9d8eae9838505d527e0af4ed
--- /dev/null
+++ b/src/ui/tool/bezier-curve-handler.cpp
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* Authors:
+ *   Krzysztof Kosiński <tweenk.pl@gmail.com>
+ *   Jon A. Cruz <jon@joncruz.org>
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2009-2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "ui/tool/bezier-curve-handler.h"
+
+#include <2geom/math-utils.h>
+#include <glib/gi18n.h>
+
+#include "ui/tool/control-point.h"
+#include "ui/tool/node.h"
+#include "ui/widget/events/canvas-event.h"
+
+namespace {
+
+/** Compute the "weight" describing how the influence of the drag should be distributed
+ *  between the handles; 0 = front handle only, 1 = back handle only.
+ */
+double compute_bezier_drag_weight_for_time(double t)
+{
+    if (t <= 1.0 / 6.0) {
+        return 0.0;
+    }
+    if (t <= 0.5) {
+        return Geom::cube((6 * t - 1) / 2.0) / 2;
+    }
+    if (t <= 5.0 / 6.0) {
+        return (1 - Geom::cube((6 * (1 - t) - 1) / 2.0)) / 2 + 0.5;
+    }
+    return 1.0;
+}
+} // namespace
+
+namespace Inkscape::UI {
+
+bool BezierCurveHandler::pointGrabbed(NodeList::iterator curve_start, NodeList::iterator curve_end)
+{
+    // move the handles to 1/3 the length of the segment for line segments
+    auto *initial_handle = curve_start->front();
+    auto *final_handle = curve_end->back();
+
+    if (initial_handle->isDegenerate() && final_handle->isDegenerate()) {
+        _segment_degenerate_at_drag_start = true;
+
+        // delta is a vector equal 1/3 of the way between endpoint nodes
+        Geom::Point const delta = (curve_end->position() - curve_start->position()) / 3.0;
+
+        if (!_is_bspline) {
+            initial_handle->move(initial_handle->position() + delta);
+            final_handle->move(final_handle->position() - delta);
+            return true;
+        }
+        return false;
+    }
+
+    _segment_degenerate_at_drag_start = false;
+    return false;
+}
+
+bool BezierCurveHandler::pointDragged(NodeList::iterator curve_start, NodeList::iterator curve_end, double curve_time,
+                                      Geom::Point const &drag_origin, Geom::Point const &drag_destination,
+                                      MotionEvent const &event)
+{
+    // special cancel handling - retract handles when if the segment was degenerate
+    if (ControlPoint::is_drag_cancelled(event) && _segment_degenerate_at_drag_start) {
+        curve_start->front()->retract();
+        curve_end->back()->retract();
+        return true;
+    }
+
+    double const &t = curve_time;
+    double const weight = compute_bezier_drag_weight_for_time(t);
+    auto const delta = drag_destination - drag_origin;
+
+    auto *initial_handle = curve_start->front();
+    auto *final_handle = curve_end->back();
+
+    // Magic Bezier Drag Equations follow!
+    if (!_is_bspline) {
+        auto const offset0 = ((1 - weight) / (3 * t * (1 - t) * (1 - t))) * delta;
+        auto const offset1 = (weight / (3 * t * t * (1 - t))) * delta;
+
+        initial_handle->move(initial_handle->position() + offset0);
+        final_handle->move(final_handle->position() + offset1);
+        return true;
+    }
+
+    if (weight >= 0.8) {
+        if (held_shift(event)) {
+            final_handle->move(drag_destination);
+        } else {
+            curve_end->move(curve_end->position() + delta);
+        }
+    } else if (weight <= 0.2) {
+        if (held_shift(event)) {
+            initial_handle->move(drag_destination);
+        } else {
+            curve_start->move(curve_start->position() + delta);
+        }
+    } else {
+        curve_start->move(curve_start->position() + delta);
+        curve_end->move(curve_end->position() + delta);
+    }
+    return true;
+}
+
+Glib::ustring BezierCurveHandler::getTooltip(unsigned event_state, NodeList::iterator curve_start)
+{
+    if (state_held_shift(event_state) && _is_bspline) {
+        return C_("Path segment tip", "<b>Shift</b>: drag to open or move BSpline handles");
+    }
+    if (state_held_shift(event_state)) {
+        return C_("Path segment tip", "<b>Shift</b>: click to toggle segment selection");
+    }
+    if (state_held_ctrl(event_state) && state_held_alt(event_state)) {
+        return C_("Path segment tip", "<b>Ctrl+Alt</b>: click to insert a node");
+    }
+    if (state_held_alt(event_state)) {
+        return C_("Path segment tip", "<b>Alt</b>: double click to change line type");
+    }
+    if (_is_bspline) {
+        return C_("Path segment tip", "<b>BSpline segment</b>: drag to shape the segment, doubleclick to insert node, "
+                                      "click to select (more: Alt, Shift, Ctrl+Alt)");
+    }
+
+    bool const linear = curve_start->front()->isDegenerate() && curve_start.next()->back()->isDegenerate();
+    if (linear) {
+        return C_("Path segment tip", "<b>Linear segment</b>: drag to convert to a Bezier segment, "
+                                      "doubleclick to insert node, click to select (more: Alt, Shift, Ctrl+Alt)");
+    }
+
+    return C_("Path segment tip", "<b>Bezier segment</b>: drag to shape the segment, doubleclick to insert node, "
+                                  "click to select (more: Alt, Shift, Ctrl+Alt)");
+}
+} // namespace Inkscape::UI
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/bezier-curve-handler.h b/src/ui/tool/bezier-curve-handler.h
new file mode 100644
index 0000000000000000000000000000000000000000..1b8ebe58f5dab0c8e50893d03229db0d71414b06
--- /dev/null
+++ b/src/ui/tool/bezier-curve-handler.h
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_TOOL_BEZIER_CURVE_HANDLER_H
+#define INKSCAPE_UI_TOOL_BEZIER_CURVE_HANDLER_H
+
+#include "ui/tool/curve-event-handler.h"
+
+namespace Inkscape::UI {
+
+class BezierCurveHandler : public CurveHandler
+{
+public:
+    explicit BezierCurveHandler(bool is_bspline)
+        : _is_bspline{is_bspline}
+    {}
+
+    ~BezierCurveHandler() override = default;
+
+    bool pointGrabbed(NodeList::iterator curve_start, NodeList::iterator curve_end) override;
+
+    bool pointDragged(NodeList::iterator curve_start, NodeList::iterator curve_end, double curve_time,
+                      Geom::Point const &drag_origin, Geom::Point const &drag_destination,
+                      MotionEvent const &event) override;
+
+    Glib::ustring getTooltip(unsigned event_state, NodeList::iterator curve_start) override;
+
+private:
+    bool _is_bspline = false;
+    bool _segment_degenerate_at_drag_start = false;
+};
+} // namespace Inkscape::UI
+
+#endif // INKSCAPE_UI_TOOL_BEZIER_CURVE_HANDLER_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index cfcb25289101166909a309093f53e9d0db4d5368..5c876ea2e8a1042f10947c575818aaf74a894104 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -440,7 +440,7 @@ void ControlPoint::_handleControlStyling()
     _canvas_item_ctrl->set_size_default();
 }
 
-bool ControlPoint::_is_drag_cancelled(MotionEvent const &event)
+bool ControlPoint::is_drag_cancelled(MotionEvent const &event)
 {
     return event.control_point_synthesized;
 }
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 43ef623c1ab9207f6b4a810fe33bab91a6d99a46..540c80c57a9f8367a34e646c56058becee895361 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -190,6 +190,10 @@ public:
     // make handle look like "selected" one without participating in selection
     void set_selected_appearance(bool selected);
 
+    static bool is_drag_cancelled(MotionEvent const &event);
+
+    static bool is_drag_initiated() { return _drag_initiated; }
+
 protected:
     /**
      * Create a regular control point.
@@ -278,9 +282,6 @@ protected:
     static Geom::Point const &_last_click_event_point() { return _drag_event_origin; }
     static Geom::Point const &_last_drag_origin() { return _drag_origin; }
 
-    static bool _is_drag_cancelled(MotionEvent const &event);
-
-    static bool _drag_initiated;
 
 private:
     static void _setMouseover(ControlPoint *, unsigned state);
@@ -302,6 +303,7 @@ private:
     /** Stores the desktop point from which the last drag was initiated. */
     static Geom::Point _drag_origin;
     static bool _event_grab;
+    static bool _drag_initiated;
 
     bool _double_clicked = false;
     bool _selected_appearance = false;
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index dcf544e7f08f1216911bfdf2fc730bd70f0de5ce..058efb6647a09d4cac8c7ac33b26f1c5d3c13e7d 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -8,15 +8,17 @@
  */
 
 #include "ui/tool/curve-drag-point.h"
+
 #include <glib/gi18n.h>
+
 #include "desktop.h"
+#include "object/sp-namedview.h"
+#include "ui/modifiers.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/widget/events/canvas-event.h"
 
-#include "object/sp-namedview.h"
-
 namespace Inkscape {
 namespace UI {
 
@@ -44,86 +46,69 @@ bool CurveDragPoint::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context,
     return ControlPoint::_eventHandler(event_context, event);
 }
 
+void CurveDragPoint::setIterator(NodeList::iterator iterator)
+{
+    if (iterator == NodeList::iterator()) {
+        _curve_event_handler.reset();
+        return;
+    }
+    if (iterator == first) {
+        return;
+    }
+    first = iterator;
+    _curve_event_handler.reset();
+    if (!first) {
+        return;
+    }
+
+    if (auto end_node = first.next()) {
+        _curve_event_handler = end_node->createEventHandlerForPrecedingCurve();
+    }
+}
+
 bool CurveDragPoint::grabbed(MotionEvent const &/*event*/)
 {
     _pm._selection.hideTransformHandles();
     NodeList::iterator second = first.next();
 
-    // move the handles to 1/3 the length of the segment for line segments
-    if (first->front()->isDegenerate() && second->back()->isDegenerate()) {
-        _segment_was_degenerate = true;
-
-        // delta is a vector equal 1/3 of distance from first to second
-        Geom::Point delta = (second->position() - first->position()) / 3.0;
-        // only update the nodes if the mode is bspline
-        if (!_pm._isBSpline()) {
-            first->front()->move(first->front()->position() + delta);
-            second->back()->move(second->back()->position() - delta);
-        }
-        _pm.update();
-    } else {
-        _segment_was_degenerate = false;
+    if (_curve_event_handler) {
+        _curve_event_handler->pointGrabbed(first, second);
     }
     return false;
 }
 
+void CurveDragPoint::_adjustPointToSnappedPosition(Geom::Point &point_to_adjust, CanvasEvent const &event,
+                                                   SPItem const &item_to_ignore) const
+{
+    if (!is_drag_initiated()) {
+        return;
+    }
+    if (auto const *snap_inhibitor = Modifiers::Modifier::get(Modifiers::Type::MOVE_SNAPPING);
+        snap_inhibitor && snap_inhibitor->active(event.modifiers)) {
+        return;
+    }
+
+    auto &snap_manager = _desktop->getNamedView()->snap_manager;
+    snap_manager.setup(_desktop, true, &item_to_ignore);
+    SnapCandidatePoint const candidate_point{point_to_adjust, Inkscape::SNAPSOURCE_OTHER_HANDLE};
+    point_to_adjust = snap_manager.freeSnap(candidate_point, {}, false).getPoint();
+    snap_manager.unSetup();
+}
+
 void CurveDragPoint::dragged(Geom::Point &new_pos, MotionEvent const &event)
 {
     if (!first || !first.next()) return;
     NodeList::iterator second = first.next();
 
-    // special cancel handling - retract handles when if the segment was degenerate
-    if (_is_drag_cancelled(event) && _segment_was_degenerate) {
-        first->front()->retract();
-        second->back()->retract();
-        _pm.update();
+    auto const *path_item = cast<SPItem>(_pm._path);
+    if (!_curve_event_handler || !path_item) {
         return;
     }
 
-    if (_drag_initiated && !(event.modifiers & GDK_SHIFT_MASK)) {
-        auto &m = _desktop->getNamedView()->snap_manager;
-        SPItem *path = static_cast<SPItem *>(_pm._path);
-        m.setup(_desktop, true, path); // We will not try to snap to "path" itself
-        Inkscape::SnapCandidatePoint scp(new_pos, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-        Inkscape::SnappedPoint sp = m.freeSnap(scp, Geom::OptRect(), false);
-        new_pos = sp.getPoint();
-        m.unSetup();
-    }
-
-    // Magic Bezier Drag Equations follow!
-    // "weight" describes how the influence of the drag should be distributed
-    // among the handles; 0 = front handle only, 1 = back handle only.
-    double weight, t = _t;
-    if (t <= 1.0 / 6.0) weight = 0;
-    else if (t <= 0.5) weight = (pow((6 * t - 1) / 2.0, 3)) / 2;
-    else if (t <= 5.0 / 6.0) weight = (1 - pow((6 * (1-t) - 1) / 2.0, 3)) / 2 + 0.5;
-    else weight = 1;
-
-    Geom::Point delta = new_pos - position();
-    Geom::Point offset0 = ((1-weight)/(3*t*(1-t)*(1-t))) * delta;
-    Geom::Point offset1 = (weight/(3*t*t*(1-t))) * delta;
-
-    //modified so that, if the trace is bspline, it only acts if the SHIFT key is pressed
-    if (!_pm._isBSpline()) {
-        first->front()->move(first->front()->position() + offset0);
-        second->back()->move(second->back()->position() + offset1);
-    } else if (weight >= 0.8) {
-        if (held_shift(event)) {
-            second->back()->move(new_pos);
-        } else {
-            second->move(second->position() + delta);
-        }
-    } else if (weight <= 0.2) {
-        if (held_shift(event)) {
-            first->back()->move(new_pos);
-        } else {
-            first->move(first->position() + delta);
-        }
-    } else {
-        first->move(first->position() + delta);
-        second->move(second->position() + delta);
+    _adjustPointToSnappedPosition(new_pos, event, *path_item);
+    if (_curve_event_handler->pointDragged(first, second, _t, position(), new_pos, event)) {
+        _pm.update();
     }
-    _pm.update();
 }
 
 void CurveDragPoint::ungrabbed(ButtonReleaseEvent const *)
@@ -196,35 +181,10 @@ void CurveDragPoint::_insertNode(bool take_selection)
 
 Glib::ustring CurveDragPoint::_getTip(unsigned state) const
 {
-    if (_pm.empty()) return "";
-    if (!first || !first.next()) return "";
-    bool linear = first->front()->isDegenerate() && first.next()->back()->isDegenerate();
-    if (state_held_shift(state) && _pm._isBSpline()) {
-        return C_("Path segment tip",
-            "<b>Shift</b>: drag to open or move BSpline handles");
-    }
-    if (state_held_shift(state)) {
-        return C_("Path segment tip",
-            "<b>Shift</b>: click to toggle segment selection");
-    }
-    if (state_held_ctrl(state) && state_held_alt(state)) {
-        return C_("Path segment tip",
-            "<b>Ctrl+Alt</b>: click to insert a node");
-    }
-    if (state_held_alt(state)) {
-        return C_("Path segment tip", "<b>Alt</b>: double click to change line type");
-    }
-    if (_pm._isBSpline()) {
-        return C_("Path segment tip", "<b>BSpline segment</b>: drag to shape the segment, doubleclick to insert node, "
-                                      "click to select (more: Alt, Shift, Ctrl+Alt)");
-    }
-    if (linear) {
-        return C_("Path segment tip", "<b>Linear segment</b>: drag to convert to a Bezier segment, "
-                                      "doubleclick to insert node, click to select (more: Alt, Shift, Ctrl+Alt)");
-    } else {
-        return C_("Path segment tip", "<b>Bezier segment</b>: drag to shape the segment, doubleclick to insert node, "
-                                      "click to select (more: Alt, Shift, Ctrl+Alt)");
+    if (_pm.empty() || !first || !first.next() || !_curve_event_handler) {
+        return {};
     }
+    return _curve_event_handler->getTooltip(state, first);
 }
 
 } // namespace UI
diff --git a/src/ui/tool/curve-drag-point.h b/src/ui/tool/curve-drag-point.h
index ada9fd2b7b7db916ef350d4d94729db03d17675f..b835e4ecf9908f698bfca0ba2ca7579e6b661fed 100644
--- a/src/ui/tool/curve-drag-point.h
+++ b/src/ui/tool/curve-drag-point.h
@@ -11,6 +11,7 @@
 #define INKSCAPE_UI_TOOL_CURVE_DRAG_POINT_H
 
 #include "ui/tool/control-point.h"
+#include "ui/tool/curve-event-handler.h"
 #include "ui/tool/node.h"
 
 class SPDesktop;
@@ -35,7 +36,9 @@ public:
     void setSize(double sz) { _setSize(sz); }
     void setTimeValue(double t) { _t = t; }
     double getTimeValue() { return _t; }
-    void setIterator(NodeList::iterator i) { first = i; }
+
+    /// Set iterator to the start node of the curve on which the dragpoint is located.
+    void setIterator(NodeList::iterator iterator);
     NodeList::iterator getIterator() { return first; }
     bool _eventHandler(Inkscape::UI::Tools::ToolBase *event_context, CanvasEvent const &event) override;
 
@@ -48,9 +51,13 @@ protected:
     bool doubleclicked(ButtonReleaseEvent const &) override;
 
 private:
+    void _adjustPointToSnappedPosition(Geom::Point &point_to_adjust, CanvasEvent const &event,
+                                       SPItem const &item_to_ignore) const;
+
     double _t;
     PathManipulator &_pm;
     NodeList::iterator first;
+    std::unique_ptr<CurveHandler> _curve_event_handler;
 
     static bool _drags_stroke;
     static bool _segment_was_degenerate;
diff --git a/src/ui/tool/curve-event-handler.h b/src/ui/tool/curve-event-handler.h
new file mode 100644
index 0000000000000000000000000000000000000000..b22e80c14407af6826013c4bb216c8bfcf56c8ea
--- /dev/null
+++ b/src/ui/tool/curve-event-handler.h
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_TOOL_CURVE_EVENT_HANDLER_H
+#define INKSCAPE_UI_TOOL_CURVE_EVENT_HANDLER_H
+
+#include <glibmm/ustring.h>
+
+#include "ui/tool/node.h"
+
+namespace Geom {
+class Point;
+}
+
+namespace Inkscape {
+class MotionEvent;
+
+namespace UI {
+
+/**
+ * An interface handling the UI actions performed on a point on the curve ("dragpoint")
+ * in the Node Tool. Dragging or clicking a point on the curve (between the nodes) may
+ * have a different result than performing these operations on a node. Furthermore, the
+ * result of these actions may depend on the type of curve segment.
+ */
+struct CurveHandler
+{
+    /**
+     * Handle the initial grab of a point on the curve.
+     *
+     * @param curve_start  Start node of the grabbed segment.
+     * @param curve_end    End node of the grabbed segment.
+     *
+     * @return Whether the geometry needs to be updated.
+     */
+    virtual bool pointGrabbed(NodeList::iterator curve_start, NodeList::iterator curve_end) = 0;
+
+    /**
+     * Handle an ongoing drag of a point on a curve segment.
+     *
+     * @param curve_start       Initial node of the curve segment.
+     * @param curve_end         Final node of the curve segment.
+     * @param curve_time        Time parameter of the dragged point, in the interval [0, 1].
+     * @param drag_origin       The point from which the drag started.
+     * @param drag_destination  The point to which the curve is being dragged.
+     * @param event             The details of the motion event.
+     *
+     * @return Whether the curve geometry should be updated.
+     */
+    virtual bool pointDragged(NodeList::iterator curve_start, NodeList::iterator curve_end, double curve_time,
+                              Geom::Point const &drag_origin, Geom::Point const &drag_destination,
+                              MotionEvent const &event) = 0;
+
+    /// Get the tooltip string with Pango markup, to be displayed on the status bar.
+    virtual Glib::ustring getTooltip(unsigned event_state, NodeList::iterator curve_start) = 0;
+
+    virtual ~CurveHandler() = default;
+};
+} // namespace UI
+} // namespace Inkscape
+
+#endif // INKSCAPE_UI_TOOL_CURVE_DRAG_HANDLER_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/elliptical-arc-end-node.cpp b/src/ui/tool/elliptical-arc-end-node.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c8d158b4232fd97d254ced5013bb700d120698d7
--- /dev/null
+++ b/src/ui/tool/elliptical-arc-end-node.cpp
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Editable node at the end of an elliptical arc.
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "elliptical-arc-end-node.h"
+
+#include <2geom/elliptical-arc.h>
+#include <array>
+#include <cmath>
+
+#include "elliptical-arc-handler.h"
+#include "inkscape.h"
+#include "node-factory.h"
+#include "path-manipulator.h"
+#include "ui/tool/node-types.h"
+
+namespace Inkscape::UI {
+
+namespace {
+
+using CubicBezierIntermediateControlPoints = std::array<Geom::Point, 2>;
+
+/// Given an elliptical arc, compute the two intermediate control points of a cubic Bézier approximating the arc.
+CubicBezierIntermediateControlPoints
+compute_cubic_bezier_control_points_for_arc_approximation(Geom::EllipticalArc const &arc)
+{
+    auto const quarter_angle = arc.sweepAngle() / 4.0;
+    if (Geom::are_near(quarter_angle, M_PI_2) || Geom::are_near(quarter_angle, -M_PI_2)) {
+        return {arc.initialPoint(), arc.finalPoint()};
+    }
+    auto const sweep_angle_factor = 4.0 * tan(quarter_angle) / 3.0;
+
+    auto const unit_arc_start = Geom::Point::polar(arc.initialAngle());
+    auto const unit_arc_end = Geom::Point::polar(arc.finalAngle());
+    auto const tr = arc.unitCircleTransform();
+
+    return {(unit_arc_start + sweep_angle_factor * unit_arc_start.cw()) * tr,
+            (unit_arc_end - sweep_angle_factor * unit_arc_end.cw()) * tr};
+}
+
+void set_up_nodes_for_arc_replacement(Node *end_node_of_replacement_curve, SegmentType requested_segment_type,
+                                      NodeType requested_node_type, Geom::Point const &front_handle_position,
+                                      Geom::EllipticalArc const &arc)
+{
+    end_node_of_replacement_curve->setType(requested_node_type, false);
+    end_node_of_replacement_curve->front()->move(front_handle_position);
+
+    if (requested_segment_type == SEGMENT_CUBIC_BEZIER) {
+        // Set up handles for a Bézier segment
+        auto *start_node_of_replacement_curve =
+            end_node_of_replacement_curve->nodeToward(end_node_of_replacement_curve->back());
+
+        auto const handle_positions = compute_cubic_bezier_control_points_for_arc_approximation(arc);
+        end_node_of_replacement_curve->back()->move(handle_positions.back());
+        start_node_of_replacement_curve->front()->move(handle_positions.front());
+    }
+}
+} // namespace
+
+EllipticalArcEndNode::EllipticalArcEndNode(Geom::EllipticalArc const &preceding_arc, NodeSharedData const &data,
+                                           PathManipulator &parent)
+    : Node{data, preceding_arc.finalPoint()}
+    , _manipulator{_desktop ? *_desktop : *SP_ACTIVE_DESKTOP, preceding_arc, data, parent}
+{}
+
+std::unique_ptr<CurveHandler> EllipticalArcEndNode::createEventHandlerForPrecedingCurve()
+{
+    return std::make_unique<EllipticalArcHandler>(_manipulator);
+}
+
+void EllipticalArcEndNode::move(Geom::Point const &p)
+{
+    Node::move(p);
+    _manipulator.setArcFinalPoint(p);
+}
+
+void EllipticalArcEndNode::notifyPrecedingNodeUpdate(Node &previous_node)
+{
+    _manipulator.setArcInitialPoint(previous_node.position());
+    previous_node.front()->retract();
+}
+
+void EllipticalArcEndNode::transform(Geom::Affine const &m)
+{
+    setPosition(position() * m);
+    back()->retract();
+    _manipulator.setArcFinalPoint(position());
+}
+
+void EllipticalArcEndNode::fixNeighbors()
+{
+    back()->retract();
+}
+
+void EllipticalArcEndNode::showHandles(bool v)
+{
+    _extra_ui_visible = v;
+    _manipulator.setVisible(v);
+
+    if (auto next_node = NodeList::get_iterator(this).next();
+        next_node && next_node->handlesAllowedOnPrecedingSegment()) {
+        front()->setVisible(v && !front()->isDegenerate());
+    }
+}
+
+void EllipticalArcEndNode::changePrecedingSegmentType(SegmentType new_type, Node &preceding_node)
+{
+    if (new_type == SEGMENT_ELLIPTICAL) {
+        return; // Nothing to do
+    }
+
+    // Before committing suicide, copy required data onto the stack.
+    auto const node_type = type();
+    auto const arc = _manipulator.arc();
+    auto const front_handle_old_position = front()->position();
+
+    // Make a new node to replace self.
+    auto *replacement_node = _pm().createNodeFactory().createNextNode(arc.chord()).release();
+    std::move(*this)._replace(replacement_node);
+
+    set_up_nodes_for_arc_replacement(replacement_node, new_type, node_type, front_handle_old_position, arc);
+}
+
+void EllipticalArcEndNode::setType(NodeType type, bool)
+{
+    if (type == NODE_PICK_BEST) {
+        type = NODE_CUSP;
+    }
+    Node::setType(type, false);
+    /// TODO: update handles manually
+
+    updateState();
+    _manipulator.updateDisplay();
+}
+
+void EllipticalArcEndNode::writeType(std::ostream &output_stream) const
+{
+    output_stream << static_cast<char>(XmlNodeType::ELLIPSE_MODIFIER);
+    Node::writeType(output_stream);
+}
+
+std::unique_ptr<Node> EllipticalArcEndNode::subdivideArc(double curve_time)
+{
+    auto result = _manipulator.subdivideArc(curve_time);
+    result->setType(NODE_CUSP, false);
+    return result;
+}
+
+void EllipticalArcEndNode::writeSegment(Geom::PathSink &output, Node const &) const
+{
+    _manipulator.writeSegment(output);
+}
+} // namespace Inkscape::UI
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/elliptical-arc-end-node.h b/src/ui/tool/elliptical-arc-end-node.h
new file mode 100644
index 0000000000000000000000000000000000000000..ba0dd08d2a6e2b2070007ca0f7c6b50832af56a1
--- /dev/null
+++ b/src/ui/tool/elliptical-arc-end-node.h
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Editable node at the end of an elliptical arc.
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_TOOL_ELLIPTICAL_ARC_END_NODE_H
+#define INKSCAPE_UI_TOOL_ELLIPTICAL_ARC_END_NODE_H
+
+#include "elliptical-manipulator.h"
+#include "ui/tool/node.h"
+
+class SPObject;
+
+namespace Geom {
+class Affine;
+class EllipticalArc;
+class Point;
+} // namespace Geom
+
+namespace Inkscape::UI {
+class NodeSharedData;
+class CurveHandler;
+class PathManipulator;
+
+class EllipticalArcEndNode : public Node
+{
+public:
+    EllipticalArcEndNode(Geom::EllipticalArc const &preceding_arc, NodeSharedData const &data, PathManipulator &parent);
+
+    ~EllipticalArcEndNode() override = default;
+
+    void move(Geom::Point const &p) final;
+
+    void transform(Geom::Affine const &m) final;
+
+    void fixNeighbors() final;
+
+    void showHandles(bool v) final;
+
+    bool isPrecedingSegmentStraight() const final { return false; }
+
+    void changePrecedingSegmentType(SegmentType new_type, Node &preceding_node) final;
+
+    bool handlesAllowedOnPrecedingSegment() const final { return false; }
+
+    void notifyPrecedingNodeUpdate(Node &previous_node) final;
+
+    void setType(NodeType type, bool update_handles) final;
+
+    void writeType(std::ostream &output_stream) const final;
+
+    /// Subdivide the arc preceding this node and return a new node at the prescribed curve time parameter.
+    std::unique_ptr<Node> subdivideArc(double curve_time);
+
+    void writeSegment(Geom::PathSink &output, Node const &) const final;
+
+    std::unique_ptr<CurveHandler> createEventHandlerForPrecedingCurve() final;
+
+    bool areHandlesVisible() const final { return _extra_ui_visible; }
+
+private:
+    EllipticalManipulator _manipulator;
+    bool _extra_ui_visible = false;
+};
+} // namespace Inkscape::UI
+
+#endif // INKSCAPE_UI_TOOL_ELLIPTICAL_ARC_END_NODE_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/elliptical-arc-handler.cpp b/src/ui/tool/elliptical-arc-handler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bcdbc18c8e0838d6abebc5954cf58cae174d3f07
--- /dev/null
+++ b/src/ui/tool/elliptical-arc-handler.cpp
@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "ui/tool/elliptical-arc-handler.h"
+
+#include <2geom/ellipse.h>
+#include <2geom/elliptical-arc.h>
+#include <2geom/line.h>
+#include <2geom/transforms.h>
+#include <algorithm>
+#include <glib/gi18n.h>
+#include <numeric>
+
+#include "ui/modifiers.h"
+#include "ui/tool/elliptical-arc-end-node.h"
+#include "ui/tool/elliptical-manipulator.h"
+#include "ui/tool/node.h"
+#include "ui/widget/events/canvas-event.h"
+
+namespace {
+
+/** Given three collinear points, construct the smallest degenerate arc with the given initial and final points
+ *  containing the specified third point.
+ *  The last argunment arc_center_hint is used as a loose suggestion for where the arc's enter should be placed.
+ */
+Geom::EllipticalArc compute_degenerate_arc(Geom::Point const &initial_point, Geom::Point const &final_point,
+                                           Geom::Point const &point_on_arc, Geom::Point const &arc_center_hint)
+{
+    Geom::Line const line{initial_point, final_point};
+    auto const arc_center = line.isDegenerate() ? initial_point : line.pointAt(line.nearestTime(arc_center_hint));
+
+    double const ray =
+        std::max(Geom::distance(arc_center, point_on_arc),
+                 std::max(Geom::distance(arc_center, initial_point), Geom::distance(arc_center, final_point)));
+
+    Geom::Ellipse degenerate_ellipse{arc_center, {ray, 0.0}, line.angle()}; // TODO const-correct Geom::Ellipse::arc()
+
+    // This is needed only because lib2geom insists on heap allocation
+    std::unique_ptr<Geom::EllipticalArc> result{degenerate_ellipse.arc(initial_point, point_on_arc, final_point)};
+    return *result;
+}
+
+Geom::Line perpendicular_bisector(Geom::Point const &a, Geom::Point const &b)
+{
+    return Geom::Line::from_origin_and_vector(Geom::middle_point(a, b), (a - b).cw());
+}
+
+Geom::Point triple_intersection(Geom::Line const &a, Geom::Line const &b, Geom::Line const &c)
+{
+    auto intersections = a.intersect(b);
+    auto const ac = c.intersect(a);
+    auto const bc = b.intersect(c);
+
+    intersections.insert(intersections.end(), ac.begin(), ac.end());
+    intersections.insert(intersections.end(), bc.begin(), bc.end());
+    if (intersections.empty()) {
+        return {};
+    }
+
+    return std::accumulate(
+        intersections.begin(), intersections.end(), Geom::Point{},
+        [coefficient = 1.0 / static_cast<double>(intersections.size())](auto const &accumulated, auto const &incoming) {
+            return accumulated + coefficient * incoming.point();
+        });
+}
+
+/**
+ * @brief Find an ellipse with the specified aspect ratio and rotation angle passing through three given points.
+ *
+ * @pre Points a, b, c do not lie on the same straight line.
+ *
+ * @param aspect_ratio A point whose ratio of coordinates expresses the desired ratio of ellipse's rays.
+ * @pre Both of the coordinates of aspect_ratio are strictly positive.
+ *
+ * @param rotation     The angle of the rotation taking the X axis to the axis of aspect_ratio.x().
+ * @return An ellipse passing through a, b, c whose rotation angle and aspect ratio match the input.
+ */
+Geom::Ellipse fit_ellipse_to_three_points(Geom::Point const &a, Geom::Point const &b, Geom::Point const &c,
+                                          Geom::Point const &aspect_ratio, Geom::Angle rotation)
+{
+    auto const level = Geom::Rotate(-rotation);
+    auto const circularize = Geom::Scale(aspect_ratio.y(), aspect_ratio.x());
+    auto const transform = level * circularize;
+
+    auto const p = a * transform;
+    auto const q = b * transform;
+    auto const r = c * transform;
+
+    auto const center_transformed =
+        triple_intersection(perpendicular_bisector(p, q), perpendicular_bisector(q, r), perpendicular_bisector(r, p));
+    auto const radius_transformed = Geom::distance(center_transformed, p) / 3.0 +
+                                    Geom::distance(center_transformed, q) / 3.0 +
+                                    Geom::distance(center_transformed, r) / 3.0;
+    auto const rays = Geom::Point{radius_transformed, radius_transformed} * circularize.inverse();
+
+    return {center_transformed * transform.inverse(), rays, rotation};
+}
+
+bool is_modifier_active(Inkscape::Modifiers::Type type, Inkscape::CanvasEvent const &event)
+{
+    auto const *modifier = Inkscape::Modifiers::Modifier::get(type);
+    return modifier && modifier->active(event.modifiers);
+}
+} // namespace
+
+namespace Inkscape::UI {
+
+EllipticalArcHandler::EllipticalArcHandler(EllipticalManipulator &manipulator)
+    : _manipulator{&manipulator}
+{}
+
+bool EllipticalArcHandler::pointGrabbed(NodeList::iterator curve_start, NodeList::iterator curve_end)
+{
+    _rays_at_drag_start = _manipulator->arc().rays();
+    return false;
+}
+
+bool EllipticalArcHandler::pointDragged(NodeList::iterator curve_start, NodeList::iterator curve_end, double curve_time,
+                                        Geom::Point const &drag_origin, Geom::Point const &drag_destination,
+                                        MotionEvent const &event)
+{
+    auto const &arc = _manipulator->arc();
+    auto const initial_point = arc.initialPoint();
+    auto const final_point = arc.finalPoint();
+
+    if (Geom::are_collinear(initial_point, drag_destination, final_point)) {
+        // The endpoints of the arc lie on the same straight line as the drag point; the arc will be degenerate.
+        _manipulator->setArcGeometry(
+            compute_degenerate_arc(initial_point, final_point, drag_destination, arc.center()));
+        return true;
+    }
+
+    // The points are not on the same line, so we need a real arc. However, the original arc might have become
+    // degenerate in case the user is in the midst of dragging the point from one side of the chord to the other.
+    // So we make an arc of an ellipse with the same aspect ratio as the original ellipse at the start of the drag,
+    // unless that ellipse itself was degenerate, in which case we create a circle.
+    bool const was_degenerate = _rays_at_drag_start.x() < Geom::EPSILON || _rays_at_drag_start.y() < Geom::EPSILON;
+    auto const &reference_rays = was_degenerate ? Geom::Point{1.0, 1.0} : _rays_at_drag_start;
+
+    Geom::Angle arc_rotation = arc.rotationAngle();
+    if (!is_modifier_active(Modifiers::Type::MOVE_CONFINE, event)) {
+        auto const center = arc.center();
+        arc_rotation += Geom::angle_between(drag_origin - center, drag_destination - center);
+        // TODO: the expression (drag_destination - center) does not take into account the changed center
+    }
+
+    auto fitting_ellipse =
+        fit_ellipse_to_three_points(initial_point, drag_destination, final_point, reference_rays, arc_rotation);
+    std::unique_ptr<Geom::EllipticalArc> new_arc{fitting_ellipse.arc(initial_point, drag_destination, final_point)};
+
+    _manipulator->setArcGeometry(*new_arc);
+    return true;
+}
+
+Glib::ustring EllipticalArcHandler::getTooltip(unsigned event_state, NodeList::iterator /*curve_start*/)
+{
+    return C_("Path segment tip", "<b>Elliptical arc</b>: drag to shape the arc, doubleclick to insert node");
+}
+} // namespace Inkscape::UI
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/elliptical-arc-handler.h b/src/ui/tool/elliptical-arc-handler.h
new file mode 100644
index 0000000000000000000000000000000000000000..32985c7029f1ed2a6054bc5e8396267a4303ff37
--- /dev/null
+++ b/src/ui/tool/elliptical-arc-handler.h
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_TOOL_ELLIPTICAL_ARC_HANDLER_H
+#define INKSCAPE_UI_TOOL_ELLIPTICAL_ARC_HANDLER_H
+
+#include <2geom/point.h>
+
+#include "ui/tool/curve-event-handler.h"
+
+class SPItem;
+
+namespace Inkscape::UI {
+class EllipticalManipulator;
+
+class EllipticalArcHandler : public CurveHandler
+{
+public:
+    explicit EllipticalArcHandler(EllipticalManipulator &manipulator);
+
+    ~EllipticalArcHandler() override = default;
+
+    bool pointGrabbed(NodeList::iterator curve_start, NodeList::iterator curve_end) override;
+
+    bool pointDragged(NodeList::iterator curve_start, NodeList::iterator curve_end, double curve_time,
+                      Geom::Point const &drag_origin, Geom::Point const &drag_destination,
+                      MotionEvent const &event) override;
+
+    Glib::ustring getTooltip(unsigned event_state, NodeList::iterator /*curve_start*/) override;
+
+private:
+    EllipticalManipulator *_manipulator = nullptr;
+    Geom::Point _rays_at_drag_start;
+};
+} // namespace Inkscape::UI
+
+#endif // INKSCAPE_UI_TOOL_ELLIPTICAL_ARC_HANDLER_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/elliptical-manipulator.cpp b/src/ui/tool/elliptical-manipulator.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4c1ee8ea841fbe6ce90521f2a1af1078435b690b
--- /dev/null
+++ b/src/ui/tool/elliptical-manipulator.cpp
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Handles for the manipulation of elliptical arcs.
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net> - Implementation
+ *   Adam Belis <adam.belis@gmail.com> - Design and definition
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "ui/tool/elliptical-manipulator.h"
+
+#include <2geom/elliptical-arc.h>
+#include <2geom/line.h>
+#include <2geom/path-sink.h>
+#include <2geom/pathvector.h>
+#include <2geom/point.h>
+
+#include "display/control/canvas-item-bpath.h"
+#include "display/control/canvas-item-enums.h"
+#include "display/control/canvas-item-ptr.h"
+#include "object/sp-item.h"
+#include "ui/tool/elliptical-arc-end-node.h"
+#include "ui/tool/multi-path-manipulator.h"
+#include "ui/tool/node.h"
+#include "ui/tool/path-manipulator.h"
+
+namespace {
+
+/// Given the arc of an ellipse, return the other arc making up the ellipse.
+Geom::PathVector arc_complement(Geom::EllipticalArc const &arc)
+{
+    Geom::PathVector result;
+    Geom::PathBuilder builder{result};
+
+    auto const [rx, ry] = arc.rays();
+    builder.moveTo(arc.finalPoint());
+    builder.arcTo(rx, ry, arc.rotationAngle(), !arc.largeArc(), arc.sweep(), arc.initialPoint());
+    builder.flush();
+    return result;
+}
+
+double constexpr CONTOUR_WIDTH = 2.0;
+double constexpr DASH_LENGTH = 2.0;
+} // namespace
+
+namespace Inkscape::UI {
+
+EllipticalManipulator::EllipticalManipulator(SPDesktop &desktop, Geom::EllipticalArc const &arc,
+                                             NodeSharedData const &data, PathManipulator &parent)
+    : _arc{arc}
+    , _node_shared_data{&data}
+    , _contour{make_canvasitem<CanvasItemBpath>(data.handle_line_group)}
+    , _parent{&parent}
+{
+    _contour->set_bpath(arc_complement(_arc));
+    _contour->set_name("CanvasItemBPath:EllipseContour");
+    _contour->set_stroke(CANVAS_ITEM_PRIMARY);
+    _contour->lower_to_bottom();
+    _contour->set_pickable(false);
+    _contour->CanvasItem::set_fill(0U);
+    _contour->set_stroke_width(CONTOUR_WIDTH);
+    _contour->set_dashes({DASH_LENGTH, DASH_LENGTH});
+}
+
+void EllipticalManipulator::updateDisplay()
+{
+    // TODO: implement the arc controller
+    // _center_node.setPosition(_arc.center());
+    _contour->set_bpath(arc_complement(_arc));
+    _parent->update();
+}
+
+void EllipticalManipulator::commitUndoEvent(CommitEvent event_type) const
+{
+    _parent->mpm().commit(event_type);
+}
+
+void EllipticalManipulator::writeSegment(Geom::PathSink &output) const
+{
+    auto const [ray_x, ray_y] = _arc.rays();
+    output.arcTo(ray_x, ray_y, _arc.rotationAngle(), _arc.largeArc(), _arc.sweep(), _arc.finalPoint());
+}
+
+void EllipticalManipulator::setVisible(bool visible)
+{
+    // TODO: implement the halo node
+    _contour->set_visible(visible);
+}
+
+void EllipticalManipulator::setArcGeometry(Geom::EllipticalArc const &new_arc)
+{
+    auto const old_initial_point = _arc.initialPoint();
+    auto const old_final_point = _arc.finalPoint();
+
+    _arc = new_arc;
+    _arc.setInitial(old_initial_point);
+    _arc.setFinal(old_final_point);
+
+    updateDisplay();
+}
+
+void EllipticalManipulator::setArcFinalPoint(Geom::Point const &new_point)
+{
+    auto const old_initial_point = _arc.initialPoint();
+    auto const old_chord_line = Geom::Line(_arc.chord());
+    auto const new_chord_line = Geom::Line(old_initial_point, new_point);
+
+    _arc.transform(old_chord_line.transformTo(new_chord_line));
+    _arc.setInitial(old_initial_point);
+    _arc.setFinal(new_point);
+
+    updateDisplay();
+}
+
+void EllipticalManipulator::setArcInitialPoint(Geom::Point const &new_point)
+{
+    auto const old_final_point = _arc.finalPoint();
+    auto const old_chord_line = Geom::Line(_arc.chord());
+    auto const new_chord_line = Geom::Line(new_point, old_final_point);
+
+    _arc.transform(old_chord_line.transformTo(new_chord_line));
+    _arc.setInitial(new_point);
+    _arc.setFinal(old_final_point);
+
+    updateDisplay();
+}
+
+std::unique_ptr<Node> EllipticalManipulator::subdivideArc(double subdivision_time)
+{
+    double const t = std::clamp(subdivision_time, 0.0, 1.0);
+    auto const subdivision_point = _arc.pointAt(t);
+
+    std::unique_ptr<Geom::Curve> first_curve{_arc.portion(0.0, t)};
+    std::unique_ptr<Geom::Curve> second_curve{_arc.portion(t, 1.0)};
+
+    // TODO: fix portion() so that the dynamic cast is unnecessary
+    auto *second_arc = dynamic_cast<Geom::EllipticalArc *>(second_curve.get());
+
+    assert(second_arc);
+
+    first_curve->setInitial(_arc.initialPoint());
+    first_curve->setFinal(subdivision_point);
+
+    second_arc->setInitial(subdivision_point);
+    second_arc->setFinal(_arc.finalPoint());
+
+    _arc = *second_arc;
+    updateDisplay();
+
+    return _parent->createNodeFactory().createArcEndpointNode(*first_curve);
+}
+} // namespace Inkscape::UI
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/elliptical-manipulator.h b/src/ui/tool/elliptical-manipulator.h
new file mode 100644
index 0000000000000000000000000000000000000000..d6d02bcadc86892c5fd57727d85a134aeca2f623
--- /dev/null
+++ b/src/ui/tool/elliptical-manipulator.h
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Handles for the manipulation of elliptical arcs in the Node tool.
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2024 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_TOOL_ELLIPTICAL_MANIPULATOR_H
+#define INKSCAPE_UI_TOOL_ELLIPTICAL_MANIPULATOR_H
+
+#include <2geom/elliptical-arc.h>
+#include <2geom/point.h>
+#include <glib/gi18n.h>
+#include <glibmm/ustring.h>
+
+#include "display/control/canvas-item-bpath.h"
+#include "display/control/canvas-item-ptr.h"
+#include "ui/tool/commit-events.h"
+#include "ui/tool/control-point.h"
+#include "ui/tool/node-types.h"
+
+class SPDesktop;
+class SPItem;
+
+namespace Geom {
+class Ellipse;
+class EllipticalArc;
+class PathSink;
+} // namespace Geom
+
+namespace Inkscape::UI {
+class Node;
+class NodeSharedData;
+class PathManipulator;
+
+class EllipticalManipulator
+{
+public:
+    EllipticalManipulator(SPDesktop &desktop, Geom::EllipticalArc const &arc, NodeSharedData const &data,
+                          PathManipulator &parent);
+
+    /// Read-only access to the geometric arc.
+    Geom::EllipticalArc const &arc() const { return _arc; }
+
+    /**
+     * Shorten the controlled arc to only the part after the subdivision point,
+     * returning a new subdivision node controlling the part before the subdivision point.
+     *
+     * @param subdivision_time  Curve time in the interval [0, 1].
+     */
+    std::unique_ptr<Node> subdivideArc(double subdivision_time);
+
+    void setVisible(bool visible);
+
+    void setArcInitialPoint(Geom::Point const &new_point);
+
+    void setArcFinalPoint(Geom::Point const &new_point);
+
+    /// Replace the manipulated arc with a new one.
+    void setArcGeometry(Geom::EllipticalArc const &new_arc);
+
+    void commitUndoEvent(CommitEvent event_type) const;
+
+    void updateDisplay();
+
+    /// Feed the manipulated elliptical arc into a path sink.
+    void writeSegment(Geom::PathSink &output) const;
+
+private:
+    Geom::EllipticalArc _arc;
+    NodeSharedData const *_node_shared_data = nullptr;
+    CanvasItemPtr<CanvasItemBpath> _contour;
+    PathManipulator *_parent = nullptr;
+};
+} // namespace Inkscape::UI
+
+#endif // INKSCAPE_UI_TOOL_ELLIPTICAL_MANIPULATOR_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index dca599d0c2d9668f0940f6f8bfed7e04fd4dd61c..7010c1411605fce6d610e031f224493ff1fe5f58 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -118,8 +118,7 @@ MultiPathManipulator::MultiPathManipulator(PathSharedData &data)
     : PointManipulator(data.node_data.desktop, *data.node_data.selection)
     , _path_data(data)
 {
-    _selection.signal_commit.connect(
-        sigc::mem_fun(*this, &MultiPathManipulator::_commit));
+    _selection.signal_commit.connect(sigc::mem_fun(*this, &MultiPathManipulator::commit));
     _selection.signal_selection_changed.connect(
         sigc::hide( sigc::hide(
             signal_coords_changed.make_slot())));
@@ -296,7 +295,7 @@ void MultiPathManipulator::setNodeType(NodeType type)
         Node *node = dynamic_cast<Node*>(i);
         if (node) {
             retract_handles &= (node->type() == NODE_CUSP);
-            node->setType(type);
+            node->setType(type, true);
         }
     }
 
@@ -313,15 +312,30 @@ void MultiPathManipulator::setNodeType(NodeType type)
     _done(retract_handles ? _("Retract handles") : _("Change node type"));
 }
 
+namespace {
+
+char const *get_undo_history_label_for_segment_type_change(SegmentType target_type)
+{
+    switch (target_type) {
+        case SEGMENT_STRAIGHT:
+            return _("Straighten segments");
+        case SEGMENT_CUBIC_BEZIER:
+            return _("Make segments curves");
+        case SEGMENT_ELLIPTICAL:
+            return _("Make segments arcs");
+        default:
+            return "";
+    }
+}
+} // namespace
+
 void MultiPathManipulator::setSegmentType(SegmentType type)
 {
-    if (_selection.empty()) return;
-    invokeForAll(&PathManipulator::setSegmentType, type);
-    if (type == SEGMENT_STRAIGHT) {
-        _done(_("Straighten segments"));
-    } else {
-        _done(_("Make segments curves"));
+    if (_selection.empty()) {
+        return;
     }
+    invokeForAll(&PathManipulator::setSegmentType, type);
+    _done(get_undo_history_label_for_segment_type_change(type));
 }
 
 void MultiPathManipulator::insertNodes()
@@ -799,7 +813,7 @@ bool MultiPathManipulator::event(Inkscape::UI::Tools::ToolBase *tool, CanvasEven
 
 /** Commit changes to XML and add undo stack entry based on the action that was done. Invoked
  * by sub-manipulators, for example TransformHandleSet and ControlPointSelection. */
-void MultiPathManipulator::_commit(CommitEvent cps)
+void MultiPathManipulator::commit(CommitEvent cps)
 {
     gchar const *reason = nullptr;
     gchar const *key = nullptr;
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index 2c3ac8aa615c0db2df66c7ed525c99b530298222..6a870179dd33765ef827fe9c384ad3507a7b5aad 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -70,6 +70,7 @@ public:
     void reverseSubpaths();
     void move(Geom::Point const &delta);
     void scale(Geom::Point const &center, Geom::Point const &scale);
+    void commit(CommitEvent cps);
 
     void showOutline(bool show);
     void showHandles(bool show);
@@ -123,7 +124,6 @@ private:
         }
     }
 
-    void _commit(CommitEvent cps);
     void _done(gchar const *reason, bool alert_LPE = true);
     void _doneWithCleanup(gchar const *reason, bool alert_LPE = false);
     Colors::Color _getOutlineColor(ShapeRole role, SPObject *object);
diff --git a/src/ui/tool/node-factory.cpp b/src/ui/tool/node-factory.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..cfacd75c9ab9325869e5d6db0e8010e7b7a24b84
--- /dev/null
+++ b/src/ui/tool/node-factory.cpp
@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Factory for creating Node objects for the Node Tool
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2025 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "node-factory.h"
+
+#include <2geom/bezier-curve.h>
+#include <2geom/curve.h>
+#include <2geom/elliptical-arc.h>
+#include <2geom/exception.h>
+#include <2geom/line.h>
+#include <span>
+#include <string_view>
+#include <tuple>
+#include <vector>
+
+#include "elliptical-arc-end-node.h"
+#include "node.h"
+#include "ui/tool/path-manipulator.h"
+
+namespace Inkscape::UI {
+
+namespace {
+
+Geom::EllipticalArc make_semicircle(Geom::Point const &from, Geom::Point const &to)
+{
+    auto const r = 0.5 * Geom::distance(from, to);
+    return {from, r, r, 0.0, true, true, to};
+}
+
+std::optional<Geom::EllipticalArc> fit_arc_to_cubic_bezier(Geom::CubicBezier const &bezier)
+{
+    assert(!bezier.isLineSegment());
+
+    Geom::Line const initial_tangent{bezier.initialPoint(), bezier.controlPoint(1)};
+    Geom::Line const final_tangent{bezier.finalPoint(), bezier.controlPoint(2)};
+    try {
+        return Geom::EllipticalArc::from_tangents_and_point(initial_tangent, bezier.pointAt(0.5), final_tangent);
+    } catch (Geom::RangeError const &) {
+        return {};
+    }
+    return {};
+}
+} // namespace
+
+std::vector<NodeTypeRequest> read_node_type_requests(char const *xml_node_type_string)
+{
+    std::string_view const node_type_str = xml_node_type_string ? xml_node_type_string : "";
+
+    std::vector<NodeTypeRequest> result;
+    result.reserve(node_type_str.size());
+
+    auto const parse_symbol = [&node_type_str](auto &it) -> NodeTypeRequest {
+        if (it == node_type_str.end()) {
+            return {};
+        }
+
+        NodeTypeRequest result;
+
+        while (it != node_type_str.end() && *it == static_cast<char>(XmlNodeType::ELLIPSE_MODIFIER)) {
+            result.elliptical_arc_requested = true;
+            ++it;
+        }
+        if (it == node_type_str.end()) {
+            return result;
+        }
+
+        result.requested_type = static_cast<XmlNodeType>(*it++);
+        return result;
+    };
+
+    auto iterator = node_type_str.begin();
+    while (iterator != node_type_str.end()) {
+        result.push_back(parse_symbol(iterator));
+    }
+    return result;
+}
+
+void set_node_types(SubpathList &subpath_list, std::span<NodeTypeRequest const> requests)
+{
+    auto const get_next = [&requests](auto &it) { return it == requests.end() ? NodeTypeRequest{} : *it++; };
+
+    auto iterator = requests.begin();
+    for (auto &subpath : subpath_list) {
+        for (auto &node : *subpath) {
+            auto const [node_type, ellipse_modifier] = get_next(iterator);
+            node.setType(decode_node_type(node_type), false);
+        }
+        if (subpath->closed()) {
+            // STUPIDITY ALERT: it seems we need to use the duplicate type symbol instead of
+            // the first one to remain backward compatible.
+            auto const [node_type, ellipse_modifier] = get_next(iterator);
+            if (node_type != XmlNodeType::BOGUS) {
+                subpath->begin()->setType(decode_node_type(node_type), false);
+            }
+        }
+    }
+}
+
+NodeFactory::NodeFactory(std::span<NodeTypeRequest const> request_sequence, PathManipulator *manipulator)
+    : _manipulator{manipulator}
+    , _requests{request_sequence}
+    , _always_create_elliptical_arcs{request_sequence.empty()}
+{
+    assert(_manipulator);
+    _shared_data = _manipulator->getNodeSharedData();
+}
+
+std::unique_ptr<Node> NodeFactory::createInitialNode(Geom::Path const &path)
+{
+    std::ignore = _getNextRequest();
+
+    // Initial node is always of base type; we can change it upon reaching the end of a closed path
+    return std::make_unique<Node>(_shared_data, path.initialPoint());
+}
+
+std::unique_ptr<Node> NodeFactory::createNextNode(Geom::Curve const &preceding_curve)
+{
+    auto const type_request = _getNextRequest();
+    if (type_request.elliptical_arc_requested || _always_create_elliptical_arcs) {
+        if (auto const *arc = dynamic_cast<Geom::EllipticalArc const *>(&preceding_curve)) {
+            return std::make_unique<EllipticalArcEndNode>(*arc, _shared_data, *_manipulator);
+        }
+    }
+    return std::make_unique<Node>(_shared_data, preceding_curve.finalPoint());
+}
+
+std::unique_ptr<Node> NodeFactory::createArcEndpointNode(Geom::Curve const &curve)
+{
+    Geom::EllipticalArc arc = make_semicircle(curve.initialPoint(), curve.finalPoint());
+    if (!curve.isLineSegment()) {
+        if (auto const *cubic_bezier = dynamic_cast<Geom::CubicBezier const *>(&curve)) {
+            if (auto const fitted = fit_arc_to_cubic_bezier(*cubic_bezier)) {
+                arc = *fitted;
+            }
+        } else if (auto const *already_arc = dynamic_cast<Geom::EllipticalArc const *>(&curve)) {
+            arc = *already_arc;
+        }
+    }
+    return std::make_unique<EllipticalArcEndNode>(arc, _shared_data, *_manipulator);
+}
+
+NodeTypeRequest NodeFactory::_getNextRequest()
+{
+    if (_pos < _requests.size()) {
+        return _requests[_pos++];
+    }
+    return {};
+}
+
+} // namespace Inkscape::UI
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
\ No newline at end of file
diff --git a/src/ui/tool/node-factory.h b/src/ui/tool/node-factory.h
new file mode 100644
index 0000000000000000000000000000000000000000..d26e904f898e87997c0dd801a5b8173b2d8c1884
--- /dev/null
+++ b/src/ui/tool/node-factory.h
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Factory for creating Node objects for the Node Tool
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2025 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_TOOL_NODE_FACTORY_H
+#define INKSCAPE_UI_TOOL_NODE_FACTORY_H
+
+#include <memory>
+#include <span>
+#include <vector>
+
+#include "node-types.h"
+
+class SPDesktop;
+
+namespace Geom {
+class Curve;
+class Path;
+} // namespace Geom
+
+namespace Inkscape {
+
+class CanvasItemGroup;
+
+namespace UI {
+
+class Node;
+class PathManipulator;
+class SubpathList;
+class ControlPointSelection;
+
+struct NodeSharedData
+{
+    SPDesktop *desktop;
+    ControlPointSelection *selection;
+    CanvasItemGroup *node_group;
+    CanvasItemGroup *handle_group;
+    CanvasItemGroup *handle_line_group;
+};
+
+struct NodeTypeRequest
+{
+    XmlNodeType requested_type = XmlNodeType::BOGUS;
+    bool elliptical_arc_requested = false;
+};
+
+/// Convert the content of the node type attribute in XML to a list of node request objects.
+std::vector<NodeTypeRequest> read_node_type_requests(char const *xml_node_type_string);
+
+/// Set the node types in the passed list of subpaths according to the passed requests.
+void set_node_types(SubpathList &subpath_list, std::span<NodeTypeRequest const> requests);
+
+class NodeFactory
+{
+public:
+    NodeFactory(std::span<NodeTypeRequest const> request_sequence, PathManipulator *manipulator);
+
+    NodeFactory(NodeFactory const &) = delete;
+    NodeFactory &operator=(NodeFactory const &) = delete;
+
+    /**
+     * Create the initial node at the beginning of a path
+     */
+    std::unique_ptr<Node> createInitialNode(Geom::Path const &path);
+
+    /**
+     * Create a new node at the endpoint of the passed curve,
+     * consuming one element of the node type request sequence.
+     */
+    std::unique_ptr<Node> createNextNode(Geom::Curve const &preceding_curve);
+
+    /**
+     * Create a node controlling an elliptical arc. The node will be placed at the endpoint
+     * of the passed curve, and the elliptical arc will attempt to approximate the curve,
+     * or will be a semicircle if the curve is a straight line.
+     */
+    std::unique_ptr<Node> createArcEndpointNode(Geom::Curve const &curve);
+
+private:
+    NodeTypeRequest _getNextRequest();
+
+    PathManipulator *_manipulator = nullptr;
+    NodeSharedData _shared_data;
+    std::span<NodeTypeRequest const> _requests;
+    unsigned _pos = 0;
+    bool _always_create_elliptical_arcs = false;
+};
+} // namespace UI
+} // namespace Inkscape
+
+#endif
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
\ No newline at end of file
diff --git a/src/ui/tool/node-types.h b/src/ui/tool/node-types.h
index bad6a5c52c6443faf8bdf95d3e45d29897378d37..2a9b2af5412b1b6407abf9d4183beef35f584b9c 100644
--- a/src/ui/tool/node-types.h
+++ b/src/ui/tool/node-types.h
@@ -27,9 +27,11 @@ enum NodeType {
 };
 
 /** Types of segments supported in the node tool. */
-enum SegmentType {
-    SEGMENT_STRAIGHT, ///< Straight linear segment
-    SEGMENT_CUBIC_BEZIER ///< Bezier curve with two control points
+enum SegmentType
+{
+    SEGMENT_STRAIGHT,     ///< Straight linear segment
+    SEGMENT_CUBIC_BEZIER, ///< Bezier curve with two control points
+    SEGMENT_ELLIPTICAL,   ///< Elliptical arc segment
 };
 
 enum class AlignTargetNode {
@@ -40,6 +42,57 @@ enum class AlignTargetNode {
     MAX_NODE
 };
 
+/// Characters used in the sodipodi:nodetype and LPE-related nodetype XML attributes
+enum class XmlNodeType : char
+{
+    AUTO = 'a',
+    BOGUS = 'b',
+    CUSP = 'c',
+    ELLIPSE_MODIFIER = 'e',
+    SMOOTH = 's',
+    SYMMETRIC = 'z',
+};
+
+inline constexpr XmlNodeType encode_node_type(NodeType type)
+{
+    switch (type) {
+        case NODE_CUSP:
+            return XmlNodeType::CUSP;
+
+        case NODE_SMOOTH:
+            return XmlNodeType::SMOOTH;
+
+        case NODE_AUTO:
+            return XmlNodeType::AUTO;
+
+        case NODE_SYMMETRIC:
+            return XmlNodeType::SYMMETRIC;
+
+        default:
+            return XmlNodeType::BOGUS;
+    }
+}
+
+inline constexpr NodeType decode_node_type(XmlNodeType xml_type)
+{
+    switch (xml_type) {
+        case XmlNodeType::AUTO:
+            return NODE_AUTO;
+
+        case XmlNodeType::CUSP:
+            return NODE_CUSP;
+
+        case XmlNodeType::SMOOTH:
+            return NODE_SMOOTH;
+
+        case XmlNodeType::SYMMETRIC:
+            return NODE_SYMMETRIC;
+
+        default:
+            return NODE_PICK_BEST;
+    }
+}
+
 } // namespace UI
 } // namespace Inkscape
 
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 360fcf79485c6f530f8b90d2212540606471c053..f0bd8b9a00c62126869585deae09dc223abc06cb 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -21,7 +21,9 @@
 #include "object/sp-namedview.h"
 #include "snap.h"
 #include "ui/modifiers.h"
+#include "ui/tool/bezier-curve-handler.h"
 #include "ui/tool/control-point-selection.h"
+#include "ui/tool/elliptical-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/tools/node-tool.h"
 #include "ui/widget/events/canvas-event.h"
@@ -129,6 +131,11 @@ bool are_collinear_within_serializing_error(const Geom::Point &A, const Geom::Po
     return Geom::are_near(C_reflect_scaled, A, tolerance_C_reflect_scaled + tolerance_A);
 }
 
+/// Compute a unit vector in the direction from first to second control point
+Geom::Point direction(Geom::Point const &first, Geom::Point const &second)
+{
+    return Geom::unit_vector(second - first);
+}
 } // namespace
 
 namespace Inkscape {
@@ -140,30 +147,7 @@ const double DEFAULT_START_POWER = 1.0 / 3.0;
 
 std::ostream &operator<<(std::ostream &out, NodeType type)
 {
-    switch (type) {
-        case NODE_CUSP:
-            out << 'c';
-            break;
-        case NODE_SMOOTH:
-            out << 's';
-            break;
-        case NODE_AUTO:
-            out << 'a';
-            break;
-        case NODE_SYMMETRIC:
-            out << 'z';
-            break;
-        default:
-            out << 'b';
-            break;
-    }
-    return out;
-}
-
-/** Computes an unit vector of the direction from first to second control point */
-static Geom::Point direction(Geom::Point const &first, Geom::Point const &second)
-{
-    return Geom::unit_vector(second - first);
+    return out << static_cast<char>(encode_node_type(type));
 }
 
 Geom::Point Handle::_saved_other_pos(0, 0);
@@ -295,16 +279,8 @@ void Handle::setPosition(Geom::Point const &p)
     _handle_line->set_coords(_parent->position(), position());
 
     // update degeneration info and visibility
-    if (Geom::are_near(position(), _parent->position()))
-        _degenerate = true;
-    else
-        _degenerate = false;
-
-    if (_parent->_handles_shown && _parent->visible() && !_degenerate) {
-        setVisible(true);
-    } else {
-        setVisible(false);
-    }
+    _degenerate = Geom::are_near(position(), _parent->position());
+    setVisible(!_degenerate && _parent->areHandlesVisible());
 }
 
 void Handle::setLength(double len)
@@ -829,6 +805,9 @@ void Node::move(Geom::Point const &new_pos)
             nextNode->back()->setPosition(_pm()._bsplineHandleReposition(nextNode->back(), nextNodeWeight));
         }
     }
+    if (nextNode) {
+        nextNode->notifyPrecedingNodeUpdate(*this);
+    }
     Inkscape::UI::Tools::sp_update_helperpath(_desktop);
 }
 
@@ -856,6 +835,10 @@ void Node::transform(Geom::Affine const &m)
     _front.setPosition(_front.position() * m);
     _back.setPosition(_back.position() * m);
 
+    if (nextNode) {
+        nextNode->notifyPrecedingNodeUpdate(*this);
+    }
+
     // move the involved handles. First the node ones, later the adjoining ones.
     if (_pm()._isBSpline()) {
         _front.setPosition(_pm()._bsplineHandleReposition(this->front(), nodeWeight));
@@ -971,6 +954,12 @@ void Node::showHandles(bool v)
     }
 }
 
+bool Node::isPrecedingSegmentStraight() const
+{
+    auto const *previous_node = _prev();
+    return previous_node && _back.isDegenerate() && previous_node->_front.isDegenerate();
+}
+
 void Node::updateHandles()
 {
     _handleControlStyling();
@@ -979,6 +968,23 @@ void Node::updateHandles()
     _back._handleControlStyling();
 }
 
+void Node::writeSegment(Geom::PathSink &output, Node const &previous) const
+{
+    if (_back.isDegenerate() && previous._front.isDegenerate()) {
+        // NOTE: It seems like the renderer cannot correctly handle vline / hline segments,
+        // and trying to display a path using them results in funny artifacts.
+        output.lineTo(position());
+    } else {
+        // The preceding segment is a Bezier curve
+        output.curveTo(previous._front.position(), _back.position(), position());
+    }
+}
+
+std::unique_ptr<CurveHandler> Node::createEventHandlerForPrecedingCurve()
+{
+    return std::make_unique<BezierCurveHandler>(_pm()._isBSpline());
+}
+
 void Node::setType(NodeType type, bool update_handles)
 {
     if (type == NODE_PICK_BEST) {
@@ -1100,6 +1106,34 @@ void Node::setType(NodeType type, bool update_handles)
     updateState();
 }
 
+void Node::changePrecedingSegmentType(SegmentType new_type, Node &preceding_node)
+{
+    if (new_type == SEGMENT_STRAIGHT) {
+        if (isPrecedingSegmentStraight()) {
+            return; // Nothing to do
+        }
+        preceding_node.front()->move(preceding_node.position());
+        _back.move(position());
+    } else if (new_type == SEGMENT_CUBIC_BEZIER) {
+        if (!preceding_node.front()->isDegenerate() || !_back.isDegenerate()) {
+            return; // Nothing to do
+        }
+
+        // move both handles to 1/3 of the line
+        auto const prev_pos = preceding_node.position();
+        auto const this_pos = position();
+        preceding_node.front()->move(Geom::lerp(1.0 / 3.0, prev_pos, this_pos));
+        _back.move(Geom::lerp(2.0 / 3.0, prev_pos, this_pos));
+    } else if (new_type == SEGMENT_ELLIPTICAL) {
+        Geom::CubicBezier const current_bezier{preceding_node.position(), preceding_node.front()->position(),
+                                               _back.position(), position()};
+        preceding_node.front()->retract();
+        _back.retract();
+        auto replacement_node = _pm().createNodeFactory().createArcEndpointNode(current_bezier);
+        std::move(*this)._replace(replacement_node.release());
+    }
+}
+
 void Node::pickBestType()
 {
     _type = NODE_CUSP;
@@ -1152,22 +1186,6 @@ void Node::sink()
     _canvas_item_ctrl->lower_to_bottom();
 }
 
-NodeType Node::parse_nodetype(char x)
-{
-    switch (x) {
-        case 'a':
-            return NODE_AUTO;
-        case 'c':
-            return NODE_CUSP;
-        case 's':
-            return NODE_SMOOTH;
-        case 'z':
-            return NODE_SYMMETRIC;
-        default:
-            return NODE_PICK_BEST;
-    }
-}
-
 bool Node::_eventHandler(Tools::ToolBase *event_context, CanvasEvent const &event)
 {
     int dir = 0;
@@ -1607,6 +1625,11 @@ Node *Node::nodeAwayFrom(Handle *h)
     return nullptr;
 }
 
+void Node::_replace(Node *replacement) &&
+{
+    ln_list->replace(NodeList::get_iterator(this), replacement);
+}
+
 Glib::ustring Node::_getTip(unsigned state) const
 {
     bool isBSpline = _pm()._isBSpline();
@@ -1793,6 +1816,26 @@ NodeList::iterator NodeList::insert(iterator pos, Node *x)
     return iterator(x);
 }
 
+void NodeList::replace(iterator pos, Node *replacement)
+{
+    assert(replacement);
+    Node *to_replace = static_cast<Node *>(pos._node);
+    bool const was_selected = to_replace->selected();
+
+    ListNode *prev = to_replace->ln_prev;
+    ListNode *next = to_replace->ln_next;
+
+    to_replace->_pm().hideDragPoint();
+    delete to_replace;
+
+    prev->ln_next = replacement;
+    next->ln_prev = replacement;
+    replacement->ln_prev = prev;
+    replacement->ln_next = next;
+    replacement->ln_list = this;
+    replacement->select(was_selected);
+}
+
 void NodeList::splice(iterator pos, NodeList &list)
 {
     splice(pos, list, list.begin(), list.end());
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 792d5991bdf72f2c236906f7df30f1b1021810bd..7909182c7a09cc8f0ec4675fff430477201e819a 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -31,6 +31,7 @@ class CanvasItemCurve;
 
 namespace UI {
 
+class CurveHandler;
 class PathManipulator;
 class MultiPathManipulator;
 
@@ -49,14 +50,7 @@ struct ListNode
     NodeList *ln_list;
 };
 
-struct NodeSharedData
-{
-    SPDesktop *desktop;
-    ControlPointSelection *selection;
-    Inkscape::CanvasItemGroup *node_group;
-    Inkscape::CanvasItemGroup *handle_group;
-    Inkscape::CanvasItemGroup *handle_line_group;
-};
+struct NodeSharedData;
 
 class Handle : public ControlPoint
 {
@@ -139,6 +133,9 @@ public:
 
     NodeType type() const { return _type; }
 
+    /// Write a textual representation of the node type to an output stream
+    virtual void writeType(std::ostream &output_stream) const { output_stream << _type; }
+
     /**
      * Sets the node type and optionally restores the invariants associated with the given type.
      * @param type The type to set.
@@ -147,12 +144,23 @@ public:
      *                       and when making cusp nodes during some node algorithms.
      *                       Pass true when used in response to an UI node type button.
      */
-    void setType(NodeType type, bool update_handles = true);
+    virtual void setType(NodeType type, bool update_handles);
+
+    virtual void showHandles(bool v);
 
-    void showHandles(bool v);
+    /// Create a CurveHandler object which can process events such as drag on the curve segment before the node.
+    virtual std::unique_ptr<CurveHandler> createEventHandlerForPrecedingCurve();
 
+    /// \todo: Create a BezierNode class deriving from Node and move all functionality related to handles there.
     void updateHandles();
 
+    virtual bool handlesAllowedOnPrecedingSegment() const { return true; }
+
+    virtual bool areHandlesVisible() const { return visible() && _handles_shown; }
+
+    /// Notify this node that the previous node in the path underwent an update.
+    virtual void notifyPrecedingNodeUpdate(Node & /* previous_node */) {}
+
     /**
      * Pick the best type for this node, based on the position of its handles.
      * This is what assigns types to nodes created using the pen tool.
@@ -160,6 +168,10 @@ public:
     void pickBestType(); // automatically determine the type from handle positions
 
     bool isDegenerate() const { return _front.isDegenerate() && _back.isDegenerate(); }
+    virtual bool isPrecedingSegmentStraight() const;
+
+    virtual void changePrecedingSegmentType(SegmentType new_type, Node &preceding_node);
+
     bool isEndNode() const;
     Handle *front() { return &_front; }
     Handle *back()  { return &_back;  }
@@ -188,7 +200,10 @@ public:
      */
     Node *nodeAwayFrom(Handle *h);
 
-    NodeList &nodeList() { return *(static_cast<ListNode*>(this)->ln_list); }
+    /// Append the preceding curve segment to a path sink.
+    virtual void writeSegment(Geom::PathSink &output, Node const &previous) const;
+
+    NodeList &nodeList() { return *(static_cast<ListNode *>(this)->ln_list); }
     NodeList &nodeList() const { return *(static_cast<ListNode const*>(this)->ln_list); }
 
     /**
@@ -197,7 +212,6 @@ public:
      */
     void sink();
 
-    static NodeType parse_nodetype(char x);
     static char const *node_type_to_localized_string(NodeType type);
 
     // temporarily public
@@ -215,6 +229,11 @@ protected:
     Glib::ustring _getTip(unsigned state) const override;
     Glib::ustring _getDragTip(MotionEvent const &event) const override;
     bool _hasDragTips() const override { return true; }
+    inline PathManipulator &_pm();
+    inline PathManipulator &_pm() const;
+
+    /// Destroy this node and replace it with another one.
+    void _replace(Node *replacement) &&;
 
 private:
     void _updateAutoHandles();
@@ -231,8 +250,6 @@ private:
     Node const *_prev() const;
     Inkscape::SnapSourceType _snapSourceType() const;
     Inkscape::SnapTargetType _snapTargetType() const;
-    inline PathManipulator &_pm();
-    inline PathManipulator &_pm() const;
 
     /** Determine whether two nodes are joined by a linear segment. */
     static bool _is_line_segment(Node *first, Node *second);
@@ -388,6 +405,9 @@ public:
     /** insert a node before pos. */
     iterator insert(iterator pos, Node *x);
 
+    /// Replace the node at a given position with a new one
+    void replace(iterator pos, Node *replacement);
+
     template <class InputIterator>
     void insert(iterator pos, InputIterator first, InputIterator last) {
         for (; first != last; ++first) insert(pos, *first);
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 4ce04aa5ae30c1c3ed5c043d52579e36cb88800f..6c90e9d8b11dd5dfaf486c362cada1a4e8bcb3dd 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -11,36 +11,37 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "ui/tool/path-manipulator.h"
+
 #include <2geom/bezier-utils.h>
+#include <2geom/forward.h>
 #include <2geom/path-sink.h>
 #include <2geom/point.h>
-
+#include <optional>
+#include <string_view>
 #include <utility>
 #include <vector>
 
-#include "display/curve.h"
 #include "display/control/canvas-item-bpath.h"
-
-#include <2geom/forward.h>
+#include "display/curve.h"
 #include "helper/geom.h"
-
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-bspline.h"
+#include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpeobject.h"
 #include "live_effects/parameter/path.h"
-
 #include "object/sp-path.h"
+#include "path/splinefit/bezier-fit.h"
+#include "remove-elliptical-arcs.h"
 #include "style.h"
-
 #include "ui/icon-names.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/curve-drag-point.h"
+#include "ui/tool/elliptical-arc-end-node.h"
 #include "ui/tool/multi-path-manipulator.h"
+#include "ui/tool/node-factory.h"
 #include "ui/tool/node-types.h"
-#include "ui/tool/path-manipulator.h"
 #include "ui/tools/node-tool.h"
 #include "ui/widget/events/canvas-event.h"
-#include "path/splinefit/bezier-fit.h"
 #include "xml/node-observer.h"
 
 namespace Inkscape::UI {
@@ -53,10 +54,44 @@ enum PathChange {
     PATH_CHANGE_TRANSFORM
 };
 
+/// Remove empty paths from a path vector.
+void sanitize_path_vector(Geom::PathVector &pathvector)
+{
+    for (auto it = pathvector.begin(); it != pathvector.end();) {
+        if (it->empty()) {
+            it = pathvector.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
+
+enum class BezierHandleType
+{
+    INITIAL,
+    FINAL
+};
+
+std::optional<Geom::Point> compute_handle_position(Geom::BezierCurve const *bezier, BezierHandleType type)
+{
+    if (!bezier || bezier->order() != 3) {
+        return {};
+    }
+    return bezier->controlPoint(type == BezierHandleType::INITIAL ? 1 : 2);
+}
+
+void set_handle_position(Handle *handle, std::optional<Geom::Point> const &position)
+{
+    if (handle && position) {
+        handle->setPosition(*position);
+    }
+}
+
+constexpr double BSPLINE_TOL = 0.001;
+constexpr double NO_POWER = 0.0;
+constexpr double DEFAULT_START_POWER = 1.0 / 3.0;
+
 } // anonymous namespace
-static constexpr double BSPLINE_TOL = 0.001;
-static constexpr double NO_POWER = 0.0;
-static constexpr double DEFAULT_START_POWER = 1.0/3.0;
 
 /**
  * Notifies the path manipulator when something changes the path being edited
@@ -104,7 +139,6 @@ private:
     bool _blocked;
 };
 
-void build_segment(Geom::PathBuilder &, Node *, Node *);
 PathManipulator::PathManipulator(MultiPathManipulator &mpm, SPObject *path,
         Geom::Affine const &et, guint32 outline_color, Glib::ustring lpe_key)
     : PointManipulator(mpm._path_data.node_data.desktop, *mpm._path_data.node_data.selection)
@@ -257,6 +291,11 @@ void PathManipulator::invertSelectionInSubpaths()
     }
 }
 
+NodeFactory PathManipulator::createNodeFactory(std::span<NodeTypeRequest const> request_sequence)
+{
+    return {request_sequence, this};
+}
+
 /** Insert a new node in the middle of each selected segment. */
 void PathManipulator::insertNodes()
 {
@@ -416,7 +455,7 @@ void PathManipulator::copySelectedPath(Geom::PathBuilder *builder)
                 if (!builder->inPath() || !prev) {
                     builder->moveTo(node.position());
                 } else {
-                    build_segment(*builder, prev, &node);
+                    node.writeSegment(*builder, *prev);
                 }
                 prev = &node;
                 is_last_node = true;
@@ -428,7 +467,7 @@ void PathManipulator::copySelectedPath(Geom::PathBuilder *builder)
         // Complete the path, especially for closed sub paths where the last node is selected
         if (subpath->closed() && is_last_node) {
             if (!prev->front()->isDegenerate() || !subpath->begin()->back()->isDegenerate())   {
-                build_segment(*builder, prev, subpath->begin().ptr());
+                subpath->front().writeSegment(*builder, *prev);
             }
             // if that segment is linear, we just call closePath().
             builder->closePath();
@@ -796,11 +835,11 @@ unsigned PathManipulator::_deleteStretch(NodeList::iterator start, NodeList::ite
     } else if (mode == NodeDeleteMode::line_segment) {
         // Handle line straigtening
         if (start.prev()) {
-            start.prev()->setType(NodeType::NODE_CUSP);
+            start.prev()->setType(NodeType::NODE_CUSP, true);
             start.prev()->front()->move(start.prev()->position());
         }
         if (end) {
-            end->setType(NodeType::NODE_CUSP);
+            end->setType(NodeType::NODE_CUSP, true);
             end->back()->move(end->position());
         }
     }
@@ -910,26 +949,16 @@ void PathManipulator::reverseSubpaths(bool selected_only)
 /** Make selected segments curves / lines. */
 void PathManipulator::setSegmentType(SegmentType type)
 {
-    if (_selection.empty()) return;
-    for (auto & _subpath : _subpaths) {
-        for (NodeList::iterator j = _subpath->begin(); j != _subpath->end(); ++j) {
-            NodeList::iterator k = j.next();
-            if (!(k && j->selected() && k->selected())) continue;
-            switch (type) {
-            case SEGMENT_STRAIGHT:
-                if (j->front()->isDegenerate() && k->back()->isDegenerate())
-                    break;
-                j->front()->move(j->position());
-                k->back()->move(k->position());
-                break;
-            case SEGMENT_CUBIC_BEZIER:
-                if (!j->front()->isDegenerate() || !k->back()->isDegenerate())
-                    break;
-                // move both handles to 1/3 of the line
-                j->front()->move(j->position() + (k->position() - j->position()) / 3);
-                k->back()->move(k->position() + (j->position() - k->position()) / 3);
-                break;
+    if (_selection.empty()) {
+        return;
+    }
+    for (auto &subpath : _subpaths) {
+        for (auto node = subpath->begin(); node != subpath->end(); ++node) {
+            auto next = node.next();
+            if (!next || !node->selected() || !next->selected()) {
+                continue;
             }
+            next->changePrecedingSegmentType(type, *node);
         }
     }
 }
@@ -937,7 +966,7 @@ void PathManipulator::setSegmentType(SegmentType type)
 void PathManipulator::scaleHandle(Node *n, int which, int dir, bool pixel)
 {
     if (n->type() == NODE_SYMMETRIC || n->type() == NODE_AUTO) {
-        n->setType(NODE_SMOOTH);
+        n->setType(NODE_SMOOTH, true);
     }
     Handle *h = _chooseHandle(n, which);
     double length_change;
@@ -970,7 +999,7 @@ void PathManipulator::scaleHandle(Node *n, int which, int dir, bool pixel)
 void PathManipulator::rotateHandle(Node *n, int which, int dir, bool pixel)
 {
     if (n->type() != NODE_CUSP) {
-        n->setType(NODE_CUSP);
+        n->setType(NODE_CUSP, true);
     }
     Handle *h = _chooseHandle(n, which);
     if (h->isDegenerate()) return;
@@ -1092,7 +1121,12 @@ void PathManipulator::setControlsTransform(Geom::Affine const &tnew)
 void PathManipulator::hideDragPoint()
 {
     _dragpoint->setVisible(false);
-    _dragpoint->setIterator(NodeList::iterator());
+    _dragpoint->setIterator({});
+}
+
+NodeSharedData const &PathManipulator::getNodeSharedData() const
+{
+    return _multi_path_manipulator._path_data.node_data;
 }
 
 /** Insert a node in the segment beginning with the supplied iterator,
@@ -1115,7 +1149,10 @@ NodeList::iterator PathManipulator::subdivideSegment(NodeList::iterator first, d
     ++insert_at;
 
     NodeList::iterator inserted;
-    if (first->front()->isDegenerate() && second->back()->isDegenerate()) {
+    // TODO: refactor so that a dynamic cast is not needed.
+    if (auto *arc_endpoint = dynamic_cast<Inkscape::UI::EllipticalArcEndNode *>(second.ptr())) {
+        inserted = list.insert(insert_at, arc_endpoint->subdivideArc(t).release());
+    } else if (first->front()->isDegenerate() && second->back()->isDegenerate()) {
         // for a line segment, insert a cusp node
         Node *n = new Node(_multi_path_manipulator._path_data.node_data,
             Geom::lerp(t, first->position(), second->position()));
@@ -1265,98 +1302,83 @@ void PathManipulator::_createControlPointsFromGeometry()
 {
     clear();
 
-    // sanitize pathvector and store it in SPCurve,
-    // so that _updateDragPoint doesn't crash on paths with naked movetos
+    // XML Tree being used here directly while it shouldn't be.
+    auto const requests =
+        read_node_type_requests(_path ? _path->getRepr()->attribute(_nodetypesKey().data()) : nullptr);
+
     Geom::PathVector pathv;
     if (_is_bspline) {
         pathv = pathv_to_cubicbezier(_spcurve.get_pathvector(), false);
     } else {
-        pathv = pathv_to_linear_and_cubic_beziers(_spcurve.get_pathvector());
-    }
-    for (Geom::PathVector::iterator i = pathv.begin(); i != pathv.end(); ) {
-        // NOTE: this utilizes the fact that Geom::PathVector is an std::vector.
-        // When we erase an element, the next one slides into position,
-        // so we do not increment the iterator even though it is theoretically invalidated.
-        if (i->empty()) {
-            i = pathv.erase(i);
-        } else {
-            ++i;
-        }
+        pathv = remove_elliptical_arcs_if_not_requested(_spcurve.get_pathvector(), requests);
     }
+
+    // sanitize pathvector and store it in SPCurve,
+    // so that _updateDragPoint doesn't crash on paths with naked movetos
+    sanitize_path_vector(pathv);
     if (pathv.empty()) {
         return;
     }
     _spcurve = SPCurve(pathv);
-
     pathv *= _getTransform();
 
+    auto factory = createNodeFactory(requests);
+
     // in this loop, we know that there are no zero-segment subpaths
-    for (auto & pit : pathv) {
-        // prepare new subpath
-        SubpathPtr subpath(new NodeList(_subpaths));
+    for (auto const &geometric_path : pathv) {
+        auto subpath = std::make_shared<NodeList>(_subpaths);
         _subpaths.push_back(subpath);
 
-        Node *previous_node = new Node(_multi_path_manipulator._path_data.node_data, pit.initialPoint());
-        subpath->push_back(previous_node);
+        auto first_node_on_path = factory.createInitialNode(geometric_path);
+        Node *previous_node = first_node_on_path.get();
+        subpath->push_back(first_node_on_path.release());
 
-        bool closed = pit.closed();
+        bool const closed = geometric_path.closed();
 
-        for (Geom::Path::iterator cit = pit.begin(); cit != pit.end(); ++cit) {
-            Geom::Point pos = cit->finalPoint();
-            Node *current_node;
+        for (auto curve_it = geometric_path.begin(); curve_it != geometric_path.end(); ++curve_it) {
+            Node *current_node = nullptr;
             // if the closing segment is degenerate and the path is closed, we need to move
             // the handle of the first node instead of creating a new one
-            if (closed && cit == --(pit.end())) {
+            if (closed && curve_it == std::prev(geometric_path.end())) {
                 current_node = subpath->begin().get_pointer();
             } else {
-                /* regardless of segment type, create a new node at the end
-                 * of this segment (unless this is the last segment of a closed path
-                 * with a degenerate closing segment */
-                current_node = new Node(_multi_path_manipulator._path_data.node_data, pos);
-                subpath->push_back(current_node);
+                auto new_node = factory.createNextNode(*curve_it);
+                current_node = new_node.get();
+                subpath->push_back(new_node.release());
             }
             // if this is a bezier segment, move handles appropriately
-            // TODO: I don't know why the dynamic cast below doesn't want to work
-            //       when I replace BezierCurve with CubicBezier. Might be a bug
-            //       somewhere in pathv_to_linear_and_cubic_beziers
-            Geom::BezierCurve const *bezier = dynamic_cast<Geom::BezierCurve const*>(&*cit);
-            if (bezier && bezier->order() == 3)
-            {
-                previous_node->front()->setPosition((*bezier)[1]);
-                current_node ->back() ->setPosition((*bezier)[2]);
-            }
+            // TODO: this probably isn't the right place for this code
+            Geom::BezierCurve const *bezier = dynamic_cast<Geom::BezierCurve const *>(&*curve_it);
+            set_handle_position(previous_node->front(), compute_handle_position(bezier, BezierHandleType::INITIAL));
+            set_handle_position(current_node->back(), compute_handle_position(bezier, BezierHandleType::FINAL));
+
             previous_node = current_node;
         }
         // If the path is closed, make the list cyclic
-        if (pit.closed()) subpath->setClosed(true);
-    }
-
-    // we need to set the nodetypes after all the handles are in place,
-    // so that pickBestType works correctly
-    // TODO maybe migrate to inkscape:node-types?
-    // TODO move this into SPPath - do not manipulate directly
-
-    //XML Tree being used here directly while it shouldn't be.
-    gchar const *nts_raw = _path ? _path->getRepr()->attribute(_nodetypesKey().data()) : nullptr;
-    /* Calculate the needed length of the nodetype string.
-     * For closed paths, the entry is duplicated for the starting node,
-     * so we can just use the count of segments including the closing one
-     * to include the extra end node. */
-    /* pad the string to required length with a bogus value.
-     * 'b' and any other letter not recognized by the parser causes the best fit to be set
-     * as the node type */
-    auto const *tsi = nts_raw ? nts_raw : "";
-    for (auto & _subpath : _subpaths) {
-        for (auto & j : *_subpath) {
-            char nodetype = (*tsi) ? (*tsi++) : 'b';
-            j.setType(Node::parse_nodetype(nodetype), false);
-        }
-        if (_subpath->closed() && *tsi) {
-            // STUPIDITY ALERT: it seems we need to use the duplicate type symbol instead of
-            // the first one to remain backward compatible.
-            _subpath->begin()->setType(Node::parse_nodetype(*tsi++), false);
+        if (closed) {
+            // If the closing segment is degenerate, the first node of the subpath is at the end
+            // of the last "real" segment of the path (excluding the closing segment) and may therefore
+            // be affected by the geometry of that segment
+            if (geometric_path.size_open() && geometric_path.closingSegment().isDegenerate()) {
+                auto replacement_node = factory.createNextNode(geometric_path.back_open());
+                subpath->pop_front();
+                subpath->push_front(replacement_node.release());
+
+                // Since the node was recreated, set up its Bézier handles again
+                set_handle_position(
+                    subpath->front().front(),
+                    compute_handle_position(dynamic_cast<Geom::BezierCurve const *>(&geometric_path.front()),
+                                            BezierHandleType::INITIAL));
+                set_handle_position(
+                    subpath->front().back(),
+                    compute_handle_position(dynamic_cast<Geom::BezierCurve const *>(&geometric_path.back_open()),
+                                            BezierHandleType::FINAL));
+            }
+            subpath->setClosed(true);
         }
     }
+
+    set_node_types(_subpaths, requests);
 }
 
 //determines if the trace has a bspline effect and the number of steps that it takes
@@ -1470,14 +1492,14 @@ void PathManipulator::_createGeometryFromControlPoints(bool alert_LPE)
         NodeList::iterator prev = subpath->begin();
         builder.moveTo(prev->position());
         for (NodeList::iterator i = ++subpath->begin(); i != subpath->end(); ++i) {
-            build_segment(builder, prev.ptr(), i.ptr());
+            i->writeSegment(builder, *prev);
             prev = i;
         }
         if (subpath->closed()) {
             // Here we link the last and first node if the path is closed.
-            // If the last segment is Bezier, we add it.
-            if (!prev->front()->isDegenerate() || !subpath->begin()->back()->isDegenerate()) {
-                build_segment(builder, prev.ptr(), subpath->begin().ptr());
+            // If the last segment is not straight, we add it.
+            if (!subpath->front().isPrecedingSegmentStraight()) {
+                subpath->front().writeSegment(builder, *prev);
             }
             // if that segment is linear, we just call closePath().
             builder.closePath();
@@ -1486,16 +1508,7 @@ void PathManipulator::_createGeometryFromControlPoints(bool alert_LPE)
     }
     builder.flush();
     Geom::PathVector pathv = builder.peek() * _getTransform().inverse();
-    for (Geom::PathVector::iterator i = pathv.begin(); i != pathv.end(); ) {
-        // NOTE: this utilizes the fact that Geom::PathVector is an std::vector.
-        // When we erase an element, the next one slides into position,
-        // so we do not increment the iterator even though it is theoretically invalidated.
-        if (i->empty()) {
-            i = pathv.erase(i);
-        } else {
-            ++i;
-        }
-    }
+    sanitize_path_vector(pathv);
     if (pathv.empty()) {
         return;
     }
@@ -1524,37 +1537,24 @@ void PathManipulator::_createGeometryFromControlPoints(bool alert_LPE)
     }
 }
 
-/** Build one segment of the geometric representation.
- * @relates PathManipulator */
-void build_segment(Geom::PathBuilder &builder, Node *prev_node, Node *cur_node)
-{
-    if (cur_node->back()->isDegenerate() && prev_node->front()->isDegenerate())
-    {
-        // NOTE: It seems like the renderer cannot correctly handle vline / hline segments,
-        // and trying to display a path using them results in funny artifacts.
-        builder.lineTo(cur_node->position());
-    } else {
-        // this is a bezier segment
-        builder.curveTo(
-            prev_node->front()->position(),
-            cur_node->back()->position(),
-            cur_node->position());
-    }
-}
-
-/** Construct a node type string to store in the sodipodi:nodetypes attribute. */
+/** Construct a node type string to store in the sodipodi:nodetypes attribute.
+ *  @pre no single-node subpaths
+ */
 std::string PathManipulator::_createTypeString()
 {
-    // precondition: no single-node subpaths
-    std::stringstream tstr;
-    for (auto & _subpath : _subpaths) {
-        for (auto & j : *_subpath) {
-            tstr << j.type();
+    std::stringstream output;
+
+    for (auto const &subpath : _subpaths) {
+        for (auto const &node : *subpath) {
+            node.writeType(output);
         }
         // nodestring format peculiarity: first node is counted twice for closed paths
-        if (_subpath->closed()) tstr << _subpath->begin()->type();
+        if (subpath->closed()) {
+            subpath->begin()->writeType(output);
+        }
     }
-    return tstr.str();
+
+    return output.str();
 }
 
 /** Update the path outline. */
@@ -1650,12 +1650,10 @@ void PathManipulator::_setGeometry()
 /** Figure out in what attribute to store the nodetype string. */
 Glib::ustring PathManipulator::_nodetypesKey()
 {
-    auto lpeobj = cast<LivePathEffectObject>(_path);
-    if (!lpeobj) {
-        return "sodipodi:nodetypes";
-    } else {
+    if (is<LivePathEffectObject>(_path)) {
         return _lpe_key + "-nodetypes";
     }
+    return "sodipodi:nodetypes";
 }
 
 /** Return the XML node we are editing.
@@ -1698,7 +1696,7 @@ bool PathManipulator::_nodeClicked(Node *n, ButtonReleaseEvent const &event)
     } else if (held_ctrl(event)) {
         // Ctrl+click: cycle between node types
         if (!n->isEndNode()) {
-            n->setType(static_cast<NodeType>((n->type() + 1) % NODE_LAST_REAL_TYPE));
+            n->setType(static_cast<NodeType>((n->type() + 1) % NODE_LAST_REAL_TYPE), true);
             update();
             _commit(_("Cycle node type"));
         }
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 3818af0802e40dcc5af5b353a7d8d83d1afb3df1..883be6069078609cc82b83514c4216146a2a4fb1 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -12,14 +12,17 @@
 #ifndef INKSCAPE_UI_TOOL_PATH_MANIPULATOR_H
 #define INKSCAPE_UI_TOOL_PATH_MANIPULATOR_H
 
-#include <string>
-#include <memory>
-#include <2geom/pathvector.h>
-#include <2geom/path-sink.h>
 #include <2geom/affine.h>
-#include "ui/tool/node.h"
-#include "ui/tool/manipulator.h"
+#include <2geom/path-sink.h>
+#include <2geom/pathvector.h>
+#include <memory>
+#include <span>
+#include <string>
+
 #include "display/curve.h"
+#include "ui/tool/manipulator.h"
+#include "ui/tool/node-factory.h"
+#include "ui/tool/node.h"
 
 class SPCurve;
 class SPPath;
@@ -84,6 +87,9 @@ public:
     void selectSubpaths();
     void invertSelectionInSubpaths();
 
+    /// Create a new node factory able to produce nodes for this manipulator.
+    NodeFactory createNodeFactory(std::span<NodeTypeRequest const> request_sequence = {});
+
     void insertNodeAtExtremum(ExtremumType extremum);
     void insertNodes();
     void insertNode(Geom::Point);
@@ -111,6 +117,8 @@ public:
     void updatePath();
     void setControlsTransform(Geom::Affine const &);
     void hideDragPoint();
+    NodeSharedData const &getNodeSharedData() const;
+
     MultiPathManipulator &mpm() { return _multi_path_manipulator; }
 
     NodeList::iterator subdivideSegment(NodeList::iterator after, double t);
@@ -164,7 +172,7 @@ private:
 
     SubpathList _subpaths;
     MultiPathManipulator &_multi_path_manipulator;
-    SPObject *_path; ///< can be an SPPath or an Inkscape::LivePathEffect::Effect  !!!
+    SPObject *_path;  ///< can be an SPPath or a LivePathEffectObject
     SPCurve _spcurve; // in item coordinates
     CanvasItemPtr<Inkscape::CanvasItemBpath> _outline;
     CurveDragPoint *_dragpoint; // an invisible control point hovering over curve
diff --git a/src/ui/tool/remove-elliptical-arcs.cpp b/src/ui/tool/remove-elliptical-arcs.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..15c8c0cb4fb40df66449a1b9050907f7b3a4470b
--- /dev/null
+++ b/src/ui/tool/remove-elliptical-arcs.cpp
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Convert elliptical arcs to Béziers if elliptical arcs are unwelcome
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2025 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "remove-elliptical-arcs.h"
+
+#include <2geom/bezier-curve.h>
+#include <2geom/curve.h>
+#include <2geom/elliptical-arc.h>
+#include <2geom/pathvector.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <span>
+#include <tuple>
+
+namespace Inkscape::UI {
+
+Geom::PathVector remove_elliptical_arcs_if_not_requested(Geom::PathVector pathvector_to_convert,
+                                                         std::span<NodeTypeRequest const> requested_node_types)
+{
+    if (requested_node_types.empty()) {
+        return pathvector_to_convert; // By default, we do not kill arcs
+    }
+
+    auto const is_ellipse_requested = [&requested_node_types](auto &it) {
+        return it == requested_node_types.end() || (it++)->elliptical_arc_requested;
+    };
+
+    Geom::PathVector result;
+    auto iterator = requested_node_types.begin();
+
+    for (auto const &path : pathvector_to_convert) {
+        result.push_back(Geom::Path(path.initialPoint()));
+        auto &current_path = result.back();
+        current_path.setStitching(true);
+
+        std::ignore = is_ellipse_requested(iterator); // Ignore the first request on a path
+        for (auto curve_it = path.begin(); curve_it != path.end_open(); ++curve_it) {
+            if (!is_ellipse_requested(iterator) && dynamic_cast<Geom::EllipticalArc const *>(&*curve_it)) {
+                // convert this arc to a Bézier path
+                auto bezier_path = Geom::cubicbezierpath_from_sbasis(curve_it->toSBasis(), 0.1);
+                bezier_path.close(false);
+                current_path.append(bezier_path);
+            } else {
+                current_path.append(*curve_it);
+            }
+        }
+        current_path.close(path.closed());
+    }
+    return result;
+}
+} // namespace Inkscape::UI
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
\ No newline at end of file
diff --git a/src/ui/tool/remove-elliptical-arcs.h b/src/ui/tool/remove-elliptical-arcs.h
new file mode 100644
index 0000000000000000000000000000000000000000..0db3518929f297bca54249881096521b2e7d7ea6
--- /dev/null
+++ b/src/ui/tool/remove-elliptical-arcs.h
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Convert elliptical arcs to Béziers if elliptical arcs are unwelcome
+ */
+/* Authors:
+ *   Rafał M. Siejakowski <rs@rs-math.net>
+ *
+ * Copyright (C) 2025 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_TOOL_CURVE_CONVERTER_H
+#define INKSCAPE_UI_TOOL_CURVE_CONVERTER_H
+
+#include <2geom/pathvector.h>
+#include <span>
+
+#include "node-factory.h"
+
+namespace Inkscape::UI {
+
+/**
+ * Convert elliptical arcs in a PathVector to Bézier curves if the corresponding node type request for the
+ * Node Tool does not call for the creation of elliptical arc controls.
+ *
+ * This preserves the historical behaviour of the Node Tool on old SVG documents (which do not have the character
+ * 'e' in the sodipodi:nodetypes attribute) and after an ellipse is converted to a path manually.
+ */
+Geom::PathVector remove_elliptical_arcs_if_not_requested(Geom::PathVector pathvector_to_convert,
+                                                         std::span<NodeTypeRequest const> requested_node_types);
+
+} // namespace Inkscape::UI
+
+#endif
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
\ No newline at end of file
diff --git a/src/ui/toolbar/node-toolbar.cpp b/src/ui/toolbar/node-toolbar.cpp
index 586c7d9847ed4a2f43d20958a468f19217ba523a..3a675e5f550f0e73d92af8cd53cf8dfdf39aed91 100644
--- a/src/ui/toolbar/node-toolbar.cpp
+++ b/src/ui/toolbar/node-toolbar.cpp
@@ -89,50 +89,31 @@ NodeToolbar::NodeToolbar(Glib::RefPtr<Gtk::Builder> const &builder)
     get_widget<Gtk::Box>(builder, "unit_menu_box").append(*unit_menu);
 
     // Attach the signals.
-
-    get_widget<Gtk::Button>(builder, "insert_node_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_add));
-
-    setup_insert_node_menu();
-
-    get_widget<Gtk::Button>(builder, "delete_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_delete));
-
-    get_widget<Gtk::Button>(builder, "join_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_join));
-    get_widget<Gtk::Button>(builder, "break_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_break));
-
-    get_widget<Gtk::Button>(builder, "join_segment_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_join_segment));
-    get_widget<Gtk::Button>(builder, "delete_segment_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_delete_segment));
-
-    get_widget<Gtk::Button>(builder, "cusp_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_cusp));
-    get_widget<Gtk::Button>(builder, "smooth_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_smooth));
-    get_widget<Gtk::Button>(builder, "symmetric_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_symmetrical));
-    get_widget<Gtk::Button>(builder, "auto_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_auto));
-
-    get_widget<Gtk::Button>(builder, "line_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_toline));
-    get_widget<Gtk::Button>(builder, "curve_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &NodeToolbar::edit_tocurve));
+    static constexpr struct
+    {
+        char const *button_id;
+        void (NodeToolbar::*callback)();
+    } button_mapping[] = {
+        {"insert_node_btn", &NodeToolbar::edit_add},
+        {"delete_btn", &NodeToolbar::edit_delete},
+        {"join_btn", &NodeToolbar::edit_join},
+        {"break_btn", &NodeToolbar::edit_break},
+        {"join_segment_btn", &NodeToolbar::edit_join_segment},
+        {"delete_segment_btn", &NodeToolbar::edit_delete_segment},
+        {"cusp_btn", &NodeToolbar::edit_cusp},
+        {"smooth_btn", &NodeToolbar::edit_smooth},
+        {"symmetric_btn", &NodeToolbar::edit_symmetrical},
+        {"auto_btn", &NodeToolbar::edit_auto},
+        {"line_btn", &NodeToolbar::edit_toline},
+        {"curve_btn", &NodeToolbar::edit_tocurve},
+        {"arc_btn", &NodeToolbar::edit_toarc},
+    };
+
+    for (auto const &button_info : button_mapping) {
+        get_widget<Gtk::Button>(builder, button_info.button_id)
+            .signal_clicked()
+            .connect(sigc::mem_fun(*this, button_info.callback));
+    }
 
     _pusher_show_outline = std::make_unique<SimplePrefPusher>(_show_helper_path_btn, "/tools/nodes/show_outline");
     _show_helper_path_btn->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &NodeToolbar::on_pref_toggled),
@@ -454,6 +435,13 @@ void NodeToolbar::edit_tocurve()
     }
 }
 
+void NodeToolbar::edit_toarc()
+{
+    if (auto nt = get_node_tool()) {
+        nt->_multipath->setSegmentType(SEGMENT_ELLIPTICAL);
+    }
+}
+
 void NodeToolbar::on_pref_toggled(Gtk::ToggleButton *item, Glib::ustring const &path)
 {
     Preferences::get()->setBool(path, item->get_active());
diff --git a/src/ui/toolbar/node-toolbar.h b/src/ui/toolbar/node-toolbar.h
index 1518dc70613f6549d29d184d7fc9deb907060616..b17dd1a8094e9a4e28483e6655fbcd6d2ccb9f3c 100644
--- a/src/ui/toolbar/node-toolbar.h
+++ b/src/ui/toolbar/node-toolbar.h
@@ -114,6 +114,7 @@ private:
     void edit_auto();
     void edit_toline();
     void edit_tocurve();
+    void edit_toarc();
     void on_pref_toggled(Gtk::ToggleButton *item, Glib::ustring const &path);
 
     void setup_derived_spin_button(UI::Widget::SpinButton &btn, Glib::ustring const &name);