diff --git a/assets/icons/editor/delete.png b/assets/icons/editor-dark/actions/48/delete.png
similarity index 100%
rename from assets/icons/editor/delete.png
rename to assets/icons/editor-dark/actions/48/delete.png
diff --git a/assets/icons/editor/drag.png b/assets/icons/editor-dark/actions/48/drag.png
similarity index 100%
rename from assets/icons/editor/drag.png
rename to assets/icons/editor-dark/actions/48/drag.png
diff --git a/assets/icons/editor/new.png b/assets/icons/editor-dark/actions/48/new.png
similarity index 100%
rename from assets/icons/editor/new.png
rename to assets/icons/editor-dark/actions/48/new.png
diff --git a/assets/icons/editor/open.png b/assets/icons/editor-dark/actions/48/open.png
similarity index 100%
rename from assets/icons/editor/open.png
rename to assets/icons/editor-dark/actions/48/open.png
diff --git a/assets/icons/editor/save.png b/assets/icons/editor-dark/actions/48/save.png
similarity index 100%
rename from assets/icons/editor/save.png
rename to assets/icons/editor-dark/actions/48/save.png
diff --git a/assets/icons/editor/snap05.png b/assets/icons/editor-dark/actions/48/snap05.png
similarity index 100%
rename from assets/icons/editor/snap05.png
rename to assets/icons/editor-dark/actions/48/snap05.png
diff --git a/assets/icons/editor/snap1.png b/assets/icons/editor-dark/actions/48/snap1.png
similarity index 100%
rename from assets/icons/editor/snap1.png
rename to assets/icons/editor-dark/actions/48/snap1.png
diff --git a/assets/icons/editor/snapoff.png b/assets/icons/editor-dark/actions/48/snapoff.png
similarity index 100%
rename from assets/icons/editor/snapoff.png
rename to assets/icons/editor-dark/actions/48/snapoff.png
diff --git a/assets/icons/editor-dark/actions/48/surface-glue.png b/assets/icons/editor-dark/actions/48/surface-glue.png
new file mode 100644
index 0000000..1816199
Binary files /dev/null and b/assets/icons/editor-dark/actions/48/surface-glue.png differ
diff --git a/assets/icons/editor-dark/actions/48/surface-inlets.png b/assets/icons/editor-dark/actions/48/surface-inlets.png
new file mode 100644
index 0000000..f104a81
Binary files /dev/null and b/assets/icons/editor-dark/actions/48/surface-inlets.png differ
diff --git a/assets/icons/editor-dark/actions/48/surface-smooth.png b/assets/icons/editor-dark/actions/48/surface-smooth.png
new file mode 100644
index 0000000..1cc151d
Binary files /dev/null and b/assets/icons/editor-dark/actions/48/surface-smooth.png differ
diff --git a/assets/icons/editor-dark/actions/48/surface-studs.png b/assets/icons/editor-dark/actions/48/surface-studs.png
new file mode 100644
index 0000000..ff50f64
Binary files /dev/null and b/assets/icons/editor-dark/actions/48/surface-studs.png differ
diff --git a/assets/icons/editor-dark/actions/48/surface-universal.png b/assets/icons/editor-dark/actions/48/surface-universal.png
new file mode 100644
index 0000000..2ffab08
Binary files /dev/null and b/assets/icons/editor-dark/actions/48/surface-universal.png differ
diff --git a/assets/icons/editor-dark/actions/48/surface-weld.png b/assets/icons/editor-dark/actions/48/surface-weld.png
new file mode 100644
index 0000000..63d7cfb
Binary files /dev/null and b/assets/icons/editor-dark/actions/48/surface-weld.png differ
diff --git a/assets/icons/editor-dark/index.theme b/assets/icons/editor-dark/index.theme
new file mode 100644
index 0000000..57ec3e6
--- /dev/null
+++ b/assets/icons/editor-dark/index.theme
@@ -0,0 +1,8 @@
+[Icon Theme]
+Name=editor-dark
+Comment=icon theme (dark)
+
+[actions/48]
+Size=48
+Context=Actions
+Type=Fixed
diff --git a/assets/icons/editor/actions/48/delete.png b/assets/icons/editor/actions/48/delete.png
new file mode 100644
index 0000000..08f2493
Binary files /dev/null and b/assets/icons/editor/actions/48/delete.png differ
diff --git a/assets/icons/editor/actions/48/drag.png b/assets/icons/editor/actions/48/drag.png
new file mode 100644
index 0000000..532f532
Binary files /dev/null and b/assets/icons/editor/actions/48/drag.png differ
diff --git a/assets/icons/editor/actions/48/new.png b/assets/icons/editor/actions/48/new.png
new file mode 100644
index 0000000..8b8b1ca
Binary files /dev/null and b/assets/icons/editor/actions/48/new.png differ
diff --git a/assets/icons/editor/actions/48/open.png b/assets/icons/editor/actions/48/open.png
new file mode 100644
index 0000000..1ef6e11
Binary files /dev/null and b/assets/icons/editor/actions/48/open.png differ
diff --git a/assets/icons/editor/actions/48/save.png b/assets/icons/editor/actions/48/save.png
new file mode 100644
index 0000000..caea546
Binary files /dev/null and b/assets/icons/editor/actions/48/save.png differ
diff --git a/assets/icons/editor/actions/48/snap05.png b/assets/icons/editor/actions/48/snap05.png
new file mode 100644
index 0000000..17e732b
Binary files /dev/null and b/assets/icons/editor/actions/48/snap05.png differ
diff --git a/assets/icons/editor/actions/48/snap1.png b/assets/icons/editor/actions/48/snap1.png
new file mode 100644
index 0000000..d96eba1
Binary files /dev/null and b/assets/icons/editor/actions/48/snap1.png differ
diff --git a/assets/icons/editor/actions/48/snapoff.png b/assets/icons/editor/actions/48/snapoff.png
new file mode 100644
index 0000000..374ddfe
Binary files /dev/null and b/assets/icons/editor/actions/48/snapoff.png differ
diff --git a/assets/icons/editor/actions/48/surface-glue.png b/assets/icons/editor/actions/48/surface-glue.png
new file mode 100644
index 0000000..de9b08a
Binary files /dev/null and b/assets/icons/editor/actions/48/surface-glue.png differ
diff --git a/assets/icons/editor/actions/48/surface-inlets.png b/assets/icons/editor/actions/48/surface-inlets.png
new file mode 100644
index 0000000..1c6ab4e
Binary files /dev/null and b/assets/icons/editor/actions/48/surface-inlets.png differ
diff --git a/assets/icons/editor/actions/48/surface-smooth.png b/assets/icons/editor/actions/48/surface-smooth.png
new file mode 100644
index 0000000..0089f69
Binary files /dev/null and b/assets/icons/editor/actions/48/surface-smooth.png differ
diff --git a/assets/icons/editor/actions/48/surface-studs.png b/assets/icons/editor/actions/48/surface-studs.png
new file mode 100644
index 0000000..32ff2ed
Binary files /dev/null and b/assets/icons/editor/actions/48/surface-studs.png differ
diff --git a/assets/icons/editor/actions/48/surface-universal.png b/assets/icons/editor/actions/48/surface-universal.png
new file mode 100644
index 0000000..f45a248
Binary files /dev/null and b/assets/icons/editor/actions/48/surface-universal.png differ
diff --git a/assets/icons/editor/actions/48/surface-weld.png b/assets/icons/editor/actions/48/surface-weld.png
new file mode 100644
index 0000000..f52ca49
Binary files /dev/null and b/assets/icons/editor/actions/48/surface-weld.png differ
diff --git a/assets/icons/editor/index.theme b/assets/icons/editor/index.theme
new file mode 100644
index 0000000..de0a031
--- /dev/null
+++ b/assets/icons/editor/index.theme
@@ -0,0 +1,8 @@
+[Icon Theme]
+Name=editor
+Comment=icon theme
+
+[actions/48]
+Size=48
+Context=Actions
+Type=Fixed
diff --git a/assets/src/glue.svg b/assets/src/glue.svg
new file mode 100644
index 0000000..1d28cb6
--- /dev/null
+++ b/assets/src/glue.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="../icons/editor/weld.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
+   sodipodi:docname="glue.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="32"
+     inkscape:cx="2.4375"
+     inkscape:cy="10.25"
+     inkscape:window-width="1920"
+     inkscape:window-height="1008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showguides="true">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0.5"
+       originy="0.5"
+       spacingx="1"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1"
+         width="10"
+         height="10"
+         x="2.5"
+         y="2.5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,2.5 2,2"
+         id="path1"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.5,12.5 2,2"
+         id="path3"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.8592944,7.0236254 c -1.213294,1.0424696 -1,1.7243022 -0.234375,1.7243022 -0.017005,3.5315634 2.2303514,1.8633974 3.234375,1 2.7742076,1.7680844 3.5903366,0.4332984 2,-1.248699 2.4102876,-1.0931787 0.4460256,-4.39491 -1,-2.751301 C 8.5061317,2.1238839 6.180487,5.3900806 6.5155444,4.5916776 4.7251975,3.6478829 4.0183403,5.4550835 4.8592944,7.0236254 Z"
+       id="path18"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/assets/src/inlets.svg b/assets/src/inlets.svg
new file mode 100644
index 0000000..0fcf518
--- /dev/null
+++ b/assets/src/inlets.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="../icons/editor/studs.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
+   sodipodi:docname="inlets.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="22.627417"
+     inkscape:cx="9.3691648"
+     inkscape:cy="12.772116"
+     inkscape:window-width="1920"
+     inkscape:window-height="1008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0.5"
+       originy="0.5"
+       spacingx="1"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1"
+         width="10"
+         height="10"
+         x="2.5"
+         y="2.5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,2.5 2,2"
+         id="path1"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.5,12.5 2,2"
+         id="path3"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="g3-3"
+       transform="matrix(-0.5,0,0,-0.5,11.75,11.75)"
+       style="stroke-width:2;stroke-dasharray:none" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10.5,4.5 h -6 v 6 h 6 z"
+       id="path4"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.5,6.5 -2,-2"
+       id="path5" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.5,10.5 v -4 h 4"
+       id="path6" />
+  </g>
+</svg>
diff --git a/assets/src/smooth.svg b/assets/src/smooth.svg
new file mode 100644
index 0000000..e4faded
--- /dev/null
+++ b/assets/src/smooth.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="../icons/editor/studs.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
+   sodipodi:docname="smooth.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="32.252323"
+     inkscape:cx="12.650252"
+     inkscape:cy="8.4335011"
+     inkscape:window-width="1920"
+     inkscape:window-height="1008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0.5"
+       originy="0.5"
+       spacingx="1"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1"
+         width="10"
+         height="10"
+         x="2.5"
+         y="2.5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,2.5 2,2"
+         id="path1"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.5,12.5 2,2"
+         id="path3"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/src/studs.svg b/assets/src/studs.svg
new file mode 100644
index 0000000..10af373
--- /dev/null
+++ b/assets/src/studs.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="studs.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
+   sodipodi:docname="studs.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="32.252323"
+     inkscape:cx="12.650252"
+     inkscape:cy="8.4024956"
+     inkscape:window-width="1920"
+     inkscape:window-height="1008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0.5"
+       originy="0.5"
+       spacingx="1"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1"
+         width="10"
+         height="10"
+         x="2.5"
+         y="2.5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,2.5 2,2"
+         id="path1"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.5,12.5 2,2"
+         id="path3"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="g3-3"
+       transform="matrix(0.5,0,0,0.5,3.25,3.25)"
+       style="stroke-width:2;stroke-dasharray:none">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1-5"
+         width="10"
+         height="10"
+         x="2.5"
+         y="2.5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,2.5 2,2"
+         id="path1-6"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2-2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.5,12.5 2,2"
+         id="path3-9"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/src/universal.svg b/assets/src/universal.svg
new file mode 100644
index 0000000..49440dc
--- /dev/null
+++ b/assets/src/universal.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="../icons/editor/studs.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
+   sodipodi:docname="universal.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="45.254834"
+     inkscape:cx="9.7448153"
+     inkscape:cy="5.3033009"
+     inkscape:window-width="1920"
+     inkscape:window-height="1008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showguides="true">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="1"
+       originy="1"
+       spacingx="0.25"
+       spacingy="0.25"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" />
+    <sodipodi:guide
+       position="3.5,5.5"
+       orientation="-0.70710678,-0.70710678"
+       id="guide13"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="3.5,4.5"
+       orientation="0.70710678,-0.70710678"
+       id="guide14"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="11,12"
+       orientation="-0.70710678,-0.70710678"
+       id="guide15"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1"
+         width="10"
+         height="10"
+         x="2.5"
+         y="2.5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,2.5 2,2"
+         id="path1"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.5,12.5 2,2"
+         id="path3"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="g3-3"
+       transform="matrix(0.5,0,0,0.5,3.25,3.25)"
+       style="display:inline;stroke-width:2;stroke-dasharray:none">
+      <path
+         style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+         d="m 12.5,12.5 h -8 z"
+         id="rect1-5"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 13.5,3.5 1,1"
+         id="path1-6"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2-2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 3.5,13.5 1,1"
+         id="path3-9"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 v -8"
+         id="path9" />
+    </g>
+    <g
+       id="g6"
+       style="display:inline">
+      <path
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 10.5,4.5 h -6 v 6"
+         id="path4"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 6.5,6.5 -2,-2"
+         id="path5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 6.5,8.5 v -2 h 2"
+         id="path6"
+         sodipodi:nodetypes="ccc" />
+    </g>
+    <path
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.863301,4.1698442 4.25,10.75"
+       id="path10"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/assets/src/weld.svg b/assets/src/weld.svg
new file mode 100644
index 0000000..99e70d5
--- /dev/null
+++ b/assets/src/weld.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="../icons/editor/studs.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
+   sodipodi:docname="weld.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="45.611673"
+     inkscape:cx="6.6211122"
+     inkscape:cy="6.40187"
+     inkscape:window-width="1920"
+     inkscape:window-height="1008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0.5"
+       originy="0.5"
+       spacingx="1"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1"
+         width="10"
+         height="10"
+         x="2.5"
+         y="2.5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,2.5 2,2"
+         id="path1"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.5,12.5 2,2"
+         id="path2"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.5,12.5 2,2"
+         id="path3"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+       d="m 4.5,4.5 2,2"
+       id="path4" />
+    <path
+       style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+       d="m 8.5,6.5 2,-2"
+       id="path5" />
+    <path
+       style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+       d="m 8.5,8.5 2,2"
+       id="path6" />
+    <path
+       style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+       d="m 6.5,8.5 -2,2"
+       id="path7" />
+  </g>
+</svg>
diff --git a/editor/mainwindow.cpp b/editor/mainwindow.cpp
index a020f25..9befed7 100644
--- a/editor/mainwindow.cpp
+++ b/editor/mainwindow.cpp
@@ -15,6 +15,7 @@
 #include <optional>
 #include <qcoreapplication.h>
 #include <qglobal.h>
+#include <qguiapplication.h>
 #include <qicon.h>
 #include <qmessagebox.h>
 #include <qnamespace.h>
@@ -22,6 +23,7 @@
 #include <reactphysics3d/engine/PhysicsCommon.h>
 #include <reactphysics3d/engine/PhysicsWorld.h>
 #include <sstream>
+#include <QStyleHints>
 
 #include "common.h"
 #include "editorcommon.h"
@@ -45,6 +47,19 @@ bool simulationPlaying = false;
 
 bool worldSpaceTransforms = false;
 
+inline bool isDarkMode() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    const auto scheme = QGuiApplication::styleHints()->colorScheme();
+    return scheme == Qt::ColorScheme::Dark;
+#else
+    const QPalette defaultPalette;
+    const auto text = defaultPalette.color(QPalette::WindowText);
+    const auto window = defaultPalette.color(QPalette::Window);
+    return text.lightness() > window.lightness();
+#endif // QT_VERSION
+}
+    
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
@@ -55,6 +70,14 @@ MainWindow::MainWindow(QWidget *parent)
     timer.start(33, this);
     setMouseTracking(true);
 
+    // https://stackoverflow.com/a/78854851/16255372
+    QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() + QStringList { "./assets/icons" });
+    if (isDarkMode())
+        QIcon::setFallbackThemeName("editor-dark");
+    else
+        QIcon::setFallbackThemeName("editor");
+    
+
     setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
     setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
 
diff --git a/editor/mainwindow.ui b/editor/mainwindow.ui
index 5c4d6de..e0a9e78 100644
--- a/editor/mainwindow.ui
+++ b/editor/mainwindow.ui
@@ -40,7 +40,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1027</width>
+     <width>1612</width>
      <height>30</height>
     </rect>
    </property>
@@ -99,46 +99,6 @@
     </layout>
    </widget>
   </widget>
-  <widget class="QToolBar" name="toolBar">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="windowTitle">
-    <string>toolBar</string>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="actionNew"/>
-   <addaction name="actionOpen"/>
-   <addaction name="actionSave"/>
-   <addaction name="separator"/>
-   <addaction name="actionAddPart"/>
-   <addaction name="separator"/>
-   <addaction name="actionToolSelect"/>
-   <addaction name="actionToolMove"/>
-   <addaction name="actionToolScale"/>
-   <addaction name="actionToolRotate"/>
-   <addaction name="actionToggleSpace"/>
-   <addaction name="separator"/>
-   <addaction name="actionDelete"/>
-   <addaction name="actionCopy"/>
-   <addaction name="actionCut"/>
-   <addaction name="actionPaste"/>
-   <addaction name="actionPasteInto"/>
-   <addaction name="separator"/>
-   <addaction name="actionGridSnap1"/>
-   <addaction name="actionGridSnap05"/>
-   <addaction name="actionGridSnapOff"/>
-   <addaction name="separator"/>
-   <addaction name="actionToggleSimulation"/>
-  </widget>
   <widget class="QDockWidget" name="outputWidget">
    <property name="windowTitle">
     <string>Output</string>
@@ -158,6 +118,95 @@
     </layout>
    </widget>
   </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionNew"/>
+   <addaction name="actionOpen"/>
+   <addaction name="actionSave"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar_2">
+   <property name="windowTitle">
+    <string>toolBar_2</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionToolSelect"/>
+   <addaction name="actionToolMove"/>
+   <addaction name="actionToolScale"/>
+   <addaction name="actionToolRotate"/>
+   <addaction name="actionToggleSpace"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar_3">
+   <property name="windowTitle">
+    <string>toolBar_3</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionDelete"/>
+   <addaction name="actionCopy"/>
+   <addaction name="actionCut"/>
+   <addaction name="actionPaste"/>
+   <addaction name="actionPasteInto"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar_4">
+   <property name="windowTitle">
+    <string>toolBar_4</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionGridSnap1"/>
+   <addaction name="actionGridSnap05"/>
+   <addaction name="actionGridSnapOff"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar_5">
+   <property name="windowTitle">
+    <string>toolBar_5</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionToggleSimulation"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar_6">
+   <property name="windowTitle">
+    <string>toolBar_6</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionToolSmooth"/>
+   <addaction name="actionToolGlue"/>
+   <addaction name="actionToolWeld"/>
+   <addaction name="actionToolStuds"/>
+   <addaction name="actionToolInlets"/>
+   <addaction name="actionToolUniversal"/>
+  </widget>
   <action name="actionAddPart">
    <property name="icon">
     <iconset>
@@ -300,8 +349,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
-     <normaloff>assets/icons/editor/snap1.png</normaloff>assets/icons/editor/snap1.png</iconset>
+    <iconset theme="snap1"/>
    </property>
    <property name="text">
     <string>1-Stud Snapping</string>
@@ -318,8 +366,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
-     <normaloff>assets/icons/editor/snap05.png</normaloff>assets/icons/editor/snap05.png</iconset>
+    <iconset theme="snap05"/>
    </property>
    <property name="text">
     <string>1/2-Stud Snapping</string>
@@ -336,8 +383,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
-     <normaloff>assets/icons/editor/snapoff.png</normaloff>assets/icons/editor/snapoff.png</iconset>
+    <iconset theme="snapoff"/>
    </property>
    <property name="text">
     <string>No Grid Snapping</string>
@@ -495,6 +541,90 @@
     <enum>QAction::MenuRole::NoRole</enum>
    </property>
   </action>
+  <action name="actionToolStuds">
+   <property name="icon">
+    <iconset theme="surface-studs"/>
+   </property>
+   <property name="text">
+    <string>Studs</string>
+   </property>
+   <property name="toolTip">
+    <string>Studs</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionToolInlets">
+   <property name="icon">
+    <iconset theme="surface-inlets"/>
+   </property>
+   <property name="text">
+    <string>Inlets</string>
+   </property>
+   <property name="toolTip">
+    <string>Inlets</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionToolUniversal">
+   <property name="icon">
+    <iconset theme="surface-universal"/>
+   </property>
+   <property name="text">
+    <string>Universal</string>
+   </property>
+   <property name="toolTip">
+    <string>Universal</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionToolSmooth">
+   <property name="icon">
+    <iconset theme="surface-smooth"/>
+   </property>
+   <property name="text">
+    <string>Smooth</string>
+   </property>
+   <property name="toolTip">
+    <string>Smooth</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionToolWeld">
+   <property name="icon">
+    <iconset theme="surface-weld"/>
+   </property>
+   <property name="text">
+    <string>Weld</string>
+   </property>
+   <property name="toolTip">
+    <string>Weld</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionToolGlue">
+   <property name="icon">
+    <iconset theme="surface-glue"/>
+   </property>
+   <property name="text">
+    <string>Glue</string>
+   </property>
+   <property name="toolTip">
+    <string>Glue</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>