diff --git a/Component Icons/Screws/Button Head/SVG/head.svg b/Component Icons/Screws/Button Head/SVG/head.svg
deleted file mode 100644
index e1a500d..0000000
--- a/Component Icons/Screws/Button Head/SVG/head.svg	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="6.6799998mm"
-   height="6.6799998mm"
-   viewBox="0 0 6.6799998 6.6799998"
-   version="1.1"
-   id="svg1"
-   xml:space="preserve"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="head.svg"
-   inkscape:export-filename="..\PNG\head.png"
-   inkscape:export-xdpi="1200"
-   inkscape:export-ydpi="1200"
-   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="mm"
-     inkscape:zoom="17.07587"
-     inkscape:cx="0.40993518"
-     inkscape:cy="20.906694"
-     inkscape:window-width="2560"
-     inkscape:window-height="1377"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3" /><defs
-     id="defs1" /><g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Layer 2"
-     transform="translate(18.747431,9.5058136)"
-     style="opacity:1"><path
-       id="path1"
-       style="display:inline;opacity:1;fill:#000000;stroke-width:0.000771619;stroke-linecap:square"
-       d="m -15.407431,-9.5058136 a 3.3400011,3.3400011 0 0 0 -3.34,3.34 3.3400011,3.3400011 0 0 0 3.34,3.3400001 3.3400011,3.3400011 0 0 0 3.34,-3.3400001 3.3400011,3.3400011 0 0 0 -3.34,-3.34 z m 0,1.9869943 1.171752,0.6764949 v 1.3530216 l -1.171752,0.6765109 -1.171736,-0.6765109 v -1.3530216 z" /></g></svg>
diff --git a/Component Icons/Screws/Socket Head/PNG/head.png b/Component Icons/Screws/Socket Head/PNG/head.png
deleted file mode 100644
index a7c5da4..0000000
Binary files a/Component Icons/Screws/Socket Head/PNG/head.png and /dev/null differ
diff --git a/Component Icons/Screws/Button Head/PNG/head.png b/Component Icons/Screws/head/png/hex.png
similarity index 100%
rename from Component Icons/Screws/Button Head/PNG/head.png
rename to Component Icons/Screws/head/png/hex.png
diff --git a/Component Icons/Screws/head/png/torx.png b/Component Icons/Screws/head/png/torx.png
new file mode 100644
index 0000000..36ac205
Binary files /dev/null and b/Component Icons/Screws/head/png/torx.png differ
diff --git a/Component Icons/Screws/Socket Head/SVG/head.svg b/Component Icons/Screws/head/svg/hex.svg
similarity index 100%
rename from Component Icons/Screws/Socket Head/SVG/head.svg
rename to Component Icons/Screws/head/svg/hex.svg
diff --git a/Component Icons/Screws/head/svg/torx.svg b/Component Icons/Screws/head/svg/torx.svg
new file mode 100644
index 0000000..04e4b56
--- /dev/null
+++ b/Component Icons/Screws/head/svg/torx.svg	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25.2 25.2">
+  <path d="M12.6,0C5.64,0,0,5.64,0,12.6s5.64,12.6,12.6,12.6,12.6-5.64,12.6-12.6S19.56,0,12.6,0ZM19.24,14.76s1.8,1.6,1.3,2.4c-.4.7-1.3.5-1.9.4-.9-.2-2.6-.8-3.4-.3-1,.6-1.1,3-1.8,4.1-.4.6-1.1.7-1.6,0-.8-1-.9-3.8-2.1-4.3-1-.3-2.7.4-3.8.5-1.1,0-1.8-.5-1.2-1.6.6-1,2.5-2.3,2.5-3.4s-2-2.5-2.5-3.5c-.4-.8-.2-1.5.8-1.6,1.2,0,3.4,1.1,4.4.4.9-.5,1.2-3.1,1.8-4,.4-.6,1.1-.7,1.6-.1.8,1,.9,3.6,1.9,4.2,1.3.7,4-1,5.1-.2.5.4.4,1,0,1.4-.6,1-2.4,2.2-2.5,3.3-.1.8.9,1.7,1.4,2.3Z"/>
+</svg>
\ No newline at end of file
diff --git a/Component Icons/Screws/Button Head/PNG/side.png b/Component Icons/Screws/side/png/button head.png
similarity index 100%
rename from Component Icons/Screws/Button Head/PNG/side.png
rename to Component Icons/Screws/side/png/button head.png
diff --git a/Component Icons/Screws/side/png/countersunk.png b/Component Icons/Screws/side/png/countersunk.png
new file mode 100644
index 0000000..c222459
Binary files /dev/null and b/Component Icons/Screws/side/png/countersunk.png differ
diff --git a/Component Icons/Screws/Socket Head/PNG/side.png b/Component Icons/Screws/side/png/socket head.png
similarity index 100%
rename from Component Icons/Screws/Socket Head/PNG/side.png
rename to Component Icons/Screws/side/png/socket head.png
diff --git a/Component Icons/Screws/Button Head/SVG/side.svg b/Component Icons/Screws/side/svg/button head.svg
similarity index 100%
rename from Component Icons/Screws/Button Head/SVG/side.svg
rename to Component Icons/Screws/side/svg/button head.svg
diff --git a/Component Icons/Screws/side/svg/countersunk.svg b/Component Icons/Screws/side/svg/countersunk.svg
new file mode 100644
index 0000000..5f94054
--- /dev/null
+++ b/Component Icons/Screws/side/svg/countersunk.svg	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="svg1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11.93 28.06">
+  <g id="layer2">
+    <path id="path1" d="M0,0l3.73,5.51v21.9l.65.65h3.16l.65-.65V5.51L11.93,0H0Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Component Icons/Screws/Socket Head/SVG/side.svg b/Component Icons/Screws/side/svg/socket head.svg
similarity index 100%
rename from Component Icons/Screws/Socket Head/SVG/side.svg
rename to Component Icons/Screws/side/svg/socket head.svg