diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm
index b077f16d3dd36..d7f98ab0370de 100644
--- a/code/__DEFINES/lighting.dm
+++ b/code/__DEFINES/lighting.dm
@@ -38,7 +38,7 @@
 #define LIGHTING_ROUND_VALUE (1 / 64)
 
 /// icon used for lighting shading effects
-#define LIGHTING_ICON 'icons/effects/lighting_object.dmi'
+#define LIGHTING_ICON 'icons/effects/lighting_objects/lighting_object.dmi'
 
 /// If the max of the lighting lumcounts of each spectrum drops below this, disable luminosity on the lighting objects.
 /// Set to zero to disable soft lighting. Luminosity changes then work if it's lit at all.
diff --git a/code/datums/elements/split_visibility.dm b/code/datums/elements/split_visibility.dm
index b5388a98877d1..125c8a1ebcf1e 100644
--- a/code/datums/elements/split_visibility.dm
+++ b/code/datums/elements/split_visibility.dm
@@ -9,7 +9,7 @@ GLOBAL_LIST_INIT(diagonal_junctions, generate_splitvis_lookup())
 		diagonal_to_junction[i] = NONE
 	diagonal_to_junction[NORTH|EAST] = dir_to_junction(NORTH|EAST)
 	diagonal_to_junction[SOUTH|EAST] = dir_to_junction(SOUTH|EAST)
-	diagonal_to_junction[SOUTH|WEST] = dir_to_junction(NORTH|WEST)
+	diagonal_to_junction[SOUTH|WEST] = dir_to_junction(SOUTH|WEST)
 	diagonal_to_junction[NORTH|WEST] = dir_to_junction(NORTH|WEST)
 	return diagonal_to_junction
 
diff --git a/uncut_icons/templates/walls.toml b/cutter_templates/bitmask/walls.toml
similarity index 100%
rename from uncut_icons/templates/walls.toml
rename to cutter_templates/bitmask/walls.toml
diff --git a/uncut_icons/templates/windows.toml b/cutter_templates/bitmask/windows.toml
similarity index 100%
rename from uncut_icons/templates/windows.toml
rename to cutter_templates/bitmask/windows.toml
diff --git a/cutter_templates/unimplemented/reconstruct_bitmask.toml b/cutter_templates/unimplemented/reconstruct_bitmask.toml
new file mode 100644
index 0000000000000..0189c1ca18a9d
--- /dev/null
+++ b/cutter_templates/unimplemented/reconstruct_bitmask.toml
@@ -0,0 +1,6 @@
+# Uses a currently unimplemented (only on my copy of the cutter) template to reconstruct a template from a dmi
+mode = "BitmaskSliceReconstruct"
+extract = ["0", "3", "12", "15", "255"]
+
+[set]
+"template" = "\"bitmask/diagonal_32x32.toml\""
diff --git a/icons/effects/lighting_objects/README.MD b/icons/effects/lighting_objects/README.MD
new file mode 100644
index 0000000000000..31b312478ac0a
--- /dev/null
+++ b/icons/effects/lighting_objects/README.MD
@@ -0,0 +1,21 @@
+## Lighting Objects
+
+This is a short aside about lighting objects
+See [the main visuals guide](/.github/guides/VISUALS.md#lighting) for more info, I just want to talk about how these work practically.
+
+Ok so each turf is split up into corners, bottom left, bottom right, top left, top right.
+Each corner gets its own color, and the intensity of that color determines how much each "corner" impacts each pixel (with all 4 colors summing to 255 on each pixel).
+
+What happens if we want to render tall walls though? we only want to show the sides you can see, and we want lighting to like "form" to the wall right?
+
+Well that's really not that hard. Instead of using the standard icon, we can use one generated for that wall. That's why you'll see 3 different splitvis cutter configs here. One is for black, one is for fullbright and the final is for anything in between.
+
+If you modify them, remember to insert their output into lighting_object.dmi (this is an optimization lighting code is slow can't afford to change icon constantly)
+
+It's a bit hard to tell what's going on just looking straight at it since alpha is a component, and that makes things hard to see.
+Opening the png in byond and setting things to not show alpha helps a lot.
+
+The main idea is rather then just a flat square, we shape our gradients to match the shape of the wall, and how light would interact with it.
+
+This was done using a python script to generate the gradients for each "bit". The script is adapted from work done by Mister-Moriarty for goonstation, can find the original [here](https://github.com/goonstation/goonstation/pull/14322) and the version we use [here](./light_gen.py)
+
diff --git a/icons/effects/lighting_objects/light_gen.py b/icons/effects/lighting_objects/light_gen.py
new file mode 100644
index 0000000000000..cdb73c88144fe
--- /dev/null
+++ b/icons/effects/lighting_objects/light_gen.py
@@ -0,0 +1,37 @@
+# Based off the script found in https://github.com/goonstation/goonstation/pull/14322 by Mister-Moriarty
+# Modified by LemonInTheDark to make copy pasting segments easier
+import matplotlib.pyplot as plt
+import numpy as np
+from PIL import Image, ImageOps
+
+# Modify this to create slices that you can stitch together later
+array_width = 32
+array_height = 32
+
+def create_array(upperleft, upperright, lowerleft, lowerright):
+    array = np.linspace(
+        np.linspace(upperleft, upperright, array_width),
+        np.linspace(lowerleft, lowerright, array_width),
+        array_height, dtype = np.uint8)
+
+    return array[:, :, None]
+
+r = create_array(0, 0, 255, 0)
+g = create_array(0, 0, 0, 255)
+b = create_array(255, 0, 0, 0)
+# Needs 1 so byond doesn't yeet it
+a = create_array(1, 255, 1, 1)
+
+image = np.concatenate([r, g, b, a], axis=2)
+
+plt.imshow(image)
+plt.axis("off")
+# we're doing a bunch of bullshit here to try to get a clean drop in image we can stitch together
+# it sometimes has alpha artifacting issues depending on how it's copied, I'm sorry IDK how else to deal w it
+fig = plt.figure(frameon=False)
+fig.set_size_inches(array_width / 100, array_height / 100)
+ax = plt.Axes(fig, [0., 0., 1., 1.])
+ax.set_axis_off()
+fig.add_axes(ax)
+ax.imshow(image, aspect='auto')
+fig.savefig("output.png", transparent = True)
diff --git a/icons/effects/lighting_object.dmi b/icons/effects/lighting_objects/lighting_object.dmi
similarity index 100%
rename from icons/effects/lighting_object.dmi
rename to icons/effects/lighting_objects/lighting_object.dmi
diff --git a/icons/effects/lighting_objects/wall_dark.dmi b/icons/effects/lighting_objects/wall_dark.dmi
new file mode 100644
index 0000000000000..f9e4e3add2c98
Binary files /dev/null and b/icons/effects/lighting_objects/wall_dark.dmi differ
diff --git a/uncut_icons/misc/wall_dark.png b/icons/effects/lighting_objects/wall_dark.png
similarity index 100%
rename from uncut_icons/misc/wall_dark.png
rename to icons/effects/lighting_objects/wall_dark.png
diff --git a/uncut_icons/misc/wall_dark.png.toml b/icons/effects/lighting_objects/wall_dark.png.toml
similarity index 100%
rename from uncut_icons/misc/wall_dark.png.toml
rename to icons/effects/lighting_objects/wall_dark.png.toml
diff --git a/icons/effects/lighting_objects/wall_lighting.dmi b/icons/effects/lighting_objects/wall_lighting.dmi
new file mode 100644
index 0000000000000..edb6b38aa5098
Binary files /dev/null and b/icons/effects/lighting_objects/wall_lighting.dmi differ
diff --git a/uncut_icons/misc/wall_lighting.png b/icons/effects/lighting_objects/wall_lighting.png
similarity index 100%
rename from uncut_icons/misc/wall_lighting.png
rename to icons/effects/lighting_objects/wall_lighting.png
diff --git a/uncut_icons/misc/wall_lighting.png.toml b/icons/effects/lighting_objects/wall_lighting.png.toml
similarity index 100%
rename from uncut_icons/misc/wall_lighting.png.toml
rename to icons/effects/lighting_objects/wall_lighting.png.toml
diff --git a/icons/effects/lighting_objects/wall_transparent.dmi b/icons/effects/lighting_objects/wall_transparent.dmi
new file mode 100644
index 0000000000000..c5016d0122bbe
Binary files /dev/null and b/icons/effects/lighting_objects/wall_transparent.dmi differ
diff --git a/uncut_icons/misc/wall_transparent.png b/icons/effects/lighting_objects/wall_transparent.png
similarity index 100%
rename from uncut_icons/misc/wall_transparent.png
rename to icons/effects/lighting_objects/wall_transparent.png
diff --git a/uncut_icons/misc/wall_transparent.png.toml b/icons/effects/lighting_objects/wall_transparent.png.toml
similarity index 100%
rename from uncut_icons/misc/wall_transparent.png.toml
rename to icons/effects/lighting_objects/wall_transparent.png.toml
diff --git a/icons/obj/smooth_structures/alien/resin_wall.dmi b/icons/obj/smooth_structures/alien/resin_wall.dmi
index a37e03be5d113..e6147815a5ae0 100644
Binary files a/icons/obj/smooth_structures/alien/resin_wall.dmi and b/icons/obj/smooth_structures/alien/resin_wall.dmi differ
diff --git a/uncut_icons/misc/resin_wall.png b/icons/obj/smooth_structures/alien/resin_wall.png
similarity index 100%
rename from uncut_icons/misc/resin_wall.png
rename to icons/obj/smooth_structures/alien/resin_wall.png
diff --git a/icons/obj/smooth_structures/alien/resin_wall.png.toml b/icons/obj/smooth_structures/alien/resin_wall.png.toml
new file mode 100644
index 0000000000000..92b09e5ab975b
--- /dev/null
+++ b/icons/obj/smooth_structures/alien/resin_wall.png.toml
@@ -0,0 +1,2 @@
+template = "bitmask/walls"
+
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.dmi
index 4a87043228d0f..b07aebf496769 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png
new file mode 100644
index 0000000000000..876c1db5ca607
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png.toml
new file mode 100644
index 0000000000000..ca6044375c0c8
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_bamboo"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 33
+
+[output_icon_size]
+x = 32
+y = 33
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.dmi
index 14f0d9bc8203e..4bf6a23c89056 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png
new file mode 100644
index 0000000000000..c25d2715918e1
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png.toml
new file mode 100644
index 0000000000000..ef568da6ab27d
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_bronze"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.dmi
index 067b0c08c31fe..a6418fe3652ab 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png
new file mode 100644
index 0000000000000..71db4e2c1dd93
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png.toml
new file mode 100644
index 0000000000000..12914b352a14f
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_cult"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.dmi
index 08559a0ad12c5..f0c1c338ee8f5 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png
new file mode 100644
index 0000000000000..cf30936712fb9
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png.toml
new file mode 100644
index 0000000000000..4e6708939b464
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_gold"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.dmi
index 89b14b310132f..0168fe0cceb14 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png
new file mode 100644
index 0000000000000..2071d9af12f8b
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png.toml
new file mode 100644
index 0000000000000..8b16ec01d6bb2
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_hotel"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.dmi
index 58ebe0ae8cc80..0ac98eb154ffe 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png
new file mode 100644
index 0000000000000..9d4287b048318
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png.toml
new file mode 100644
index 0000000000000..f3ccff4914856
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_iron"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.dmi
index ffba1fcdc6eb9..bfbe726e23658 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png
new file mode 100644
index 0000000000000..89217a237b279
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png.toml
new file mode 100644
index 0000000000000..7e11ef2739217
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_material"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi
index d015f61e4bc81..3a6df385cb7c5 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png
new file mode 100644
index 0000000000000..af97f77cbf753
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png.toml
new file mode 100644
index 0000000000000..90dbfccbbcd22
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_normal"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.dmi
index d2e1662811d4c..c4ff381426226 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png
new file mode 100644
index 0000000000000..9b7d63b574fda
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png.toml
new file mode 100644
index 0000000000000..ee2a4a251e8fd
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_paperframe"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.dmi
new file mode 100644
index 0000000000000..81953f9dac5cd
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png
new file mode 100644
index 0000000000000..8b7ce42e937af
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png.toml
new file mode 100644
index 0000000000000..ee2a4a251e8fd
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_paperframe"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi
index abf39a8530a75..a28964bcf5373 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png
new file mode 100644
index 0000000000000..627116c68caab
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png.toml
new file mode 100644
index 0000000000000..722035c4576fc
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_plastitanium"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.dmi
index 3ece35f4a8051..1367f021c3167 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png
new file mode 100644
index 0000000000000..bea1ebe249158
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png.toml
new file mode 100644
index 0000000000000..80f7eeffc4fc3
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_rusty"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.dmi
new file mode 100644
index 0000000000000..8cd96b5b21aca
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png
new file mode 100644
index 0000000000000..f6f71383248c0
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png.toml
new file mode 100644
index 0000000000000..80f7eeffc4fc3
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_rusty"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.dmi
index 9b42acb909762..91b65de73cb04 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png
new file mode 100644
index 0000000000000..f45007aa22d21
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png.toml
new file mode 100644
index 0000000000000..7b69b502b72d8
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_shuttle"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.dmi
index 08045eaf1679d..c58a9ecb92877 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png
new file mode 100644
index 0000000000000..d6b009a6ec3ee
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png.toml
new file mode 100644
index 0000000000000..0785dc4d1c732
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_silver"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.dmi
index 757dab86bfd5e..fb366d3275853 100644
Binary files a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.dmi and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png
new file mode 100644
index 0000000000000..a893a1af60c53
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png.toml
new file mode 100644
index 0000000000000..7d811bf0c73aa
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_uranium"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.dmi b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.dmi
new file mode 100644
index 0000000000000..147ca7c934f65
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png
new file mode 100644
index 0000000000000..336719fe69172
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png differ
diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png.toml b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png.toml
new file mode 100644
index 0000000000000..7d811bf0c73aa
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_frame_uranium"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bamboo.dmi b/icons/obj/smooth_structures/window_frames/window_frame_bamboo.dmi
index 191e9fa15e66e..057857bc61730 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_bamboo.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_bamboo.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png b/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png
new file mode 100644
index 0000000000000..2421367e20102
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png.toml
new file mode 100644
index 0000000000000..8e0b1399ea9e4
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_bamboo"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bronze.dmi b/icons/obj/smooth_structures/window_frames/window_frame_bronze.dmi
index dee78562ff8b8..0d292873b6241 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_bronze.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_bronze.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bronze.png b/icons/obj/smooth_structures/window_frames/window_frame_bronze.png
new file mode 100644
index 0000000000000..9f3854b41ab3a
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_bronze.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bronze.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_bronze.png.toml
new file mode 100644
index 0000000000000..9a8326a93bcc9
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_bronze.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_bronze"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_cult.dmi b/icons/obj/smooth_structures/window_frames/window_frame_cult.dmi
index f2b3eec26ca5f..b2ea411ee5c40 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_cult.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_cult.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_cult.png b/icons/obj/smooth_structures/window_frames/window_frame_cult.png
new file mode 100644
index 0000000000000..f4a2bee5ab429
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_cult.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_cult.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_cult.png.toml
new file mode 100644
index 0000000000000..eb9c06599673f
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_cult.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_cult"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_gold.dmi b/icons/obj/smooth_structures/window_frames/window_frame_gold.dmi
index a536a2aec6522..8c52de17622fb 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_gold.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_gold.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_gold.png b/icons/obj/smooth_structures/window_frames/window_frame_gold.png
new file mode 100644
index 0000000000000..bb2ddee5676b1
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_gold.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_gold.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_gold.png.toml
new file mode 100644
index 0000000000000..528983bb0509a
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_gold.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_gold"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_hotel.dmi b/icons/obj/smooth_structures/window_frames/window_frame_hotel.dmi
index 662d9ceabe578..a703eb0e618a3 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_hotel.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_hotel.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_hotel.png b/icons/obj/smooth_structures/window_frames/window_frame_hotel.png
new file mode 100644
index 0000000000000..0759e2838bd5a
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_hotel.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_hotel.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_hotel.png.toml
new file mode 100644
index 0000000000000..54e8ab3d84e09
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_hotel.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_hotel"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_iron.dmi b/icons/obj/smooth_structures/window_frames/window_frame_iron.dmi
index 58ebe0ae8cc80..df111e908ff0a 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_iron.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_iron.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_iron.png b/icons/obj/smooth_structures/window_frames/window_frame_iron.png
new file mode 100644
index 0000000000000..f4edf9ed54931
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_iron.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_iron.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_iron.png.toml
new file mode 100644
index 0000000000000..db015e176b957
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_iron.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_iron"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_material.dmi b/icons/obj/smooth_structures/window_frames/window_frame_material.dmi
index 89738929b8989..15b65a7d52649 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_material.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_material.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_material.png b/icons/obj/smooth_structures/window_frames/window_frame_material.png
new file mode 100644
index 0000000000000..f2a28f47549ce
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_material.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_material.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_material.png.toml
new file mode 100644
index 0000000000000..4a19e2b0fafb2
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_material.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_material"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_normal.dmi b/icons/obj/smooth_structures/window_frames/window_frame_normal.dmi
index fcee82f3ffa28..20b72a1443c7a 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_normal.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_normal.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_normal.png b/icons/obj/smooth_structures/window_frames/window_frame_normal.png
new file mode 100644
index 0000000000000..00ab11b5a6385
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_normal.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_normal.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_normal.png.toml
new file mode 100644
index 0000000000000..b66c79fe08340
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_normal.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_normal"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_paperframe.dmi b/icons/obj/smooth_structures/window_frames/window_frame_paperframe.dmi
index 4def3970e8765..f0b63d54c5a74 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_paperframe.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_paperframe.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png b/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png
new file mode 100644
index 0000000000000..af8ae87509d06
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png.toml
new file mode 100644
index 0000000000000..ef7ad65c2c1d6
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_paperframe"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_pizza.dmi b/icons/obj/smooth_structures/window_frames/window_frame_pizza.dmi
new file mode 100644
index 0000000000000..32e72f906e273
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_pizza.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_pizza.png b/icons/obj/smooth_structures/window_frames/window_frame_pizza.png
new file mode 100644
index 0000000000000..d183ec51f9ace
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_pizza.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_pizza.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_pizza.png.toml
new file mode 100644
index 0000000000000..18f0004f488c9
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_pizza.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_pizza"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.dmi b/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.dmi
index 3eba9a40df155..3983ae0357545 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png b/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png
new file mode 100644
index 0000000000000..a1e849613fd8e
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png.toml
new file mode 100644
index 0000000000000..36cf38c58322c
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_plastitanium"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_rusty.dmi b/icons/obj/smooth_structures/window_frames/window_frame_rusty.dmi
index 0277a94525b83..5c1b6e3d9d335 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_rusty.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_rusty.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_rusty.png b/icons/obj/smooth_structures/window_frames/window_frame_rusty.png
new file mode 100644
index 0000000000000..0ad7f39152f4e
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_rusty.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_rusty.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_rusty.png.toml
new file mode 100644
index 0000000000000..fd608c6597ce9
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_rusty.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_rusty"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_sandstone.dmi b/icons/obj/smooth_structures/window_frames/window_frame_sandstone.dmi
index 48700bf84d2a1..7aa99478e67c7 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_sandstone.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_sandstone.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png b/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png
new file mode 100644
index 0000000000000..38c8afacaf442
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png.toml
new file mode 100644
index 0000000000000..d79e404965b34
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_sandstone"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_shuttle.dmi b/icons/obj/smooth_structures/window_frames/window_frame_shuttle.dmi
index 6584b45fad3f5..f110d8eeb8ca8 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_shuttle.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_shuttle.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png b/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png
new file mode 100644
index 0000000000000..1334ccaed5d45
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png.toml
new file mode 100644
index 0000000000000..8f1ebaabb6bec
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_shuttle"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_silver.dmi b/icons/obj/smooth_structures/window_frames/window_frame_silver.dmi
index 4946054accbed..c2bcfd8efae63 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_silver.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_silver.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_silver.png b/icons/obj/smooth_structures/window_frames/window_frame_silver.png
new file mode 100644
index 0000000000000..24a0a70fc9928
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_silver.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_silver.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_silver.png.toml
new file mode 100644
index 0000000000000..bdc754a95b2b5
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_silver.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_silver"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_uranium.dmi b/icons/obj/smooth_structures/window_frames/window_frame_uranium.dmi
index 631bb68556f4d..ba0fd93334ce2 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_uranium.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_uranium.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_uranium.png b/icons/obj/smooth_structures/window_frames/window_frame_uranium.png
new file mode 100644
index 0000000000000..26f7a590e6103
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_uranium.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_uranium.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_uranium.png.toml
new file mode 100644
index 0000000000000..cbff8857a536e
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_uranium.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_uranium"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_wood.dmi b/icons/obj/smooth_structures/window_frames/window_frame_wood.dmi
index 5a6c5f7aa92ec..51b764311d7c3 100644
Binary files a/icons/obj/smooth_structures/window_frames/window_frame_wood.dmi and b/icons/obj/smooth_structures/window_frames/window_frame_wood.dmi differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_wood.png b/icons/obj/smooth_structures/window_frames/window_frame_wood.png
new file mode 100644
index 0000000000000..f067b72950150
Binary files /dev/null and b/icons/obj/smooth_structures/window_frames/window_frame_wood.png differ
diff --git a/icons/obj/smooth_structures/window_frames/window_frame_wood.png.toml b/icons/obj/smooth_structures/window_frames/window_frame_wood.png.toml
new file mode 100644
index 0000000000000..ce70ff743407e
--- /dev/null
+++ b/icons/obj/smooth_structures/window_frames/window_frame_wood.png.toml
@@ -0,0 +1,2 @@
+output_name = "window_frame_wood"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/window_grille.dmi b/icons/obj/smooth_structures/window_grille.dmi
index c7980b303135d..63ee7eb1a4760 100644
Binary files a/icons/obj/smooth_structures/window_grille.dmi and b/icons/obj/smooth_structures/window_grille.dmi differ
diff --git a/icons/obj/smooth_structures/window_grille.png b/icons/obj/smooth_structures/window_grille.png
new file mode 100644
index 0000000000000..3332b736e01aa
Binary files /dev/null and b/icons/obj/smooth_structures/window_grille.png differ
diff --git a/icons/obj/smooth_structures/window_grille.png.toml b/icons/obj/smooth_structures/window_grille.png.toml
new file mode 100644
index 0000000000000..3c636a0c28e46
--- /dev/null
+++ b/icons/obj/smooth_structures/window_grille.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_grille"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/window_grille_backup.dmi b/icons/obj/smooth_structures/window_grille_backup.dmi
deleted file mode 100644
index fcab7a608b4ac..0000000000000
Binary files a/icons/obj/smooth_structures/window_grille_backup.dmi and /dev/null differ
diff --git a/icons/obj/smooth_structures/window_grille_black.dmi b/icons/obj/smooth_structures/window_grille_black.dmi
index c42b0876be625..35ac2f4a817bd 100644
Binary files a/icons/obj/smooth_structures/window_grille_black.dmi and b/icons/obj/smooth_structures/window_grille_black.dmi differ
diff --git a/icons/obj/smooth_structures/window_grille_black.png b/icons/obj/smooth_structures/window_grille_black.png
new file mode 100644
index 0000000000000..f10d53e4f1469
Binary files /dev/null and b/icons/obj/smooth_structures/window_grille_black.png differ
diff --git a/icons/obj/smooth_structures/window_grille_black.png.toml b/icons/obj/smooth_structures/window_grille_black.png.toml
new file mode 100644
index 0000000000000..f0d1438f4f640
--- /dev/null
+++ b/icons/obj/smooth_structures/window_grille_black.png.toml
@@ -0,0 +1,14 @@
+output_name = "window_grille_black"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 32
+y = 32
+
+[output_icon_size]
+x = 32
+y = 32
+
+[cut_pos]
+x = 16
+y = 16
\ No newline at end of file
diff --git a/icons/obj/smooth_structures/windows/bronze_window.dmi b/icons/obj/smooth_structures/windows/bronze_window.dmi
index e55b1beae4062..1af8be87fa657 100644
Binary files a/icons/obj/smooth_structures/windows/bronze_window.dmi and b/icons/obj/smooth_structures/windows/bronze_window.dmi differ
diff --git a/uncut_icons/windows/bronze_window.png b/icons/obj/smooth_structures/windows/bronze_window.png
similarity index 100%
rename from uncut_icons/windows/bronze_window.png
rename to icons/obj/smooth_structures/windows/bronze_window.png
diff --git a/icons/obj/smooth_structures/windows/bronze_window.png.toml b/icons/obj/smooth_structures/windows/bronze_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/bronze_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/uncut_icons/windows/frosted_window.png b/icons/obj/smooth_structures/windows/frosted_window.png
similarity index 100%
rename from uncut_icons/windows/frosted_window.png
rename to icons/obj/smooth_structures/windows/frosted_window.png
diff --git a/icons/obj/smooth_structures/windows/normal_window.dmi b/icons/obj/smooth_structures/windows/normal_window.dmi
index f7a363a071097..c9423258e5aa2 100644
Binary files a/icons/obj/smooth_structures/windows/normal_window.dmi and b/icons/obj/smooth_structures/windows/normal_window.dmi differ
diff --git a/uncut_icons/windows/normal_window.png b/icons/obj/smooth_structures/windows/normal_window.png
similarity index 100%
rename from uncut_icons/windows/normal_window.png
rename to icons/obj/smooth_structures/windows/normal_window.png
diff --git a/icons/obj/smooth_structures/windows/normal_window.png.toml b/icons/obj/smooth_structures/windows/normal_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/normal_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/obj/smooth_structures/windows/plasma_reinforced_window.dmi b/icons/obj/smooth_structures/windows/plasma_reinforced_window.dmi
index fa64beb828741..36a3e754da3d7 100644
Binary files a/icons/obj/smooth_structures/windows/plasma_reinforced_window.dmi and b/icons/obj/smooth_structures/windows/plasma_reinforced_window.dmi differ
diff --git a/uncut_icons/windows/plasma_reinforced_window.png b/icons/obj/smooth_structures/windows/plasma_reinforced_window.png
similarity index 100%
rename from uncut_icons/windows/plasma_reinforced_window.png
rename to icons/obj/smooth_structures/windows/plasma_reinforced_window.png
diff --git a/icons/obj/smooth_structures/windows/plasma_reinforced_window.png.toml b/icons/obj/smooth_structures/windows/plasma_reinforced_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/plasma_reinforced_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/obj/smooth_structures/windows/plasma_window.dmi b/icons/obj/smooth_structures/windows/plasma_window.dmi
index 67fda7803b4b3..f48e180892bcb 100644
Binary files a/icons/obj/smooth_structures/windows/plasma_window.dmi and b/icons/obj/smooth_structures/windows/plasma_window.dmi differ
diff --git a/uncut_icons/windows/plasma_window.png b/icons/obj/smooth_structures/windows/plasma_window.png
similarity index 100%
rename from uncut_icons/windows/plasma_window.png
rename to icons/obj/smooth_structures/windows/plasma_window.png
diff --git a/icons/obj/smooth_structures/windows/plasma_window.png.toml b/icons/obj/smooth_structures/windows/plasma_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/plasma_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/obj/smooth_structures/windows/plastitanium_window.dmi b/icons/obj/smooth_structures/windows/plastitanium_window.dmi
index 90e6b613d0611..202cfce5fb5cd 100644
Binary files a/icons/obj/smooth_structures/windows/plastitanium_window.dmi and b/icons/obj/smooth_structures/windows/plastitanium_window.dmi differ
diff --git a/uncut_icons/windows/plastitanium_window.png b/icons/obj/smooth_structures/windows/plastitanium_window.png
similarity index 100%
rename from uncut_icons/windows/plastitanium_window.png
rename to icons/obj/smooth_structures/windows/plastitanium_window.png
diff --git a/icons/obj/smooth_structures/windows/plastitanium_window.png.toml b/icons/obj/smooth_structures/windows/plastitanium_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/plastitanium_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/obj/smooth_structures/windows/pod_window.dmi b/icons/obj/smooth_structures/windows/pod_window.dmi
index 6a2ecdf4eceb2..427321857e847 100644
Binary files a/icons/obj/smooth_structures/windows/pod_window.dmi and b/icons/obj/smooth_structures/windows/pod_window.dmi differ
diff --git a/uncut_icons/windows/pod_window.png b/icons/obj/smooth_structures/windows/pod_window.png
similarity index 100%
rename from uncut_icons/windows/pod_window.png
rename to icons/obj/smooth_structures/windows/pod_window.png
diff --git a/icons/obj/smooth_structures/windows/pod_window.png.toml b/icons/obj/smooth_structures/windows/pod_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/pod_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/obj/smooth_structures/windows/reinforced_window.dmi b/icons/obj/smooth_structures/windows/reinforced_window.dmi
index 1fb513d97fab7..3f0a607e4321d 100644
Binary files a/icons/obj/smooth_structures/windows/reinforced_window.dmi and b/icons/obj/smooth_structures/windows/reinforced_window.dmi differ
diff --git a/uncut_icons/windows/reinforced_window.png b/icons/obj/smooth_structures/windows/reinforced_window.png
similarity index 100%
rename from uncut_icons/windows/reinforced_window.png
rename to icons/obj/smooth_structures/windows/reinforced_window.png
diff --git a/icons/obj/smooth_structures/windows/reinforced_window.png.toml b/icons/obj/smooth_structures/windows/reinforced_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/reinforced_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/obj/smooth_structures/windows/tinted_window.dmi b/icons/obj/smooth_structures/windows/tinted_window.dmi
index a6d03210762f1..e5f2d3e50611b 100644
Binary files a/icons/obj/smooth_structures/windows/tinted_window.dmi and b/icons/obj/smooth_structures/windows/tinted_window.dmi differ
diff --git a/uncut_icons/windows/tinted_window.png b/icons/obj/smooth_structures/windows/tinted_window.png
similarity index 100%
rename from uncut_icons/windows/tinted_window.png
rename to icons/obj/smooth_structures/windows/tinted_window.png
diff --git a/icons/obj/smooth_structures/windows/tinted_window.png.toml b/icons/obj/smooth_structures/windows/tinted_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/tinted_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/obj/smooth_structures/windows/titanium_window.dmi b/icons/obj/smooth_structures/windows/titanium_window.dmi
index ae43e4fdb686a..dd6546595eecf 100644
Binary files a/icons/obj/smooth_structures/windows/titanium_window.dmi and b/icons/obj/smooth_structures/windows/titanium_window.dmi differ
diff --git a/uncut_icons/windows/titanium_window.png b/icons/obj/smooth_structures/windows/titanium_window.png
similarity index 100%
rename from uncut_icons/windows/titanium_window.png
rename to icons/obj/smooth_structures/windows/titanium_window.png
diff --git a/icons/obj/smooth_structures/windows/titanium_window.png.toml b/icons/obj/smooth_structures/windows/titanium_window.png.toml
new file mode 100644
index 0000000000000..2fc6c71ac78d8
--- /dev/null
+++ b/icons/obj/smooth_structures/windows/titanium_window.png.toml
@@ -0,0 +1 @@
+template = "bitmask/windows"
diff --git a/icons/turf/walls/abductor_wall.dmi b/icons/turf/walls/abductor_wall.dmi
index f67a2f1533c73..13a863bbe6e54 100644
Binary files a/icons/turf/walls/abductor_wall.dmi and b/icons/turf/walls/abductor_wall.dmi differ
diff --git a/uncut_icons/walls/abductor_wall.png b/icons/turf/walls/abductor_wall.png
similarity index 100%
rename from uncut_icons/walls/abductor_wall.png
rename to icons/turf/walls/abductor_wall.png
diff --git a/icons/turf/walls/abductor_wall.png.toml b/icons/turf/walls/abductor_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/abductor_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/bamboo_wall.dmi b/icons/turf/walls/bamboo_wall.dmi
index 62eecd9e058a5..de56de8d00976 100644
Binary files a/icons/turf/walls/bamboo_wall.dmi and b/icons/turf/walls/bamboo_wall.dmi differ
diff --git a/uncut_icons/walls/bamboo_wall.png b/icons/turf/walls/bamboo_wall.png
similarity index 100%
rename from uncut_icons/walls/bamboo_wall.png
rename to icons/turf/walls/bamboo_wall.png
diff --git a/icons/turf/walls/bamboo_wall.png.toml b/icons/turf/walls/bamboo_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/bamboo_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/bananium_wall.dmi b/icons/turf/walls/bananium_wall.dmi
index 0689f2e95e67f..b290c786bdc4f 100644
Binary files a/icons/turf/walls/bananium_wall.dmi and b/icons/turf/walls/bananium_wall.dmi differ
diff --git a/uncut_icons/walls/bananium_wall.png b/icons/turf/walls/bananium_wall.png
similarity index 100%
rename from uncut_icons/walls/bananium_wall.png
rename to icons/turf/walls/bananium_wall.png
diff --git a/icons/turf/walls/bananium_wall.png.toml b/icons/turf/walls/bananium_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/bananium_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/baseturfs_fuck.dmi b/icons/turf/walls/baseturfs_fuck.dmi
index c2cd230cad5dd..6565c16d3cf20 100644
Binary files a/icons/turf/walls/baseturfs_fuck.dmi and b/icons/turf/walls/baseturfs_fuck.dmi differ
diff --git a/uncut_icons/walls/baseturfs_fuck.png b/icons/turf/walls/baseturfs_fuck.png
similarity index 100%
rename from uncut_icons/walls/baseturfs_fuck.png
rename to icons/turf/walls/baseturfs_fuck.png
diff --git a/uncut_icons/walls/baseturfs_fuck.toml b/icons/turf/walls/baseturfs_fuck.png.toml
similarity index 50%
rename from uncut_icons/walls/baseturfs_fuck.toml
rename to icons/turf/walls/baseturfs_fuck.png.toml
index 2f228fa3ecfb2..3eba3454cf9c3 100644
--- a/uncut_icons/walls/baseturfs_fuck.toml
+++ b/icons/turf/walls/baseturfs_fuck.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [animation]
 delays = [ 2 ]
diff --git a/icons/turf/walls/bathroom_wall.dmi b/icons/turf/walls/bathroom_wall.dmi
index 5bb7a5de8af6c..6214ef87ad996 100644
Binary files a/icons/turf/walls/bathroom_wall.dmi and b/icons/turf/walls/bathroom_wall.dmi differ
diff --git a/uncut_icons/walls/bathroom_wall.png b/icons/turf/walls/bathroom_wall.png
similarity index 100%
rename from uncut_icons/walls/bathroom_wall.png
rename to icons/turf/walls/bathroom_wall.png
diff --git a/icons/turf/walls/bathroom_wall.png.toml b/icons/turf/walls/bathroom_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/bathroom_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/boss_wall.dmi b/icons/turf/walls/boss_wall.dmi
index a9c88ac47369a..82f969b4db62e 100644
Binary files a/icons/turf/walls/boss_wall.dmi and b/icons/turf/walls/boss_wall.dmi differ
diff --git a/uncut_icons/walls/boss_wall.png b/icons/turf/walls/boss_wall.png
similarity index 100%
rename from uncut_icons/walls/boss_wall.png
rename to icons/turf/walls/boss_wall.png
diff --git a/icons/turf/walls/boss_wall.png.toml b/icons/turf/walls/boss_wall.png.toml
new file mode 100644
index 0000000000000..383ccc8c7e1ac
--- /dev/null
+++ b/icons/turf/walls/boss_wall.png.toml
@@ -0,0 +1,3 @@
+template = "bitmask/walls"
+[prefabs]
+0 = 5
diff --git a/icons/turf/walls/clockwork_wall.dmi b/icons/turf/walls/clockwork_wall.dmi
index 103a09c43002c..74625dfebb0f3 100644
Binary files a/icons/turf/walls/clockwork_wall.dmi and b/icons/turf/walls/clockwork_wall.dmi differ
diff --git a/uncut_icons/walls/clockwork_wall.png b/icons/turf/walls/clockwork_wall.png
similarity index 100%
rename from uncut_icons/walls/clockwork_wall.png
rename to icons/turf/walls/clockwork_wall.png
diff --git a/icons/turf/walls/clockwork_wall.png.toml b/icons/turf/walls/clockwork_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/clockwork_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/cult_wall.dmi b/icons/turf/walls/cult_wall.dmi
index ab80af35fad93..4586dac665dcd 100644
Binary files a/icons/turf/walls/cult_wall.dmi and b/icons/turf/walls/cult_wall.dmi differ
diff --git a/uncut_icons/walls/cult_wall.png b/icons/turf/walls/cult_wall.png
similarity index 100%
rename from uncut_icons/walls/cult_wall.png
rename to icons/turf/walls/cult_wall.png
diff --git a/icons/turf/walls/cult_wall.png.toml b/icons/turf/walls/cult_wall.png.toml
new file mode 100644
index 0000000000000..87d5a807bfd93
--- /dev/null
+++ b/icons/turf/walls/cult_wall.png.toml
@@ -0,0 +1,3 @@
+template = "bitmask/walls"
+[cut_pos]
+y = 16
diff --git a/icons/turf/walls/debug_wall.dmi b/icons/turf/walls/debug_wall.dmi
index fcd2c3afe51e7..5cb098ae760ad 100644
Binary files a/icons/turf/walls/debug_wall.dmi and b/icons/turf/walls/debug_wall.dmi differ
diff --git a/uncut_icons/walls/debug_wall.png b/icons/turf/walls/debug_wall.png
similarity index 100%
rename from uncut_icons/walls/debug_wall.png
rename to icons/turf/walls/debug_wall.png
diff --git a/icons/turf/walls/debug_wall.png.toml b/icons/turf/walls/debug_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/debug_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/diamond_wall.dmi b/icons/turf/walls/diamond_wall.dmi
index 201abfabbb8d5..977a69ad0e1ea 100644
Binary files a/icons/turf/walls/diamond_wall.dmi and b/icons/turf/walls/diamond_wall.dmi differ
diff --git a/uncut_icons/walls/diamond_wall.png b/icons/turf/walls/diamond_wall.png
similarity index 100%
rename from uncut_icons/walls/diamond_wall.png
rename to icons/turf/walls/diamond_wall.png
diff --git a/uncut_icons/walls/diamond_wall.toml b/icons/turf/walls/diamond_wall.png.toml
similarity index 67%
rename from uncut_icons/walls/diamond_wall.toml
rename to icons/turf/walls/diamond_wall.png.toml
index 8f9aae08ef75b..d8e6d1e10066a 100644
--- a/uncut_icons/walls/diamond_wall.toml
+++ b/icons/turf/walls/diamond_wall.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [slice_point]
 west = 8
diff --git a/icons/turf/walls/gold_wall.dmi b/icons/turf/walls/gold_wall.dmi
index ce01ccf0a44bf..9d5ccce1647f5 100644
Binary files a/icons/turf/walls/gold_wall.dmi and b/icons/turf/walls/gold_wall.dmi differ
diff --git a/uncut_icons/walls/gold_wall.png b/icons/turf/walls/gold_wall.png
similarity index 100%
rename from uncut_icons/walls/gold_wall.png
rename to icons/turf/walls/gold_wall.png
diff --git a/icons/turf/walls/gold_wall.png.toml b/icons/turf/walls/gold_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/gold_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/hierophant_wall.dmi b/icons/turf/walls/hierophant_wall.dmi
index fdb914356ebc6..6058163102289 100644
Binary files a/icons/turf/walls/hierophant_wall.dmi and b/icons/turf/walls/hierophant_wall.dmi differ
diff --git a/uncut_icons/walls/hierophant_wall.png b/icons/turf/walls/hierophant_wall.png
similarity index 100%
rename from uncut_icons/walls/hierophant_wall.png
rename to icons/turf/walls/hierophant_wall.png
diff --git a/uncut_icons/walls/plasma_wall.toml b/icons/turf/walls/hierophant_wall.png.toml
similarity index 50%
rename from uncut_icons/walls/plasma_wall.toml
rename to icons/turf/walls/hierophant_wall.png.toml
index 187d7ed0a0d65..45dab6be83f05 100644
--- a/uncut_icons/walls/plasma_wall.toml
+++ b/icons/turf/walls/hierophant_wall.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [animation]
 delays = [ 1 ]
diff --git a/icons/turf/walls/hotel_door.dmi b/icons/turf/walls/hotel_door.dmi
index c9cbb10e173ff..6cbc5f2d199f6 100644
Binary files a/icons/turf/walls/hotel_door.dmi and b/icons/turf/walls/hotel_door.dmi differ
diff --git a/uncut_icons/walls/hotel_door.png b/icons/turf/walls/hotel_door.png
similarity index 100%
rename from uncut_icons/walls/hotel_door.png
rename to icons/turf/walls/hotel_door.png
diff --git a/icons/turf/walls/hotel_door.png.toml b/icons/turf/walls/hotel_door.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/hotel_door.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/hotel_wall.dmi b/icons/turf/walls/hotel_wall.dmi
index a7432660b02fe..87a8e40f27f9a 100644
Binary files a/icons/turf/walls/hotel_wall.dmi and b/icons/turf/walls/hotel_wall.dmi differ
diff --git a/uncut_icons/walls/hotel_wall.png b/icons/turf/walls/hotel_wall.png
similarity index 100%
rename from uncut_icons/walls/hotel_wall.png
rename to icons/turf/walls/hotel_wall.png
diff --git a/icons/turf/walls/hotel_wall.png.toml b/icons/turf/walls/hotel_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/hotel_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/icerock_wall.dmi b/icons/turf/walls/icerock_wall.dmi
index 3817d0599328b..a45d01a6af6ce 100644
Binary files a/icons/turf/walls/icerock_wall.dmi and b/icons/turf/walls/icerock_wall.dmi differ
diff --git a/uncut_icons/walls/icerock_wall.png b/icons/turf/walls/icerock_wall.png
similarity index 100%
rename from uncut_icons/walls/icerock_wall.png
rename to icons/turf/walls/icerock_wall.png
diff --git a/uncut_icons/walls/rock_wall2.toml b/icons/turf/walls/icerock_wall.png.toml
similarity index 67%
rename from uncut_icons/walls/rock_wall2.toml
rename to icons/turf/walls/icerock_wall.png.toml
index 59dbe0b218b17..ff538cf657312 100644
--- a/uncut_icons/walls/rock_wall2.toml
+++ b/icons/turf/walls/icerock_wall.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [slice_point]
 west = 4
diff --git a/icons/turf/walls/iron_wall.dmi b/icons/turf/walls/iron_wall.dmi
index cbe1322498daa..1ef27b97ce8b5 100644
Binary files a/icons/turf/walls/iron_wall.dmi and b/icons/turf/walls/iron_wall.dmi differ
diff --git a/uncut_icons/walls/iron_wall.png b/icons/turf/walls/iron_wall.png
similarity index 100%
rename from uncut_icons/walls/iron_wall.png
rename to icons/turf/walls/iron_wall.png
diff --git a/icons/turf/walls/iron_wall.png.toml b/icons/turf/walls/iron_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/iron_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/material_wall.dmi b/icons/turf/walls/material_wall.dmi
index db913a4b7f0d1..74b09c94f5b3a 100644
Binary files a/icons/turf/walls/material_wall.dmi and b/icons/turf/walls/material_wall.dmi differ
diff --git a/uncut_icons/walls/material_wall.png b/icons/turf/walls/material_wall.png
similarity index 100%
rename from uncut_icons/walls/material_wall.png
rename to icons/turf/walls/material_wall.png
diff --git a/icons/turf/walls/material_wall.png.toml b/icons/turf/walls/material_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/material_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/meat_wall.dmi b/icons/turf/walls/meat_wall.dmi
index fd28c6186e886..f55a613f1e840 100644
Binary files a/icons/turf/walls/meat_wall.dmi and b/icons/turf/walls/meat_wall.dmi differ
diff --git a/uncut_icons/walls/meat_wall.png b/icons/turf/walls/meat_wall.png
similarity index 100%
rename from uncut_icons/walls/meat_wall.png
rename to icons/turf/walls/meat_wall.png
diff --git a/uncut_icons/walls/meat_wall.toml b/icons/turf/walls/meat_wall.png.toml
similarity index 66%
rename from uncut_icons/walls/meat_wall.toml
rename to icons/turf/walls/meat_wall.png.toml
index d1507b093f4dd..c6cd156637289 100644
--- a/uncut_icons/walls/meat_wall.toml
+++ b/icons/turf/walls/meat_wall.png.toml
@@ -1,4 +1,5 @@
-template = "walls"
+
+template = "bitmask/walls"
 
 [slice_point]
 west = 6
diff --git a/icons/turf/walls/metal_wall.dmi b/icons/turf/walls/metal_wall.dmi
index dc142ffdd318e..46ca0f16e4cb5 100644
Binary files a/icons/turf/walls/metal_wall.dmi and b/icons/turf/walls/metal_wall.dmi differ
diff --git a/uncut_icons/walls/metal_wall.png b/icons/turf/walls/metal_wall.png
similarity index 100%
rename from uncut_icons/walls/metal_wall.png
rename to icons/turf/walls/metal_wall.png
diff --git a/icons/turf/walls/metal_wall.png.toml b/icons/turf/walls/metal_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/metal_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/necro_wall.dmi b/icons/turf/walls/necro_wall.dmi
index 02e7c65d043e8..fa19474d1cacb 100644
Binary files a/icons/turf/walls/necro_wall.dmi and b/icons/turf/walls/necro_wall.dmi differ
diff --git a/uncut_icons/walls/necro_wall.png b/icons/turf/walls/necro_wall.png
similarity index 100%
rename from uncut_icons/walls/necro_wall.png
rename to icons/turf/walls/necro_wall.png
diff --git a/icons/turf/walls/necro_wall.png.toml b/icons/turf/walls/necro_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/necro_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/paperframe_wall.dmi b/icons/turf/walls/paperframe_wall.dmi
index 489a017459990..1f043e241ed16 100644
Binary files a/icons/turf/walls/paperframe_wall.dmi and b/icons/turf/walls/paperframe_wall.dmi differ
diff --git a/uncut_icons/walls/paperframe_wall.png b/icons/turf/walls/paperframe_wall.png
similarity index 100%
rename from uncut_icons/walls/paperframe_wall.png
rename to icons/turf/walls/paperframe_wall.png
diff --git a/icons/turf/walls/paperframe_wall.png.toml b/icons/turf/walls/paperframe_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/paperframe_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/pizza_wall.dmi b/icons/turf/walls/pizza_wall.dmi
index 8e0285f4a942a..23e4b6016c9e1 100644
Binary files a/icons/turf/walls/pizza_wall.dmi and b/icons/turf/walls/pizza_wall.dmi differ
diff --git a/uncut_icons/walls/pizza_wall.png b/icons/turf/walls/pizza_wall.png
similarity index 100%
rename from uncut_icons/walls/pizza_wall.png
rename to icons/turf/walls/pizza_wall.png
diff --git a/icons/turf/walls/pizza_wall.png.toml b/icons/turf/walls/pizza_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/pizza_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/plasma_wall.dmi b/icons/turf/walls/plasma_wall.dmi
index 30e59989ef663..b3c9bb5fe611e 100644
Binary files a/icons/turf/walls/plasma_wall.dmi and b/icons/turf/walls/plasma_wall.dmi differ
diff --git a/uncut_icons/walls/plasma_wall.png b/icons/turf/walls/plasma_wall.png
similarity index 100%
rename from uncut_icons/walls/plasma_wall.png
rename to icons/turf/walls/plasma_wall.png
diff --git a/uncut_icons/walls/hierophant_wall.toml b/icons/turf/walls/plasma_wall.png.toml
similarity index 50%
rename from uncut_icons/walls/hierophant_wall.toml
rename to icons/turf/walls/plasma_wall.png.toml
index 187d7ed0a0d65..45dab6be83f05 100644
--- a/uncut_icons/walls/hierophant_wall.toml
+++ b/icons/turf/walls/plasma_wall.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [animation]
 delays = [ 1 ]
diff --git a/icons/turf/walls/plastinum_wall.dmi b/icons/turf/walls/plastinum_wall.dmi
index 8d0042fe43bcb..71d103f4c5fe9 100644
Binary files a/icons/turf/walls/plastinum_wall.dmi and b/icons/turf/walls/plastinum_wall.dmi differ
diff --git a/uncut_icons/walls/plastinum_wall.png b/icons/turf/walls/plastinum_wall.png
similarity index 100%
rename from uncut_icons/walls/plastinum_wall.png
rename to icons/turf/walls/plastinum_wall.png
diff --git a/icons/turf/walls/plastinum_wall.png.toml b/icons/turf/walls/plastinum_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/plastinum_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/plastitanium_wall.dmi b/icons/turf/walls/plastitanium_wall.dmi
index ca79b39cf7abb..970558810bd82 100644
Binary files a/icons/turf/walls/plastitanium_wall.dmi and b/icons/turf/walls/plastitanium_wall.dmi differ
diff --git a/uncut_icons/walls/plastitanium_wall.png b/icons/turf/walls/plastitanium_wall.png
similarity index 100%
rename from uncut_icons/walls/plastitanium_wall.png
rename to icons/turf/walls/plastitanium_wall.png
diff --git a/icons/turf/walls/plastitanium_wall.png.toml b/icons/turf/walls/plastitanium_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/plastitanium_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/red_rock_wall.dmi b/icons/turf/walls/red_rock_wall.dmi
index 00494d6572fe7..c2a6a14a1ea90 100644
Binary files a/icons/turf/walls/red_rock_wall.dmi and b/icons/turf/walls/red_rock_wall.dmi differ
diff --git a/uncut_icons/walls/red_rock_wall.png b/icons/turf/walls/red_rock_wall.png
similarity index 100%
rename from uncut_icons/walls/red_rock_wall.png
rename to icons/turf/walls/red_rock_wall.png
diff --git a/uncut_icons/walls/red_rock_wall.toml b/icons/turf/walls/red_rock_wall.png.toml
similarity index 67%
rename from uncut_icons/walls/red_rock_wall.toml
rename to icons/turf/walls/red_rock_wall.png.toml
index 457aadcbde971..956331d2e2cae 100644
--- a/uncut_icons/walls/red_rock_wall.toml
+++ b/icons/turf/walls/red_rock_wall.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [slice_point]
 west = 10
diff --git a/icons/turf/walls/reinforced_wall.dmi b/icons/turf/walls/reinforced_wall.dmi
index 3cdab6eee219b..704c855d54996 100644
Binary files a/icons/turf/walls/reinforced_wall.dmi and b/icons/turf/walls/reinforced_wall.dmi differ
diff --git a/uncut_icons/walls/reinforced_wall.png b/icons/turf/walls/reinforced_wall.png
similarity index 100%
rename from uncut_icons/walls/reinforced_wall.png
rename to icons/turf/walls/reinforced_wall.png
diff --git a/icons/turf/walls/reinforced_wall.png.toml b/icons/turf/walls/reinforced_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/reinforced_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/riveted_wall.dmi b/icons/turf/walls/riveted_wall.dmi
index 153cac0f09d1e..b2149ede08ec3 100644
Binary files a/icons/turf/walls/riveted_wall.dmi and b/icons/turf/walls/riveted_wall.dmi differ
diff --git a/uncut_icons/walls/riveted_wall.png b/icons/turf/walls/riveted_wall.png
similarity index 100%
rename from uncut_icons/walls/riveted_wall.png
rename to icons/turf/walls/riveted_wall.png
diff --git a/icons/turf/walls/riveted_wall.png.toml b/icons/turf/walls/riveted_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/riveted_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/rock_wall.dmi b/icons/turf/walls/rock_wall.dmi
index 88d619e6a3378..1dba0ac7fff69 100644
Binary files a/icons/turf/walls/rock_wall.dmi and b/icons/turf/walls/rock_wall.dmi differ
diff --git a/uncut_icons/walls/rock_wall.png b/icons/turf/walls/rock_wall.png
similarity index 100%
rename from uncut_icons/walls/rock_wall.png
rename to icons/turf/walls/rock_wall.png
diff --git a/uncut_icons/walls/rock_wall.toml b/icons/turf/walls/rock_wall.png.toml
similarity index 67%
rename from uncut_icons/walls/rock_wall.toml
rename to icons/turf/walls/rock_wall.png.toml
index c5ba17e904451..9f9d6539e0d38 100644
--- a/uncut_icons/walls/rock_wall.toml
+++ b/icons/turf/walls/rock_wall.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [slice_point]
 west = 10
diff --git a/icons/turf/walls/rock_wall2.dmi b/icons/turf/walls/rock_wall2.dmi
index ab9dbd53b1d37..78ad563e19008 100644
Binary files a/icons/turf/walls/rock_wall2.dmi and b/icons/turf/walls/rock_wall2.dmi differ
diff --git a/uncut_icons/walls/rock_wall2.png b/icons/turf/walls/rock_wall2.png
similarity index 100%
rename from uncut_icons/walls/rock_wall2.png
rename to icons/turf/walls/rock_wall2.png
diff --git a/uncut_icons/walls/icerock_wall.toml b/icons/turf/walls/rock_wall2.png.toml
similarity index 67%
rename from uncut_icons/walls/icerock_wall.toml
rename to icons/turf/walls/rock_wall2.png.toml
index 59dbe0b218b17..ff538cf657312 100644
--- a/uncut_icons/walls/icerock_wall.toml
+++ b/icons/turf/walls/rock_wall2.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [slice_point]
 west = 4
diff --git a/icons/turf/walls/rusty_reinforced_wall.dmi b/icons/turf/walls/rusty_reinforced_wall.dmi
index 721264ada6aba..0079fbdb2886c 100644
Binary files a/icons/turf/walls/rusty_reinforced_wall.dmi and b/icons/turf/walls/rusty_reinforced_wall.dmi differ
diff --git a/uncut_icons/walls/rusty_reinforced_wall.png b/icons/turf/walls/rusty_reinforced_wall.png
similarity index 100%
rename from uncut_icons/walls/rusty_reinforced_wall.png
rename to icons/turf/walls/rusty_reinforced_wall.png
diff --git a/icons/turf/walls/rusty_reinforced_wall.png.toml b/icons/turf/walls/rusty_reinforced_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/rusty_reinforced_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/rusty_wall.dmi b/icons/turf/walls/rusty_wall.dmi
index c2b5fe49f0f1a..132692fbe7089 100644
Binary files a/icons/turf/walls/rusty_wall.dmi and b/icons/turf/walls/rusty_wall.dmi differ
diff --git a/uncut_icons/walls/rusty_wall.png b/icons/turf/walls/rusty_wall.png
similarity index 100%
rename from uncut_icons/walls/rusty_wall.png
rename to icons/turf/walls/rusty_wall.png
diff --git a/icons/turf/walls/rusty_wall.png.toml b/icons/turf/walls/rusty_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/rusty_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/sandstone_wall.dmi b/icons/turf/walls/sandstone_wall.dmi
index 77760075bcb9d..a0a36e4e829f8 100644
Binary files a/icons/turf/walls/sandstone_wall.dmi and b/icons/turf/walls/sandstone_wall.dmi differ
diff --git a/uncut_icons/walls/sandstone_wall.png b/icons/turf/walls/sandstone_wall.png
similarity index 100%
rename from uncut_icons/walls/sandstone_wall.png
rename to icons/turf/walls/sandstone_wall.png
diff --git a/icons/turf/walls/sandstone_wall.png.toml b/icons/turf/walls/sandstone_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/sandstone_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/shuttle_wall.dmi b/icons/turf/walls/shuttle_wall.dmi
index 1a4d768ac15c4..565c6ee4750ac 100644
Binary files a/icons/turf/walls/shuttle_wall.dmi and b/icons/turf/walls/shuttle_wall.dmi differ
diff --git a/uncut_icons/walls/shuttle_wall.png b/icons/turf/walls/shuttle_wall.png
similarity index 100%
rename from uncut_icons/walls/shuttle_wall.png
rename to icons/turf/walls/shuttle_wall.png
diff --git a/icons/turf/walls/shuttle_wall.png.toml b/icons/turf/walls/shuttle_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/shuttle_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/silver_wall.dmi b/icons/turf/walls/silver_wall.dmi
index 40257c3956ff2..5e466f8c23652 100644
Binary files a/icons/turf/walls/silver_wall.dmi and b/icons/turf/walls/silver_wall.dmi differ
diff --git a/uncut_icons/walls/silver_wall.png b/icons/turf/walls/silver_wall.png
similarity index 100%
rename from uncut_icons/walls/silver_wall.png
rename to icons/turf/walls/silver_wall.png
diff --git a/icons/turf/walls/silver_wall.png.toml b/icons/turf/walls/silver_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/silver_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/snow_wall.dmi b/icons/turf/walls/snow_wall.dmi
index e3fb92547babf..3d28528aa3161 100644
Binary files a/icons/turf/walls/snow_wall.dmi and b/icons/turf/walls/snow_wall.dmi differ
diff --git a/uncut_icons/walls/snow_wall.png b/icons/turf/walls/snow_wall.png
similarity index 100%
rename from uncut_icons/walls/snow_wall.png
rename to icons/turf/walls/snow_wall.png
diff --git a/icons/turf/walls/snow_wall.png.toml b/icons/turf/walls/snow_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/snow_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/survival_pod_wall.dmi b/icons/turf/walls/survival_pod_wall.dmi
index 286650559fb51..e8a8c4e62bb87 100644
Binary files a/icons/turf/walls/survival_pod_wall.dmi and b/icons/turf/walls/survival_pod_wall.dmi differ
diff --git a/uncut_icons/walls/survival_pod_wall.png b/icons/turf/walls/survival_pod_wall.png
similarity index 100%
rename from uncut_icons/walls/survival_pod_wall.png
rename to icons/turf/walls/survival_pod_wall.png
diff --git a/icons/turf/walls/survival_pod_wall.png.toml b/icons/turf/walls/survival_pod_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/survival_pod_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/uranium_wall.dmi b/icons/turf/walls/uranium_wall.dmi
index 5747528692394..847fcc77f44c3 100644
Binary files a/icons/turf/walls/uranium_wall.dmi and b/icons/turf/walls/uranium_wall.dmi differ
diff --git a/uncut_icons/walls/uranium_wall.png b/icons/turf/walls/uranium_wall.png
similarity index 100%
rename from uncut_icons/walls/uranium_wall.png
rename to icons/turf/walls/uranium_wall.png
diff --git a/icons/turf/walls/uranium_wall.png.toml b/icons/turf/walls/uranium_wall.png.toml
new file mode 100644
index 0000000000000..68a980052ec0a
--- /dev/null
+++ b/icons/turf/walls/uranium_wall.png.toml
@@ -0,0 +1 @@
+template = "bitmask/walls"
diff --git a/icons/turf/walls/wood_wall.dmi b/icons/turf/walls/wood_wall.dmi
index 1071fa3325615..b00d5a2d4e6c6 100644
Binary files a/icons/turf/walls/wood_wall.dmi and b/icons/turf/walls/wood_wall.dmi differ
diff --git a/uncut_icons/walls/wood_wall.png b/icons/turf/walls/wood_wall.png
similarity index 100%
rename from uncut_icons/walls/wood_wall.png
rename to icons/turf/walls/wood_wall.png
diff --git a/uncut_icons/walls/wood_wall.toml b/icons/turf/walls/wood_wall.png.toml
similarity index 67%
rename from uncut_icons/walls/wood_wall.toml
rename to icons/turf/walls/wood_wall.png.toml
index b26e1a5905391..9aa56f537733e 100644
--- a/uncut_icons/walls/wood_wall.toml
+++ b/icons/turf/walls/wood_wall.png.toml
@@ -1,4 +1,4 @@
-template = "walls"
+template = "bitmask/walls"
 
 [slice_point]
 west = 5
diff --git a/tgstation.dme b/tgstation.dme
index b94e320cf5392..a72146dd05a00 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1017,8 +1017,8 @@
 #include "code\datums\components\chasm.dm"
 #include "code\datums\components\chuunibyou.dm"
 #include "code\datums\components\cleaner.dm"
-#include "code\datums\components\clothing_fov_visor.dm"
 #include "code\datums\components\clickbox.dm"
+#include "code\datums\components\clothing_fov_visor.dm"
 #include "code\datums\components\codeword_hearing.dm"
 #include "code\datums\components\combo_attacks.dm"
 #include "code\datums\components\combustible_flooder.dm"
@@ -1408,8 +1408,8 @@
 #include "code\datums\elements\high_fiver.dm"
 #include "code\datums\elements\honkspam.dm"
 #include "code\datums\elements\human_biter.dm"
-#include "code\datums\elements\item_fov.dm"
 #include "code\datums\elements\immerse.dm"
+#include "code\datums\elements\item_fov.dm"
 #include "code\datums\elements\item_scaling.dm"
 #include "code\datums\elements\kneecapping.dm"
 #include "code\datums\elements\kneejerk.dm"
@@ -2804,8 +2804,8 @@
 #include "code\modules\admin\verbs\debug.dm"
 #include "code\modules\admin\verbs\diagnostics.dm"
 #include "code\modules\admin\verbs\ert.dm"
-#include "code\modules\admin\verbs\fov.dm"
 #include "code\modules\admin\verbs\fix_air.dm"
+#include "code\modules\admin\verbs\fov.dm"
 #include "code\modules\admin\verbs\fps.dm"
 #include "code\modules\admin\verbs\getlogs.dm"
 #include "code\modules\admin\verbs\ghost_pool_protection.dm"
diff --git a/uncut_icons/compiled/misc/resin_wall.dmi b/uncut_icons/compiled/misc/resin_wall.dmi
deleted file mode 100644
index a37e03be5d113..0000000000000
Binary files a/uncut_icons/compiled/misc/resin_wall.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/bronze_window.dmi b/uncut_icons/compiled/windows/bronze_window.dmi
deleted file mode 100644
index e55b1beae4062..0000000000000
Binary files a/uncut_icons/compiled/windows/bronze_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/frosted_window.dmi b/uncut_icons/compiled/windows/frosted_window.dmi
deleted file mode 100644
index 1af8de31ec512..0000000000000
Binary files a/uncut_icons/compiled/windows/frosted_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/normal_window.dmi b/uncut_icons/compiled/windows/normal_window.dmi
deleted file mode 100644
index f7a363a071097..0000000000000
Binary files a/uncut_icons/compiled/windows/normal_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/plasma_reinforced_window.dmi b/uncut_icons/compiled/windows/plasma_reinforced_window.dmi
deleted file mode 100644
index fa64beb828741..0000000000000
Binary files a/uncut_icons/compiled/windows/plasma_reinforced_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/plasma_window.dmi b/uncut_icons/compiled/windows/plasma_window.dmi
deleted file mode 100644
index 67fda7803b4b3..0000000000000
Binary files a/uncut_icons/compiled/windows/plasma_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/plastitanium_window.dmi b/uncut_icons/compiled/windows/plastitanium_window.dmi
deleted file mode 100644
index 90e6b613d0611..0000000000000
Binary files a/uncut_icons/compiled/windows/plastitanium_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/pod_window.dmi b/uncut_icons/compiled/windows/pod_window.dmi
deleted file mode 100644
index 6a2ecdf4eceb2..0000000000000
Binary files a/uncut_icons/compiled/windows/pod_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/reinforced_window.dmi b/uncut_icons/compiled/windows/reinforced_window.dmi
deleted file mode 100644
index 1fb513d97fab7..0000000000000
Binary files a/uncut_icons/compiled/windows/reinforced_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/tinted_window.dmi b/uncut_icons/compiled/windows/tinted_window.dmi
deleted file mode 100644
index a6d03210762f1..0000000000000
Binary files a/uncut_icons/compiled/windows/tinted_window.dmi and /dev/null differ
diff --git a/uncut_icons/compiled/windows/titanium_window.dmi b/uncut_icons/compiled/windows/titanium_window.dmi
deleted file mode 100644
index ae43e4fdb686a..0000000000000
Binary files a/uncut_icons/compiled/windows/titanium_window.dmi and /dev/null differ
diff --git a/uncut_icons/misc/resin_wall.dmi b/uncut_icons/misc/resin_wall.dmi
deleted file mode 100644
index d39dca1e59608..0000000000000
Binary files a/uncut_icons/misc/resin_wall.dmi and /dev/null differ
diff --git a/uncut_icons/misc/resin_wall.png.toml b/uncut_icons/misc/resin_wall.png.toml
deleted file mode 100644
index 1cc140cd50d4b..0000000000000
--- a/uncut_icons/misc/resin_wall.png.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-template = "walls"
-
diff --git a/uncut_icons/misc/wall_dark.dmi b/uncut_icons/misc/wall_dark.dmi
deleted file mode 100644
index 869d7ecf69247..0000000000000
Binary files a/uncut_icons/misc/wall_dark.dmi and /dev/null differ
diff --git a/uncut_icons/misc/wall_lighting.dmi b/uncut_icons/misc/wall_lighting.dmi
deleted file mode 100644
index 5d8ecdf3babe6..0000000000000
Binary files a/uncut_icons/misc/wall_lighting.dmi and /dev/null differ
diff --git a/uncut_icons/misc/wall_transparent.dmi b/uncut_icons/misc/wall_transparent.dmi
deleted file mode 100644
index 4d7758b4c32c9..0000000000000
Binary files a/uncut_icons/misc/wall_transparent.dmi and /dev/null differ
diff --git a/uncut_icons/templates/reconstruct_bitmask.toml b/uncut_icons/templates/reconstruct_bitmask.toml
deleted file mode 100644
index cf6de792b7564..0000000000000
--- a/uncut_icons/templates/reconstruct_bitmask.toml
+++ /dev/null
@@ -1 +0,0 @@
-mode = "BitmaskSliceReconstruct"
diff --git a/uncut_icons/walls/abductor_wall.toml b/uncut_icons/walls/abductor_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/abductor_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/bamboo_wall.toml b/uncut_icons/walls/bamboo_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/bamboo_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/bananium_wall.toml b/uncut_icons/walls/bananium_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/bananium_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/bathroom_wall.toml b/uncut_icons/walls/bathroom_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/bathroom_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/boss_wall.toml b/uncut_icons/walls/boss_wall.toml
deleted file mode 100644
index 3e9e3442f9697..0000000000000
--- a/uncut_icons/walls/boss_wall.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-template = "walls"
-[prefabs]
-0 = 5
diff --git a/uncut_icons/walls/clockwork_wall.toml b/uncut_icons/walls/clockwork_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/clockwork_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/cult_wall.toml b/uncut_icons/walls/cult_wall.toml
deleted file mode 100644
index e3d93c935afb6..0000000000000
--- a/uncut_icons/walls/cult_wall.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-template = "walls"
-[cut_pos]
-y = 16
diff --git a/uncut_icons/walls/debug_wall.toml b/uncut_icons/walls/debug_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/debug_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/gold_wall.toml b/uncut_icons/walls/gold_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/gold_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/hotel_door.toml b/uncut_icons/walls/hotel_door.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/hotel_door.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/hotel_wall.toml b/uncut_icons/walls/hotel_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/hotel_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/iron_wall.toml b/uncut_icons/walls/iron_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/iron_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/material_wall.toml b/uncut_icons/walls/material_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/material_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/metal_wall.toml b/uncut_icons/walls/metal_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/metal_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/necro_wall.toml b/uncut_icons/walls/necro_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/necro_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/paperframe_wall.toml b/uncut_icons/walls/paperframe_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/paperframe_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/pizza_wall.toml b/uncut_icons/walls/pizza_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/pizza_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/plastinum_wall.toml b/uncut_icons/walls/plastinum_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/plastinum_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/plastitanium_wall.toml b/uncut_icons/walls/plastitanium_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/plastitanium_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/reinforced_wall.toml b/uncut_icons/walls/reinforced_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/reinforced_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/riveted_wall.toml b/uncut_icons/walls/riveted_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/riveted_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/rusty_reinforced_wall.toml b/uncut_icons/walls/rusty_reinforced_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/rusty_reinforced_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/rusty_wall.toml b/uncut_icons/walls/rusty_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/rusty_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/sandstone_wall.toml b/uncut_icons/walls/sandstone_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/sandstone_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/shuttle_wall.toml b/uncut_icons/walls/shuttle_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/shuttle_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/silver_wall.toml b/uncut_icons/walls/silver_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/silver_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/snow_wall.toml b/uncut_icons/walls/snow_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/snow_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/survival_pod_wall.toml b/uncut_icons/walls/survival_pod_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/survival_pod_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/walls/uranium_wall.toml b/uncut_icons/walls/uranium_wall.toml
deleted file mode 100644
index 93e1c8e1e83e9..0000000000000
--- a/uncut_icons/walls/uranium_wall.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "walls"
diff --git a/uncut_icons/windows/bronze_window.toml b/uncut_icons/windows/bronze_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/bronze_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/frosted_window.toml b/uncut_icons/windows/frosted_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/frosted_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/normal_window.toml b/uncut_icons/windows/normal_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/normal_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/plasma_reinforced_window.toml b/uncut_icons/windows/plasma_reinforced_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/plasma_reinforced_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/plasma_window.toml b/uncut_icons/windows/plasma_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/plasma_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/plastitanium_window.toml b/uncut_icons/windows/plastitanium_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/plastitanium_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/pod_window.toml b/uncut_icons/windows/pod_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/pod_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/reinforced_window.toml b/uncut_icons/windows/reinforced_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/reinforced_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/tinted_window.toml b/uncut_icons/windows/tinted_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/tinted_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"
diff --git a/uncut_icons/windows/titanium_window.toml b/uncut_icons/windows/titanium_window.toml
deleted file mode 100644
index fba6e13d79fe0..0000000000000
--- a/uncut_icons/windows/titanium_window.toml
+++ /dev/null
@@ -1 +0,0 @@
-template = "windows"