diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 7a923a526d..94666cc0e8 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -408,7 +408,7 @@ gfig_dialog (GimpGfig *gfig)
                      _("Copy"), _("Copy an object"));
   add_toggle_button (toolbar, "app.shape::delete", GFIG_ICON_DELETE_OBJECT,
                      _("Delete"), _("Delete an object"));
-  add_toggle_button (toolbar, "app.shape::select", GFIG_ICON_SELECT_OBJECT,
+  add_toggle_button (toolbar, "app.shape::select", GIMP_ICON_CURSOR,
                      _("Select"), _("Select an object"));
   add_tool_separator (toolbar, FALSE);
   add_tool_button (toolbar, "app.raise", GIMP_ICON_GO_UP,
diff --git a/plug-ins/gfig/gfig-icons.h b/plug-ins/gfig/gfig-icons.h
index 4022a33e84..ac6bde0d38 100644
--- a/plug-ins/gfig/gfig-icons.h
+++ b/plug-ins/gfig/gfig-icons.h
@@ -36,7 +36,6 @@
 #define GFIG_ICON_MOVE_POINT     "gfig-move-point"
 #define GFIG_ICON_POLYGON        "gfig-polygon"
 #define GFIG_ICON_RECTANGLE      "gfig-rectangle"
-#define GFIG_ICON_SELECT_OBJECT  "gfig-select-object"
 #define GFIG_ICON_SHOW_ALL       "gfig-show-all"
 #define GFIG_ICON_SPIRAL         "gfig-spiral"
 #define GFIG_ICON_STAR           "gfig-star"
diff --git a/plug-ins/gfig/images/gfig-bezier.svg b/plug-ins/gfig/images/gfig-bezier.svg
new file mode 100644
index 0000000000..24cbfa50f3
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-bezier.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-bezier.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="16.854167"
+     inkscape:cx="23.673671"
+     inkscape:cy="19.372064"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-bezier"
+     id="g1">
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.3609394,16.969098 c 1.9257395,-3.593677 3.7307634,-9.0439595 8.0692216,-4.390606 2.310204,2.477884 5.388462,-1.02313 7.208899,-5.7552534"
+       id="path2"
+       sodipodi:nodetypes="csc"
+       inkscape:label="bezier outline" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.776267,16.375773 c 1.9257395,-3.593677 3.3154358,-8.4506345 7.653894,-3.797281 2.310204,2.477884 5.299464,-0.07381 6.763906,-4.9839308"
+       id="path1"
+       sodipodi:nodetypes="csc"
+       inkscape:label="bezier" />
+    <path
+       id="rect1-4-6-9-9"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:1.974;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 1.318,16.323368 h 3.705195 c 0,0 0,0.21504 0,0.482153 v 2.740891 c 0,0.267113 0,0.482153 0,0.482153 H 1.318 c 0,0 0,-0.21504 0,-0.482153 v -2.740891 c 0,-0.267113 0,-0.482153 0,-0.482153 z m 16.103832,-2.117429 h 3.705195 c 0,0 0,0.215041 0,0.482153 v 2.740891 c 0,0.267113 0,0.482154 0,0.482154 h -3.705195 c 0,0 0,-0.215041 0,-0.482154 v -2.740891 c 0,-0.267112 0,-0.482153 0,-0.482153 z M 19.326653,4.1775093 h 3.705196 c 0,0 0,0.2150404 0,0.482153 v 2.740891 c 0,0.267113 0,0.482153 0,0.482153 h -3.705196 c 0,0 0,-0.21504 0,-0.482153 v -2.740891 c 0,-0.2671126 0,-0.482153 0,-0.482153 z M 4.5491476,5.4074208 h 3.7051955 c 0,0 0,0.2150404 0,0.482153 v 2.740891 c 0,0.2671127 0,0.4821531 0,0.4821531 H 4.5491476 c 0,0 0,-0.2150404 0,-0.4821531 v -2.740891 c 0,-0.2671126 0,-0.482153 0,-0.482153 z"
+       inkscape:label="points outline" />
+    <path
+       id="rect1-4-1-6"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.631879;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 1.3179395,16.323028 h 3.705196 c 0,0 0,0.215041 0,0.482153 v 2.740891 c 0,0.267113 0,0.482153 0,0.482153 h -3.705196 c 0,0 0,-0.21504 0,-0.482153 v -2.740891 c 0,-0.267112 0,-0.482153 0,-0.482153 z M 17.421771,14.2056 h 3.705196 c 0,0 0,0.21504 0,0.482153 v 2.740891 c 0,0.267112 0,0.482152 0,0.482152 h -3.705196 c 0,0 0,-0.21504 0,-0.482152 v -2.740891 c 0,-0.267113 0,-0.482153 0,-0.482153 z M 19.326592,4.1771695 h 3.705196 c 0,0 0,0.2150404 0,0.482153 v 2.7408908 c 0,0.267113 0,0.482152 0,0.482152 h -3.705196 c 0,0 0,-0.215039 0,-0.482152 V 4.6593225 c 0,-0.2671126 0,-0.482153 0,-0.482153 z M 4.5490874,5.407081 H 8.254283 c 0,0 0,0.2150404 0,0.482153 v 2.740891 c 0,0.2671126 0,0.4821523 0,0.4821523 H 4.5490874 c 0,0 0,-0.2150397 0,-0.4821523 V 5.889234 c 0,-0.2671126 0,-0.482153 0,-0.482153 z"
+       inkscape:label="points" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-circle.svg b/plug-ins/gfig/images/gfig-circle.svg
new file mode 100644
index 0000000000..bf148b6774
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-circle.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-circle.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="16.854167"
+     inkscape:cx="23.495674"
+     inkscape:cy="10.828183"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-circle"
+     id="g1">
+    <path
+       id="path3"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:3.096;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       inkscape:label="circle-outline"
+       d="M 16.284044,4.0637144 C 14.926461,3.2822819 13.476578,2.9301233 11.910156,2.9296875 6.9665416,2.9296418 2.9589388,6.9372446 2.9589844,11.880859 c -4.59e-5,4.943615 4.007557,8.951218 8.9511716,8.951172 4.943615,4.6e-5 8.951218,-4.007557 8.951172,-8.951172 -9.87e-4,-1.826187 -0.708853,-3.667714 -1.751847,-5.166754"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       id="path2"
+       style="fill:none;stroke:#000000;stroke-width:1.263;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       inkscape:label="circle"
+       d="M 11.910156 2.9296875 A 8.9510889 8.9510889 0 0 0 2.9589844 11.880859 A 8.9510889 8.9510889 0 0 0 11.910156 20.832031 A 8.9510889 8.9510889 0 0 0 20.861328 11.880859 A 8.9510889 8.9510889 0 0 0 19.257812 6.7734375 L 16.373047 6.7734375 L 16.373047 6.3183594 L 16.373047 4.1230469 A 8.9510889 8.9510889 0 0 0 11.910156 2.9296875 z " />
+    <path
+       id="rect1-4-6-9"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.196;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 10.264811,10.288297 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="middle-point-outline" />
+    <path
+       id="rect1-4-1"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 10.264724,10.287976 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="middle-point" />
+    <path
+       id="rect1-4-6-9-5"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.496;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 16.373587,3.2784079 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="tangent-point-outline" />
+    <path
+       id="rect1-4-1-9"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 16.3735,3.2780869 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 H 16.3735 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="tangent-point" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-copy-object.svg b/plug-ins/gfig/images/gfig-copy-object.svg
new file mode 100644
index 0000000000..0dd61541ee
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-copy-object.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   sodipodi:docname="gfig-copy-object.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1">
+    <marker
+       style="overflow:visible"
+       id="Triangle"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Triangle arrow"
+       markerWidth="0.5"
+       markerHeight="0.5"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         transform="scale(0.5)"
+         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         id="path135" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="12.640625"
+     inkscape:cx="19.223733"
+     inkscape:cy="23.693449"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-copy-object"
+     id="g1">
+    <g
+       id="g2"
+       inkscape:label="gfig-line"
+       transform="translate(0.04636877,4.9472251)">
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3.12;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.4978982,4.5312518 9.3033298,16.79669"
+         id="path3"
+         inkscape:label="line-outline"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.383;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.5608196,4.6425428 9.266261,16.800282"
+         id="path1"
+         inkscape:label="line"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="rect1-4-6"
+         style="fill:none;stroke:#ffffff;stroke-width:2.56;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 8.8044077,16.818531 h 4.4772403 c 0,0 0,0.259846 0,0.582614 v 3.311992 c 0,0.322767 0,0.582615 0,0.582615 H 8.8044077 c 0,0 0,-0.259848 0,-0.582615 v -3.311992 c 0,-0.322768 0,-0.582614 0,-0.582614 z"
+         inkscape:label="bottom-endpoint-outline" />
+      <path
+         id="rect1-4"
+         style="fill:none;stroke:#e1502f;stroke-width:0.763541;stroke-linecap:round;paint-order:markers fill stroke"
+         d="m 8.8042961,16.818119 h 4.4772399 c 0,0 0,0.259847 0,0.582616 v 3.31199 c 0,0.322769 0,0.582616 0,0.582616 H 8.8042961 c 0,0 0,-0.259847 0,-0.582616 v -3.31199 c 0,-0.322769 0,-0.582616 0,-0.582616 z"
+         inkscape:label="bottom-endpoint" />
+      <path
+         id="rect1-9"
+         style="fill:none;stroke:#ffffff;stroke-width:2.56;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 1.2386312,0.76397117 h 4.4771289 c 0,0 0,0.25984083 0,0.58260303 v 3.311923 c 0,0.322762 0,0.5826029 0,0.5826029 H 1.2386312 c 0,0 0,-0.2598409 0,-0.5826029 v -3.311923 c 0,-0.3227622 0,-0.58260303 0,-0.58260303 z"
+         inkscape:label="top-endpoint-outline" />
+      <path
+         id="rect1"
+         style="fill:none;stroke:#e1502f;stroke-width:0.763524;stroke-linecap:round;paint-order:markers fill stroke"
+         d="m 1.2380445,0.76338438 h 4.4771288 c 0,0 0,0.25984082 0,0.58260292 v 3.311923 c 0,0.3227622 0,0.582603 0,0.582603 H 1.2380445 c 0,0 0,-0.2598408 0,-0.582603 v -3.311923 c 0,-0.3227621 0,-0.58260292 0,-0.58260292 z"
+         inkscape:label="top-endpoint" />
+    </g>
+    <g
+       id="g8"
+       inkscape:label="gfig-line"
+       transform="matrix(0.96985539,0,0,1.0017941,17.965601,4.9272464)">
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3.12;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.4978982,4.5312518 9.3033298,16.79669"
+         id="path2"
+         inkscape:label="line-outline"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.383;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.5608196,4.6425428 9.266261,16.800282"
+         id="path4"
+         inkscape:label="line"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path5"
+         style="fill:none;stroke:#ffffff;stroke-width:2.56;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 8.8044077,16.818531 h 4.4772403 c 0,0 0,0.259846 0,0.582614 v 3.311992 c 0,0.322767 0,0.582615 0,0.582615 H 8.8044077 c 0,0 0,-0.259848 0,-0.582615 v -3.311992 c 0,-0.322768 0,-0.582614 0,-0.582614 z"
+         inkscape:label="bottom-endpoint-outline" />
+      <path
+         id="path6"
+         style="fill:none;stroke:#e1502f;stroke-width:0.763541;stroke-linecap:round;paint-order:markers fill stroke"
+         d="m 8.8042961,16.818119 h 4.4772399 c 0,0 0,0.259847 0,0.582616 v 3.31199 c 0,0.322769 0,0.582616 0,0.582616 H 8.8042961 c 0,0 0,-0.259847 0,-0.582616 v -3.31199 c 0,-0.322769 0,-0.582616 0,-0.582616 z"
+         inkscape:label="bottom-endpoint" />
+      <path
+         id="path7"
+         style="fill:none;stroke:#ffffff;stroke-width:2.56;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 1.2386312,0.76397117 h 4.4771289 c 0,0 0,0.25984083 0,0.58260303 v 3.311923 c 0,0.322762 0,0.5826029 0,0.5826029 H 1.2386312 c 0,0 0,-0.2598409 0,-0.5826029 v -3.311923 c 0,-0.3227622 0,-0.58260303 0,-0.58260303 z"
+         inkscape:label="top-endpoint-outline" />
+      <path
+         id="path8"
+         style="fill:none;stroke:#e1502f;stroke-width:0.763524;stroke-linecap:round;paint-order:markers fill stroke"
+         d="m 1.2380445,0.76338438 h 4.4771288 c 0,0 0,0.25984082 0,0.58260292 v 3.311923 c 0,0.3227622 0,0.582603 0,0.582603 H 1.2380445 c 0,0 0,-0.2598408 0,-0.582603 v -3.311923 c 0,-0.3227621 0,-0.58260292 0,-0.58260292 z"
+         inkscape:label="top-endpoint" />
+    </g>
+    <g
+       id="g12"
+       inkscape:label="arrow"
+       transform="translate(-0.29996555,8.3461523e-5)">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.845;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         id="rect12"
+         width="7.4363413"
+         height="2.5710757"
+         x="10.402966"
+         y="15.426452"
+         rx="1.1279227e-16"
+         ry="0.42365161"
+         inkscape:label="arrow tail outline" />
+      <path
+         style="display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.216;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Triangle)"
+         d="m 10.71767,16.694 h 8.764565"
+         id="path9"
+         inkscape:label="arrow outline" />
+      <path
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Triangle)"
+         d="m 10.955,16.694 h 8.583436"
+         id="path11"
+         inkscape:label="arrow" />
+    </g>
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-curve.svg b/plug-ins/gfig/images/gfig-curve.svg
new file mode 100644
index 0000000000..980ea73ce8
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-curve.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-curve.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="33.708333"
+     inkscape:cx="17.295427"
+     inkscape:cy="11.911001"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-curve"
+     id="g1">
+    <path
+       id="path5"
+       style="fill:none;stroke:#ffffff;stroke-width:3.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 5.1619283,8.039555 C 2.1684244,10.45066 2.2556153,13.008464 2.5216316,15.574784 M 21.003708,6.4969098 c 0,0 -0.965569,-0.664106 -1.506173,-0.8767559 C 18.311344,5.1535587 17.036508,4.8989143 15.76771,4.7768011 14.374459,4.6427101 12.958271,4.7217815 11.570593,4.904751 10.432075,5.054868 8.2175525,5.6959209 8.2175525,5.6959209"
+       inkscape:label="curve-outline"
+       sodipodi:nodetypes="cccaaac" />
+    <path
+       id="path2"
+       style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"
+       d="M 5.1619283,8.039555 C 2.1684244,10.45066 2.2556153,13.008464 2.5216316,15.574784 M 20.647713,6.2002473 c 0,0 -0.746048,-0.4349759 -1.150178,-0.5800934 C 18.297874,5.1893717 17.036508,4.8989143 15.76771,4.7768011 14.374459,4.6427101 12.961157,4.7451853 11.570593,4.904751 10.588369,5.0174602 8.6625463,5.4882571 8.6625463,5.4882571"
+       inkscape:label="curve"
+       sodipodi:nodetypes="cccaaac" />
+    <path
+       id="rect1-4-6"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.196;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 1.2104227,15.288297 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="left-endpoint-outline" />
+    <path
+       id="rect1-4"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 1.2103357,15.287976 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="left-endpoint" />
+    <path
+       id="rect1-4-6-9"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.196;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 5.2784079,5.2487417 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="middle-point-outline" />
+    <path
+       id="rect1-4-1"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 5.2783209,5.2484207 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="middle-point" />
+    <path
+       id="rect1-4-6-9-5"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.196;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 19.28088,6.2277281 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 H 19.28088 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="right-endpoint-outline" />
+    <path
+       id="rect1-4-1-2"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 19.280793,6.2274071 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="right-endpoint" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-delete-object.svg b/plug-ins/gfig/images/gfig-delete-object.svg
new file mode 100644
index 0000000000..ce1e5d1fe5
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-delete-object.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-delete-object.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+    <linearGradient
+       id="linearGradient2"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#e95c13;stop-opacity:1;"
+         offset="0"
+         id="stop2" />
+      <stop
+         style="stop-color:#ab3f13;stop-opacity:1;"
+         offset="1"
+         id="stop3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2"
+       id="radialGradient3"
+       cx="5.5577965"
+       cy="13.442686"
+       fx="5.5577965"
+       fy="13.442686"
+       r="5.5955"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4695251,0.1096904,-0.08155243,1.09256,-1.8218873,-1.0565712)" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-31.466253"
+     inkscape:cy="18.605748"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g2" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-delete-object"
+     id="g1"
+     style="stroke:#ffffff;stroke-opacity:1">
+    <g
+       id="g2"
+       inkscape:label="gfig-line"
+       transform="translate(9.9262115,2.1808468)"
+       style="opacity:0.532;stroke:#ffffff;stroke-opacity:1">
+      <path
+         id="rect1-9"
+         style="stroke:#ffffff;stroke-opacity:1;opacity:1;fill:none;stroke-width:2.996;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+         inkscape:label="top-endpoint-outline"
+         d="m 1.2941,1.2941 h 3.4959812 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2941 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7490275 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z m 6.0924833,11.844404 h 3.4959807 v 0.454928 2.586126 0.454928 H 7.3865833 V 16.179558 13.593432 Z M 4.6382088,4.8380925 7.8564832,13.088119" />
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.9399834,5.5606814 7.6395903,12.318786"
+         id="path1"
+         inkscape:label="line"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="rect1-4"
+         style="fill:none;stroke:#e9421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke;opacity:1"
+         d="m 7.3864963,13.138183 h 3.4959807 v 0.454928 2.586126 0.454928 H 7.3864963 v -0.454928 -2.586126 z"
+         inkscape:label="bottom-endpoint"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         id="rect1"
+         style="fill:none;stroke:#e9421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke;fill-opacity:1;opacity:1"
+         d="M 1.2936418,1.2936418 H 4.789623 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2936418 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7485693 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+         inkscape:label="top-endpoint" />
+    </g>
+    <rect
+       style="fill:url(#radialGradient3);stroke:#000000;stroke-width:0.43399;stroke-linecap:square;stroke-miterlimit:3.3;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       id="rect2"
+       width="9.6632605"
+       height="9.6632605"
+       x="2.6167915"
+       y="11.72043"
+       rx="9.2405206e-17"
+       ry="0.40610859"
+       inkscape:label="x-box" />
+    <path
+       style="font-size:11.8981px;line-height:1.25;font-family:Avalon;-inkscape-font-specification:Avalon;letter-spacing:0px;word-spacing:0px;fill:#ffffff;stroke:none;stroke-width:0.238252"
+       d="M 4.2852316,20.13419 6.7058605,16.627137 4.2852316,13.091494 h 1.5533957 l 1.639166,2.458749 1.6868158,-2.458749 H 10.679885 L 8.2401961,16.627137 10.679885,20.13419 H 9.1646091 L 7.4777933,17.704031 5.8386273,20.13419 Z"
+       id="text3"
+       inkscape:label="x"
+       aria-label="X" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-ellipse.svg b/plug-ins/gfig/images/gfig-ellipse.svg
new file mode 100644
index 0000000000..29742be593
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-ellipse.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   sodipodi:docname="gfig-ellipse.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="8.9382717"
+     inkscape:cx="24.277624"
+     inkscape:cy="25.899862"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-ellipse"
+     id="g1">
+    <path
+       id="path3"
+       style="fill:none;stroke:#ffffff;stroke-width:3.711;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       inkscape:label="ellipse-outline"
+       d="m 27.3125,21.613281 c 1.603365,-1.683642 2.467047,-3.68278 2.476562,-5.732422 C 29.789038,10.296506 23.579611,5.7695091 15.919922,5.7695312 8.2609956,5.7702951 2.052758,10.297062 2.0527344,15.880859 c 2.27e-5,5.583797 6.2082605,10.110565 13.8671876,10.111329 3.566113,-0.0045 6.992793,-1.010368 9.568359,-2.808594"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       id="path2"
+       style="fill:none;stroke:#000000;stroke-width:1.51078;paint-order:markers fill stroke"
+       inkscape:label="ellipse"
+       d="M 15.919922 5.7695312 A 13.869085 10.111359 0 0 0 2.0527344 15.880859 A 13.869085 10.111359 0 0 0 15.919922 25.992188 A 13.869085 10.111359 0 0 0 25.488281 23.183594 L 25.488281 22.246094 L 25.488281 21.613281 L 27.3125 21.613281 A 13.869085 10.111359 0 0 0 29.789062 15.880859 A 13.869085 10.111359 0 0 0 15.919922 5.7695312 z " />
+    <path
+       id="rect1-4-6-9"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.899;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 13.605206,13.573395 h 4.852273 c 0,0 0,0.281614 0,0.631421 v 3.589433 c 0,0.349807 0,0.631421 0,0.631421 h -4.852273 c 0,0 0,-0.281614 0,-0.631421 v -3.589433 c 0,-0.349807 0,-0.631421 0,-0.631421 z"
+       inkscape:label="middle-point-outline" />
+    <path
+       id="rect1-4-1"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.8275;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 13.605086,13.57295 h 4.852273 c 0,0 0,0.281614 0,0.631421 v 3.589433 c 0,0.349807 0,0.63142 0,0.63142 h -4.852273 c 0,0 0,-0.281613 0,-0.63142 v -3.589433 c 0,-0.349807 0,-0.631421 0,-0.631421 z"
+       inkscape:label="middle-point" />
+    <path
+       id="rect1-4-6-9-3"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.899;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 25.489012,21.613857 h 4.852273 c 0,0 0,0.281614 0,0.631421 v 3.589433 c 0,0.349807 0,0.631421 0,0.631421 h -4.852273 c 0,0 0,-0.281614 0,-0.631421 v -3.589433 c 0,-0.349807 0,-0.631421 0,-0.631421 z"
+       inkscape:label="tangent-point-outline" />
+    <path
+       id="rect1-4-1-7"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.8275;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 25.488892,21.613412 h 4.852273 c 0,0 0,0.281614 0,0.631421 v 3.589433 c 0,0.349807 0,0.63142 0,0.63142 h -4.852273 c 0,0 0,-0.281613 0,-0.63142 v -3.589433 c 0,-0.349807 0,-0.631421 0,-0.631421 z"
+       inkscape:label="tangent-point" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-icon-images.gresource.xml b/plug-ins/gfig/images/gfig-icon-legacy-images.gresource.xml
similarity index 93%
rename from plug-ins/gfig/images/gfig-icon-images.gresource.xml
rename to plug-ins/gfig/images/gfig-icon-legacy-images.gresource.xml
index eef7739c69..4c3f8f636c 100644
--- a/plug-ins/gfig/images/gfig-icon-images.gresource.xml
+++ b/plug-ins/gfig/images/gfig-icon-legacy-images.gresource.xml
@@ -12,7 +12,6 @@
     <file preprocess="to-pixdata">gfig-move-point.png</file>
     <file preprocess="to-pixdata">gfig-polygon.png</file>
     <file preprocess="to-pixdata">gfig-rectangle.png</file>
-    <file preprocess="to-pixdata">gfig-select-object.png</file>
     <file preprocess="to-pixdata">gfig-show-all.png</file>
     <file preprocess="to-pixdata">gfig-spiral.png</file>
     <file preprocess="to-pixdata">gfig-star.png</file>
diff --git a/plug-ins/gfig/images/gfig-icon-scalable-images.gresource.xml b/plug-ins/gfig/images/gfig-icon-scalable-images.gresource.xml
new file mode 100644
index 0000000000..bdca46a671
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-icon-scalable-images.gresource.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gimp/gfig/icons">
+    <file>gfig-bezier.svg</file>
+    <file>gfig-circle.svg</file>
+    <file>gfig-copy-object.svg</file>
+    <file>gfig-curve.svg</file>
+    <file>gfig-delete-object.svg</file>
+    <file>gfig-ellipse.svg</file>
+    <file>gfig-line.svg</file>
+    <file>gfig-move-object.svg</file>
+    <file>gfig-move-point.svg</file>
+    <file>gfig-polygon.svg</file>
+    <file>gfig-rectangle.svg</file>
+    <file>gfig-show-all.svg</file>
+    <file>gfig-spiral.svg</file>
+    <file>gfig-star.svg</file>
+    <file preprocess="to-pixdata">gfig-logo.png</file>
+  </gresource>
+</gresources>
diff --git a/plug-ins/gfig/images/gfig-line.svg b/plug-ins/gfig/images/gfig-line.svg
new file mode 100644
index 0000000000..e3128a9a11
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-line.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-line.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="19.225908"
+     inkscape:cx="7.0737883"
+     inkscape:cy="14.537675"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g2" />
+  <g
+     id="g2"
+     inkscape:label="gfig-line">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2.412;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;opacity:1"
+       d="M 4.5934042,4.5729274 18.434029,18.45588"
+       id="path3"
+       inkscape:label="line-outline" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.7190125,4.698895 18.438107,18.459945"
+       id="path1"
+       inkscape:label="line" />
+    <path
+       id="rect1-4-6"
+       style="fill:none;stroke:#ffffff;stroke-width:1.912;stroke-linecap:round;paint-order:markers fill stroke;stroke-opacity:1;stroke-dasharray:none"
+       d="m 18.1851,18.2411 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 H 18.1851 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="bottom-endpoint-outline" />
+    <path
+       id="rect1-4"
+       style="fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;paint-order:markers fill stroke;stroke-opacity:1"
+       d="m 18.185013,18.240779 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="bottom-endpoint" />
+    <path
+       id="rect1-9"
+       style="fill:none;stroke:#ffffff;stroke-width:1.912;stroke-linecap:round;paint-order:markers fill stroke;stroke-opacity:1;stroke-dasharray:none"
+       d="m 1.2941,1.2941 h 3.4959812 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2941 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7490275 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+       inkscape:label="top-endpoint-outline" />
+    <path
+       id="rect1"
+       style="fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;paint-order:markers fill stroke;stroke-opacity:1"
+       d="M 1.2936418,1.2936418 H 4.789623 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2936418 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7485693 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+       inkscape:label="top-endpoint" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-move-object.svg b/plug-ins/gfig/images/gfig-move-object.svg
new file mode 100644
index 0000000000..1fe41176a6
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-move-object.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   sodipodi:docname="gfig-move-object.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1">
+    <marker
+       style="overflow:visible"
+       id="Triangle"
+       refX="0"
+       refY="0"
+       orient="auto-start-reverse"
+       inkscape:stockid="Triangle arrow"
+       markerWidth="0.5"
+       markerHeight="0.5"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         transform="scale(0.5)"
+         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         id="path135" />
+    </marker>
+    <linearGradient
+       id="linearGradient6">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1;"
+         offset="0"
+         id="stop98" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop99" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6-1">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1;"
+         offset="0"
+         id="stop7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="17.876543"
+     inkscape:cx="22.991022"
+     inkscape:cy="19.606699"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-move-object"
+     id="g1">
+    <g
+       id="g109"
+       inkscape:label="gfig-line-back"
+       transform="translate(18.318668,5.0327564)">
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2.412;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.5934042,4.5729274 8.334314,18.45588"
+         id="path104"
+         inkscape:label="line-outline"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.7190125,4.698895 8.338392,18.459945"
+         id="path105"
+         inkscape:label="line"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path108"
+         style="fill:none;stroke:#ffffff;stroke-width:2.512;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 1.2941,1.2941 h 3.4959812 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2941 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7490275 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+         inkscape:label="top-endpoint-outline" />
+      <path
+         id="path109"
+         style="fill:none;stroke:#df421e;stroke-width:0.996;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke;stroke-dasharray:none"
+         d="M 1.2936418,1.2936418 H 4.789623 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2936418 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7485693 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+         inkscape:label="top-endpoint" />
+    </g>
+    <path
+       id="path6"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.587;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.939619,25.698955 v -6.913519 c 0,-0.700082 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.195158,0.56753 1.193751,1.267611 l -0.0069,3.434207 -0.0069,-4.027532 c -0.0012,-0.700081 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.193465,0.567529 1.193751,1.267611 l 0.0017,4.166156 0.0017,-3.295946 c 3.61e-4,-0.700082 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.193181,0.567529 1.193751,1.267611 l 0.003,3.682634 0.003,-2.179544 c 9.64e-4,-0.700082 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.193751,0.567529 1.193751,1.267611 0,0 0.04484,1.433453 0,2.448882 -0.114057,2.582843 0.746504,7.606732 -1.390609,7.594562 -3.194396,-0.01819 -8.373424,0 -8.373424,0 0,0 -2.396126,-0.08856 -2.446186,-2.3733 -0.03062,-1.397275 -0.04755,-1.595799 0,-2.9926 0.11971,-3.514021 2.620301,-2.011 2.620301,-2.011"
+       sodipodi:nodetypes="cssscssscssscscsscsssc"
+       inkscape:label="grab outline" />
+    <path
+       id="path103"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.787;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="m 20.939619,25.698955 v -6.913519 c 0,-0.700082 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.195158,0.56753 1.193751,1.267611 l -0.0069,3.434207 -0.0069,-4.027532 c -0.0012,-0.700081 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.193465,0.567529 1.193751,1.267611 l 0.0017,4.166156 0.0017,-3.295946 c 3.61e-4,-0.700082 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.193181,0.567529 1.193751,1.267611 l 0.003,3.682634 0.003,-2.179544 c 9.64e-4,-0.700082 0.423597,-1.267611 1.193249,-1.267611 0.769652,0 1.193751,0.567529 1.193751,1.267611 0,0 0.04484,1.433453 0,2.448882 -0.114057,2.582843 0.746504,7.606732 -1.390609,7.594562 -3.194396,-0.01819 -8.373424,0 -8.373424,0 0,0 -2.396126,-0.08856 -2.446186,-2.3733 -0.03062,-1.397275 -0.04755,-1.595799 0,-2.9926 0.11971,-3.514021 2.620301,-2.011 2.620301,-2.011"
+       sodipodi:nodetypes="cssscssscssscscsscsssc"
+       inkscape:label="grab" />
+    <g
+       id="g2"
+       inkscape:label="gfig-line"
+       transform="translate(0.01889997,5.2329)"
+       style="display:inline;opacity:0.519">
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2.412;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.5934042,4.5729274 8.334314,18.45588"
+         id="path3"
+         inkscape:label="line-outline"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M 4.7190125,4.698895 8.338392,18.459945"
+         id="path1"
+         inkscape:label="line"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="rect1-4-6"
+         style="fill:none;stroke:#ffffff;stroke-width:1.912;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 8.085385,18.2411 h 3.495981 v 0.454928 2.586126 0.454928 H 8.085385 v -0.454928 -2.586126 z"
+         inkscape:label="bottom-endpoint-outline"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         id="rect1-4"
+         style="fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 8.085298,18.240779 h 3.495981 v 0.454928 2.586126 0.454928 H 8.085298 v -0.454928 -2.586126 z"
+         inkscape:label="bottom-endpoint"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         id="rect1-9"
+         style="fill:none;stroke:#ffffff;stroke-width:1.912;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+         d="m 1.2941,1.2941 h 3.4959812 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2941 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7490275 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+         inkscape:label="top-endpoint-outline" />
+      <path
+         id="rect1"
+         style="fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+         d="M 1.2936418,1.2936418 H 4.789623 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 H 1.2936418 c 0,0 0,-0.2028976 0,-0.4549274 V 1.7485693 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+         inkscape:label="top-endpoint" />
+    </g>
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Triangle)"
+       d="m 7.572,12.379 h 7.048343"
+       id="path110"
+       inkscape:label="arrow outline"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Triangle)"
+       d="M 8.2992099,12.379 H 14.620343"
+       id="path111"
+       inkscape:label="arrow" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-move-point.svg b/plug-ins/gfig/images/gfig-move-point.svg
new file mode 100644
index 0000000000..431bce109c
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-move-point.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-move-point.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1">
+    <marker
+       style="overflow:visible"
+       id="Triangle"
+       refX="0"
+       refY="0"
+       orient="auto-start-reverse"
+       inkscape:stockid="Triangle arrow"
+       markerWidth="0.5"
+       markerHeight="0.5"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         transform="scale(0.5)"
+         style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt"
+         d="M 5.77,0 -2.88,5 V -5 Z"
+         id="path135" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="16.854167"
+     inkscape:cx="2.8479604"
+     inkscape:cy="18.304079"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-move-point"
+     id="g1">
+    <path
+       style="opacity:0.591;fill:none;stroke:#ffffff;stroke-width:2.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.3226205,8.7515451 7.1199011,16.405439"
+       id="path11"
+       sodipodi:nodetypes="cc"
+       inkscape:label="faded-lines-outline" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.591"
+       d="M 3.4412855,9.0185414 7.0012361,16.108776"
+       id="path9"
+       sodipodi:nodetypes="cc"
+       inkscape:label="faded-lines" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"
+       d="M 13.527812,3.8566131 5.7849197,5.4882571"
+       id="path10"
+       inkscape:label="lines-outline" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.527812,3.8566131 5.7849197,5.4882571"
+       id="path8"
+       inkscape:label="lines" />
+    <path
+       id="path108"
+       style="fill:none;stroke:#ffffff;stroke-width:2.512;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 14.55,1.3264574 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454927 0,0.454927 H 14.55 c 0,0 0,-0.202897 0,-0.454927 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="top-endpoint-outline" />
+    <path
+       id="path109"
+       style="fill:none;stroke:#df421e;stroke-width:0.996;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 14.549542,1.3259994 h 3.495981 c 0,0 0,0.202897 0,0.454927 v 2.586127 c 0,0.252029 0,0.454927 0,0.454927 h -3.495981 c 0,0 0,-0.202898 0,-0.454927 v -2.586127 c 0,-0.25203 0,-0.454927 0,-0.454927 z"
+       inkscape:label="top-endpoint" />
+    <path
+       id="path6"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.93471;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.803586,9.5332061 V 4.362854 c 0,-0.5235642 0.316791,-0.9479971 0.892384,-0.9479971 0.575593,0 0.893812,0.4244336 0.89276,0.9479971 l -0.0052,2.5683105 -0.0052,-3.0120353 c -8.98e-4,-0.5235634 0.316792,-0.9479971 0.892385,-0.9479971 0.575592,0 0.892545,0.424433 0.892759,0.9479971 l 0.0013,3.115706 0.0013,-2.4649097 c 2.69e-4,-0.5235642 0.316791,-0.9479971 0.892384,-0.9479971 0.575593,0 0.892333,0.4244329 0.89276,0.9479971 l 0.0022,2.7540991 0.0022,-1.6299964 c 7.21e-4,-0.5235642 0.316792,-0.9479971 0.892384,-0.9479971 0.575594,0 0.892761,0.4244329 0.892761,0.9479971 0,0 0.03354,1.0720234 0,1.8314233 -0.0853,1.9316082 0.558281,5.6887795 -1.039983,5.6796795 -2.388965,-0.0136 -6.262159,0 -6.262159,0 0,0 -1.79197,-0.06622 -1.829407,-1.774899 -0.02289,-1.044968 -0.03556,-1.193437 0,-2.2380501 0.08952,-2.6279998 1.95962,-1.5039494 1.95962,-1.5039494"
+       sodipodi:nodetypes="cssscssscssscscsscsssc"
+       inkscape:label="grab outline" />
+    <path
+       id="path103"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.588567;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.803586,9.5332061 V 4.362854 c 0,-0.5235642 0.316791,-0.9479971 0.892384,-0.9479971 0.575593,0 0.893812,0.4244336 0.89276,0.9479971 l -0.0052,2.5683105 -0.0052,-3.0120353 c -8.98e-4,-0.5235634 0.316792,-0.9479971 0.892385,-0.9479971 0.575592,0 0.892545,0.424433 0.892759,0.9479971 l 0.0013,3.115706 0.0013,-2.4649097 c 2.69e-4,-0.5235642 0.316791,-0.9479971 0.892384,-0.9479971 0.575593,0 0.892333,0.4244329 0.89276,0.9479971 l 0.0022,2.7540991 0.0022,-1.6299964 c 7.21e-4,-0.5235642 0.316792,-0.9479971 0.892384,-0.9479971 0.575594,0 0.892761,0.4244329 0.892761,0.9479971 0,0 0.03354,1.0720234 0,1.8314233 -0.0853,1.9316082 0.558281,5.6887795 -1.039983,5.6796795 -2.388965,-0.0136 -6.262159,0 -6.262159,0 0,0 -1.79197,-0.06622 -1.829407,-1.774899 -0.02289,-1.044968 -0.03556,-1.193437 0,-2.2380501 0.08952,-2.6279998 1.95962,-1.5039494 1.95962,-1.5039494"
+       sodipodi:nodetypes="cssscssscssscscsscsssc"
+       inkscape:label="grab" />
+    <path
+       id="path1"
+       style="fill:none;stroke:#ffffff;stroke-width:2.512;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 1.2891842,4.5007466 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454927 0,0.454927 h -3.495981 c 0,0 0,-0.202897 0,-0.454927 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="left-endpoint-outline" />
+    <path
+       id="path2"
+       style="fill:none;stroke:#df421e;stroke-width:0.996;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 1.2887262,4.5002886 h 3.495981 c 0,0 0,0.202897 0,0.454927 v 2.586127 c 0,0.252029 0,0.454927 0,0.454927 h -3.495981 c 0,0 0,-0.202898 0,-0.454927 v -2.586127 c 0,-0.25203 0,-0.454927 0,-0.454927 z"
+       inkscape:label="left-endpoint" />
+    <path
+       id="path3"
+       style="fill:none;stroke:#ffffff;stroke-width:2.512;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 6.3621137,17.019906 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454927 0,0.454927 h -3.495981 c 0,0 0,-0.202897 0,-0.454927 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="bottom-endpoint-outline" />
+    <path
+       id="path4"
+       style="fill:none;stroke:#df421e;stroke-width:0.996;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke;opacity:0.552"
+       d="m 6.3616557,17.019448 h 3.495981 c 0,0 0,0.202897 0,0.454927 v 2.586127 c 0,0.252029 0,0.454927 0,0.454927 h -3.495981 c 0,0 0,-0.202898 0,-0.454927 v -2.586127 c 0,-0.25203 0,-0.454927 0,-0.454927 z"
+       inkscape:label="bottom-endpoint" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.985166,20.262052 15.441285,16.7466"
+       id="path12"
+       inkscape:label="arrow outline"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Triangle)"
+       d="M 11.985166,20.262052 15.441285,16.7466"
+       id="path5"
+       inkscape:label="arrow outline"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Triangle)"
+       d="M 12.341161,19.846724 15.441285,16.7466"
+       id="path7"
+       inkscape:label="arrow" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-polygon.svg b/plug-ins/gfig/images/gfig-polygon.svg
new file mode 100644
index 0000000000..108c2ce4d4
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-polygon.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-polygon.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="16.854167"
+     inkscape:cx="27.174289"
+     inkscape:cy="19.372064"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-polygon"
+     id="g1"
+     transform="matrix(0.93466551,0,0,0.93466551,1.0492884,1.0682926)">
+    <path
+       id="path4"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.45542;stroke-linecap:butt;stroke-linejoin:bevel;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.4237951,14.6616 2.8848588,19.348868 M 18.252848,6.8899325 13.862243,11.399203 M 18.423902,6.7599498 22.63651,11.239553 M 3.0186833,6.645241 7.5576203,11.332509 M 0.67504919,7.2385661 V 18.986403 M 18.252848,19.183019 13.862243,14.673748 m 4.561659,4.639253 4.212608,-4.479603"
+       inkscape:label="polygon outline"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       id="path3-6-1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.4237951,14.6616 -4.390605,4.538937 M 18.530849,6.6229362 14.140244,11.161873 m 3.898,-4.6985857 4.390605,4.5389357 M 3.1670146,6.7935723 7.5576203,11.332509 M 0.67504919,7.2385661 V 18.986403 M 18.430849,19.450015 14.040244,14.911078 m 3.998,4.698586 4.390605,-4.538936"
+       inkscape:label="polygon"
+       sodipodi:nodetypes="cccccccccccccc" />
+    <path
+       id="path1-4-0-1"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:1.93759;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       inkscape:label="middle-point-outline"
+       d="M -0.08557697,19.256158 H 3.410404 v 0.454928 2.586126 0.454928 H -0.08557697 V 22.297212 19.711086 Z M 16.48115,19.25625 h 3.495981 v 0.454928 2.586126 0.454927 H 16.48115 V 22.297304 19.711178 Z M -0.09793791,3.231 H 3.3980431 V 3.685928 6.272054 6.726982 H -0.09793791 V 6.272054 3.685928 Z m 16.56672691,9.11e-5 h 3.495981 v 0.454928 2.586126 0.454928 h -3.495981 v -0.454928 -2.586126 z m 3.593078,8.0445639 h 3.495981 v 0.454928 2.586126 0.454928 h -3.495981 v -0.454928 -2.586126 z m -7.500371,0 h 3.495981 v 0.454928 2.586126 0.454928 h -3.495981 v -0.454928 -2.586126 z m -6.134094,2.81e-4 h 3.4959809 v 0.454928 2.586126 0.454928 H 6.427402 V 14.31699 11.730864 Z"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+    <path
+       id="path2-8-9-1"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.80991541;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke;stroke-dasharray:none"
+       inkscape:label="middle-point"
+       d="M -0.08566397,19.255837 H 3.410317 v 0.454928 2.586126 0.454928 h -3.49598097 v -0.454928 -2.586126 z m 16.56672697,9.2e-5 h 3.495981 v 0.454928 2.586126 0.454927 H 16.481063 V 22.296983 19.710857 Z M -0.09802491,3.230679 H 3.3979561 V 3.685607 6.271733 6.726661 H -0.09802491 V 6.271733 3.685607 Z m 16.56672691,9.11e-5 h 3.495981 v 0.454928 2.586126 0.454928 h -3.495981 v -0.454928 -2.586126 z m 3.593078,8.0445639 h 3.495981 v 0.454928 2.586126 0.454928 H 20.06178 v -0.454928 -2.586126 z m -7.500371,0 h 3.495981 v 0.454928 2.586126 0.454928 h -3.495981 v -0.454928 -2.586126 z m -6.134094,2.81e-4 h 3.4959809 v 0.454928 2.586126 0.454928 H 6.427315 v -0.454928 -2.586126 z"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-rectangle.svg b/plug-ins/gfig/images/gfig-rectangle.svg
new file mode 100644
index 0000000000..182207fd11
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-rectangle.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   sodipodi:docname="gfig-rectangle.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xml:space="preserve"
+   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"><defs
+     id="defs1" /><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="12.640625"
+     inkscape:cx="7.3572311"
+     inkscape:cy="23.139679"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" /><g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-rectangle"
+     id="g1"><path
+       style="fill:none;stroke:#ffffff;stroke-width:3.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.5488257,6.9616811 V 26.066749 H 23.930779"
+       id="path9"
+       inkscape:label="left rectangle outline"
+       sodipodi:nodetypes="ccc" /><path
+       style="fill:none;stroke:#ffffff;stroke-width:3.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.7639061,4.7466007 H 25.908529 V 23.733004"
+       id="path10"
+       inkscape:label="right rectangle outline"
+       sodipodi:nodetypes="ccc" /><path
+       style="fill:none;stroke:#000000;stroke-width:1.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.5488257,6.9616811 V 26.066749 H 23.930779"
+       id="path8"
+       inkscape:label="left rectangle"
+       sodipodi:nodetypes="ccc" /><path
+       style="fill:none;stroke:#000000;stroke-width:1.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.7639061,4.7466007 H 25.908529 V 23.733004"
+       id="path7"
+       inkscape:label="right rectangle"
+       sodipodi:nodetypes="ccc" /><path
+       id="rect1-9-9"
+       style="fill:none;stroke:#ffffff;stroke-width:2.638;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 24.515081,24.534858 h 4.419414 c 0,0 0,0.256492 0,0.575094 v 3.269229 c 0,0.318601 0,0.575092 0,0.575092 h -4.419414 c 0,0 0,-0.256491 0,-0.575092 v -3.269229 c 0,-0.318602 0,-0.575094 0,-0.575094 z"
+       inkscape:label="bottom-endpoint-outline" /><path
+       id="rect1-2"
+       style="fill:none;stroke:#e1502f;stroke-width:0.753681;stroke-linecap:round;paint-order:markers fill stroke"
+       d="m 24.514502,24.534279 h 4.419414 c 0,0 0,0.256491 0,0.575092 v 3.269231 c 0,0.3186 0,0.575092 0,0.575092 h -4.419414 c 0,0 0,-0.256492 0,-0.575092 v -3.269231 c 0,-0.318601 0,-0.575092 0,-0.575092 z"
+       inkscape:label="bottom-endpoint" /><path
+       id="rect1-9"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.638;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 1.7944416,1.8006221 h 4.4194143 c 0,0 0,0.2564917 0,0.5750932 v 3.2692291 c 0,0.3186015 0,0.575092 0,0.575092 H 1.7944416 c 0,0 0,-0.2564905 0,-0.575092 V 2.3757153 c 0,-0.3186015 0,-0.5750932 0,-0.5750932 z"
+       inkscape:label="top-endpoint-outline" /><path
+       id="rect1"
+       style="display:inline;fill:none;stroke:#e1502f;stroke-width:0.753681;stroke-linecap:round;paint-order:markers fill stroke"
+       d="m 1.7938626,1.8000431 h 4.4194143 c 0,0 0,0.2564905 0,0.5750921 v 3.2692301 c 0,0.3186003 0,0.5750921 0,0.5750921 H 1.7938626 c 0,0 0,-0.2564918 0,-0.5750921 V 2.3751352 c 0,-0.3186016 0,-0.5750921 0,-0.5750921 z"
+       inkscape:label="top-endpoint" /></g></svg>
diff --git a/plug-ins/gfig/images/gfig-select-object.png b/plug-ins/gfig/images/gfig-select-object.png
deleted file mode 100644
index 3ac980b6bf..0000000000
Binary files a/plug-ins/gfig/images/gfig-select-object.png and /dev/null differ
diff --git a/plug-ins/gfig/images/gfig-show-all.svg b/plug-ins/gfig/images/gfig-show-all.svg
new file mode 100644
index 0000000000..f870dcbb1d
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-show-all.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-show-all.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+    <linearGradient
+       id="linearGradient6"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#6ba0d6;stop-opacity:1;"
+         offset="0"
+         id="stop8" />
+      <stop
+         style="stop-color:#7590ae;stop-opacity:1;"
+         offset="1"
+         id="stop7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#e9d799;stop-opacity:1;"
+         offset="0.19354838"
+         id="stop6" />
+      <stop
+         style="stop-color:#eed680;stop-opacity:1;"
+         offset="0.80967742"
+         id="stop5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#e56b50;stop-opacity:1;"
+         offset="0.44193548"
+         id="stop2" />
+      <stop
+         style="stop-color:#df421e;stop-opacity:1;"
+         offset="1"
+         id="stop3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2"
+       id="radialGradient4"
+       cx="11.733006"
+       cy="11.023954"
+       fx="11.733006"
+       fy="11.023954"
+       r="5.0529351"
+       gradientTransform="matrix(1.3432991,0.57580728,-0.54288051,1.2664842,-5.370805,-10.200928)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5"
+       id="radialGradient6"
+       cx="4.8890553"
+       cy="6.9959869"
+       fx="4.8890553"
+       fy="6.9959869"
+       r="5.3401848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.39447393,0.76662957,-0.88919,0.45753814,18.591291,-1.5497669)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6"
+       id="radialGradient8"
+       cx="13.323902"
+       cy="11.319039"
+       fx="13.323902"
+       fy="11.319039"
+       r="5.4710051"
+       gradientTransform="matrix(0.30292124,0.76788674,-0.77505514,0.30574908,18.807215,-3.589517)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Feather"
+       id="filter39"
+       x="-0.06211304"
+       y="-0.065416655"
+       width="1.1242261"
+       height="1.1308333">
+      <feGaussianBlur
+         stdDeviation="0.04"
+         result="blur"
+         id="feGaussianBlur37" />
+      <feComposite
+         in="SourceGraphic"
+         in2="blur"
+         operator="atop"
+         result="composite1"
+         id="feComposite37" />
+      <feComposite
+         in2="composite1"
+         operator="in"
+         result="composite2"
+         id="feComposite38" />
+      <feComposite
+         in2="composite2"
+         operator="in"
+         result="fbSourceGraphic"
+         id="feComposite39" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix52" />
+      <feGaussianBlur
+         id="feGaussianBlur52"
+         stdDeviation="0.44"
+         result="blur"
+         in="fbSourceGraphic" />
+      <feComposite
+         id="feComposite52"
+         in="fbSourceGraphic"
+         in2="blur"
+         operator="atop"
+         result="composite1" />
+      <feComposite
+         id="feComposite53"
+         in2="composite1"
+         operator="in"
+         result="composite2" />
+      <feComposite
+         id="feComposite54"
+         in2="composite2"
+         operator="in"
+         result="composite3" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="23.835391"
+     inkscape:cx="16.907631"
+     inkscape:cy="13.446392"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-show-all"
+     id="g1">
+    <path
+       id="path15"
+       style="fill:#969696;fill-opacity:1;stroke:none;stroke-width:0.892;stroke-linecap:square;stroke-miterlimit:3.3;stroke-dasharray:none;stroke-opacity:0.180672;paint-order:markers fill stroke;filter:url(#filter39)"
+       inkscape:label="shadow"
+       inkscape:transform-center-x="0.14478161"
+       inkscape:transform-center-y="-1.0924862"
+       d="m 21.979367,21.036994 -11.277233,0.0042 5.634979,-9.76847 z M 3.976,8.5686824 h 9.344871 c 0,0 0,0.1976693 0,0.4432046 v 9.348448 c 0,0.245536 0,0.443205 0,0.443205 H 3.976 c 0,0 0,-0.197669 0,-0.443205 V 9.011887 c 0,-0.2455353 0,-0.4432046 0,-0.4432046 z M 22.52283,8.3906849 A 4.9596848,4.9596848 0 0 1 17.563144,13.35037 4.9596848,4.9596848 0 0 1 12.603459,8.3906849 4.9596848,4.9596848 0 0 1 17.563144,3.431 4.9596848,4.9596848 0 0 1 22.52283,8.3906849 Z"
+       transform="matrix(1.0583515,0,0,1,-1.7170983,0)" />
+    <circle
+       style="fill:url(#radialGradient6);stroke:#000000;stroke-width:0.761;stroke-linecap:square;stroke-miterlimit:3.3;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path4"
+       cx="15.663782"
+       cy="7.0902348"
+       r="4.9596848"
+       inkscape:label="circle" />
+    <rect
+       style="fill:url(#radialGradient4);stroke:#000000;stroke-width:0.761;stroke-linecap:square;stroke-miterlimit:3.3;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       id="rect1"
+       width="9.3448706"
+       height="10.234858"
+       x="2.0766385"
+       y="7.2682323"
+       rx="1.0019313e-16"
+       ry="0.44320479"
+       inkscape:label="rectangle" />
+    <path
+       sodipodi:type="star"
+       style="fill:url(#radialGradient8);stroke:#000000;stroke-width:0.761;stroke-linecap:square;stroke-miterlimit:3.3;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path6"
+       inkscape:flatsided="true"
+       sodipodi:sides="3"
+       sodipodi:cx="14.684796"
+       sodipodi:cy="12.637824"
+       sodipodi:r1="5.5555269"
+       sodipodi:r2="1.6605293"
+       sodipodi:arg1="0.52322634"
+       sodipodi:arg2="1.5704239"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 19.497058,15.413795 -9.6224541,0.0036 4.8081231,-8.3350813 z"
+       inkscape:transform-center-x="0.13679859"
+       inkscape:transform-center-y="-1.0924862"
+       transform="matrix(1.1719705,0,0,1.1719705,-2.7699719,1.6720305)"
+       inkscape:label="triangle" />
+    <path
+       id="rect10"
+       style="stroke-width:0.816751;stroke-linecap:square;stroke-miterlimit:3.3;paint-order:markers fill stroke"
+       inkscape:label="dots"
+       d="m 20.944376,21.1 h 2.255 c 0,0 0,0.227656 0,0.51044 v 1.234121 c 0,0.282783 0,0.510439 0,0.510439 h -2.255 c 0,0 0,-0.227656 0,-0.510439 V 21.61044 c 0,-0.282784 0,-0.51044 0,-0.51044 z m -20.91470975,0 H 2.2846664 c 0,0 0,0.227656 0,0.51044 v 1.234121 c 0,0.282783 0,0.510439 0,0.510439 H 0.02966625 c 0,0 0,-0.227656 0,-0.510439 V 21.61044 c 0,-0.282784 0,-0.51044 0,-0.51044 z M 20.944376,0 h 2.255 c 0,0 0,0.22765605 0,0.51043957 V 1.7445605 c 0,0.2827836 0,0.5104396 0,0.5104396 h -2.255 c 0,0 0,-0.227656 0,-0.5104396 V 0.51043957 c 0,-0.28278352 0,-0.51043957 0,-0.51043957 z M 0.02966625,0 H 2.2846664 c 0,0 0,0.22765605 0,0.51043957 V 1.7445605 c 0,0.2827836 0,0.5104396 0,0.5104396 H 0.02966625 c 0,0 0,-0.227656 0,-0.5104396 V 0.51043957 c 0,-0.28278352 0,-0.51043957 0,-0.51043957 z" />
+    <path
+       id="path13"
+       style="fill:none;stroke:#969696;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 0.584,20.424089 V 2.832 m 21.9,17.592089 V 2.832 M 2.811,22.564 H 20.403089 M 2.811,0.664 h 17.592089"
+       inkscape:label="grey dots" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-spiral.svg b/plug-ins/gfig/images/gfig-spiral.svg
new file mode 100644
index 0000000000..76f67b0a30
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-spiral.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="gfig-spiral.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="16.854167"
+     inkscape:cx="26.343634"
+     inkscape:cy="18.422744"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-spiral"
+     id="g1">
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:3.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"
+       d="M 8.1878863,5.5475896 H 20.499382 V 18.571075 H 4.4202719 V 8.5735476 H 17.384425 V 15.485785 H 7.2682324 v -3.708282 h 3.4709516"
+       id="path2"
+       inkscape:label="path outline"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8.1878863,5.5475896 H 20.499382 V 18.571075 H 4.4202719 V 8.5735476 H 17.384425 V 15.485785 H 7.2682324 v -3.708282 h 3.4709516"
+       id="path1"
+       inkscape:label="path"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="rect1-9-1"
+       style="fill:none;stroke:#ffffff;stroke-width:1.896;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 11.249978,10.284588 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454928 0,0.454928 h -3.495981 c 0,0 0,-0.202898 0,-0.454928 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="bottom-endpoint-outline" />
+    <path
+       id="rect1-2"
+       style="fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 11.24952,10.28413 h 3.495981 c 0,0 0,0.202898 0,0.454928 v 2.586126 c 0,0.25203 0,0.454927 0,0.454927 H 11.24952 c 0,0 0,-0.202897 0,-0.454927 v -2.586126 c 0,-0.25203 0,-0.454928 0,-0.454928 z"
+       inkscape:label="bottom-endpoint" />
+    <path
+       id="rect1-9"
+       style="fill:none;stroke:#ffffff;stroke-width:1.896;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 4.1461459,3.1943535 h 3.495981 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 h -3.495981 c 0,0 0,-0.2028976 0,-0.4549274 V 3.649281 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+       inkscape:label="top-endpoint-outline" />
+    <path
+       id="rect1"
+       style="fill:none;stroke:#df421e;stroke-width:0.5962;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 4.1456879,3.1938953 h 3.495981 c 0,0 0,0.2028976 0,0.4549275 v 2.5861263 c 0,0.2520298 0,0.4549274 0,0.4549274 h -3.495981 c 0,0 0,-0.2028976 0,-0.4549274 V 3.6488228 c 0,-0.2520299 0,-0.4549275 0,-0.4549275 z"
+       inkscape:label="top-endpoint" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/gfig-star.svg b/plug-ins/gfig/images/gfig-star.svg
new file mode 100644
index 0000000000..e68854465a
--- /dev/null
+++ b/plug-ins/gfig/images/gfig-star.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   sodipodi:docname="gfig-star.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   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">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="17.876544"
+     inkscape:cx="5.0345303"
+     inkscape:cy="14.739986"
+     inkscape:window-width="1920"
+     inkscape:window-height="1002"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="gfig-star"
+     id="g1">
+    <path
+       id="path4"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:1.75065893;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       inkscape:label="star-outline"
+       inkscape:transform-center-x="0.0049860422"
+       inkscape:transform-center-y="-0.94468262"
+       d="M 13.556378,3.8393195 11.755642,3.8392454 10.05581,0.02685273 8.4012925,3.8392454 H 4.790155 L 7.8877174,6.2820579 6.4869666,10.066668 10.05581,7.8759571 13.715284,10.066668 12.241021,6.2820579 13.607936,5.1232305"
+       transform="matrix(1.9395291,0,0,1.8981067,-3.4429887,5.4685619)"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       id="path3"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.812527;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:markers fill stroke"
+       inkscape:label="star"
+       inkscape:transform-center-x="0.0049860422"
+       inkscape:transform-center-y="-0.94468262"
+       d="M 13.814172,3.8390273 11.755642,3.8392454 10.05581,0.02685273 8.4012925,3.8392454 H 4.790155 L 7.8877174,6.2820579 6.4869666,10.066668 10.05581,7.8759571 13.715284,10.066668 12.241021,6.2820579 13.814172,4.9651782"
+       transform="matrix(1.9395291,0,0,1.8981067,-3.4429887,5.4685619)"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       id="rect1-4-6-9"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.524;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 13.653955,13.694955 h 4.650272 c 0,0 0,0.269891 0,0.605135 v 3.440004 c 0,0.335245 0,0.605135 0,0.605135 h -4.650272 c 0,0 0,-0.26989 0,-0.605135 V 14.30009 c 0,-0.335244 0,-0.605135 0,-0.605135 z"
+       inkscape:label="middle-point-outline" />
+    <path
+       id="rect1-4-1"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.793051;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 13.554067,13.694528 h 4.650272 c 0,0 0,0.269891 0,0.605135 v 3.440004 c 0,0.335245 0,0.605135 0,0.605135 h -4.650272 c 0,0 0,-0.26989 0,-0.605135 v -3.440004 c 0,-0.335244 0,-0.605135 0,-0.605135 z"
+       inkscape:label="middle-point" />
+    <path
+       id="rect1-4-6-9-3"
+       style="display:inline;fill:none;stroke:#ffffff;stroke-width:2.524;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 23.348955,10.946009 h 4.650272 c 0,0 0,0.269891 0,0.605135 v 3.440004 c 0,0.335245 0,0.605135 0,0.605135 h -4.650272 c 0,0 0,-0.26989 0,-0.605135 v -3.440004 c 0,-0.335244 0,-0.605135 0,-0.605135 z"
+       inkscape:label="tangent-point-outline" />
+    <path
+       id="rect1-4-1-0"
+       style="display:inline;fill:none;stroke:#df421e;stroke-width:0.793051;stroke-linecap:round;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 23.34884,10.945582 h 4.650272 c 0,0 0,0.269891 0,0.605135 v 3.440004 c 0,0.335245 0,0.605135 0,0.605135 H 23.34884 c 0,0 0,-0.26989 0,-0.605135 v -3.440004 c 0,-0.335244 0,-0.605135 0,-0.605135 z"
+       inkscape:label="tangent-point" />
+  </g>
+</svg>
diff --git a/plug-ins/gfig/images/meson.build b/plug-ins/gfig/images/meson.build
index 4131d683cb..2539f7064c 100644
--- a/plug-ins/gfig/images/meson.build
+++ b/plug-ins/gfig/images/meson.build
@@ -1,24 +1,31 @@
+icon_type = 'scalable'
+icon_format = 'svg'
+
+if not have_vector_icons
+  icon_type = 'legacy'
+  icon_format = 'png'
+endif
+
 stock_icons = [
-  'gfig-bezier.png',
-  'gfig-circle.png',
-  'gfig-copy-object.png',
-  'gfig-curve.png',
-  'gfig-delete-object.png',
-  'gfig-ellipse.png',
-  'gfig-line.png',
+  'gfig-bezier.' + icon_format,
+  'gfig-circle.' + icon_format,
+  'gfig-copy-object.' + icon_format,
+  'gfig-curve.' + icon_format,
+  'gfig-delete-object.' + icon_format,
+  'gfig-ellipse.' + icon_format,
+  'gfig-line.' + icon_format,
   'gfig-logo.png',
-  'gfig-move-object.png',
-  'gfig-move-point.png',
-  'gfig-polygon.png',
-  'gfig-rectangle.png',
-  'gfig-select-object.png',
-  'gfig-show-all.png',
-  'gfig-spiral.png',
-  'gfig-star.png',
+  'gfig-move-object.' + icon_format,
+  'gfig-move-point.' + icon_format,
+  'gfig-polygon.' + icon_format,
+  'gfig-rectangle.' + icon_format,
+  'gfig-show-all.' + icon_format,
+  'gfig-spiral.' + icon_format,
+  'gfig-star.' + icon_format,
 ]
 
 gfig_icon_sources = gnome.compile_resources(
   'gfig-icon-images',
-  'gfig-icon-images.gresource.xml',
+  'gfig-icon-' + icon_type + '-images.gresource.xml',
   # source_dir: meson.current_source_directory(),
 )