diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml
index 15dbd08963..459fb5f2f7 100644
--- a/Resources/Prototypes/Construction/structures.yml
+++ b/Resources/Prototypes/Construction/structures.yml
@@ -19,7 +19,7 @@
   - material: Metal
     amount: 2
     reverse:
-      tool: Welder
+      tool: Wrench
 
 - type: construction
   name: Table
@@ -33,3 +33,65 @@
   steps:
   - material: Metal
     amount: 2
+
+- type: construction
+  name: Window
+  id: window
+  category: Structures
+  description: Clear.
+  icon:
+    sprite: Buildings/window.rsi
+    state: full
+  objecttype: Structure
+  result: window
+  placementmode: SnapgridCenter
+  steps:
+  - material: Glass
+    amount: 2
+
+- type: construction
+  name: Low Wall
+  id: low_wall
+  category: Structures
+  description: A low wall used for mounting windows.
+  icon:
+    sprite: Buildings/low_wall.rsi
+    state: metal
+  objecttype: Structure
+  result: low_wall
+  placementmode: SnapgridCenter
+  steps:
+  - material: Metal
+    amount: 2
+    icon: Buildings/wall_girder.png
+    reverse:
+      tool: Wrench
+
+  - material: Metal
+    amount: 2
+    reverse:
+      tool: Wrench
+
+- type: construction
+  name: Rein Window
+  id: rwindow
+  category: Structures
+  description: Clear but tough.
+  icon:
+    sprite: Buildings/rwindow.rsi
+    state: full
+  objecttype: Structure
+  result: rwindow
+  placementmode: SnapgridCenter
+  steps:
+  - material: Glass
+    amount: 2
+    reverse:
+      tool: Wrench
+
+# Should be replaced with Metal Rods when someone puts them in.
+  - material: Metal
+    amount: 2
+    reverse:
+      # Should be replaced with Wirecutter when someone makes it work.
+      tool: Wrench
diff --git a/Resources/Prototypes/Entities/buildings/walls.yml b/Resources/Prototypes/Entities/buildings/walls.yml
index 5bd0e7f08c..92af17e090 100644
--- a/Resources/Prototypes/Entities/buildings/walls.yml
+++ b/Resources/Prototypes/Entities/buildings/walls.yml
@@ -13,8 +13,10 @@
   - type: Sprite
     netsync: false
     drawdepth: Walls
+
   - type: Icon
     state: full
+
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
@@ -26,6 +28,7 @@
   - type: Occluder
     sizeX: 32
     sizeY: 32
+
   - type: SnapGrid
     offset: Center
 
diff --git a/Resources/Prototypes/Entities/buildings/windows.yml b/Resources/Prototypes/Entities/buildings/windows.yml
index 279dbd654c..fefb671a8b 100644
--- a/Resources/Prototypes/Entities/buildings/windows.yml
+++ b/Resources/Prototypes/Entities/buildings/windows.yml
@@ -2,6 +2,10 @@
   id: window
   name: Window
   description: Don't smudge up the glass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -13,7 +17,7 @@
 
   - type: Icon
     sprite: Buildings/window.rsi
-    state: window0
+    state: full
 
   - type: Collidable
     shapes:
@@ -30,10 +34,6 @@
   - type: Window
     base: window
 
-  placement:
-    snap:
-    - Wall
-
 - type: entity
   id: rwindow
   name: Reinforced Window
@@ -48,4 +48,4 @@
 
   - type: Icon
     sprite: Buildings/rwindow.rsi
-    state: rwindow0
+    state: full
diff --git a/Resources/Textures/Buildings/rwindow.rsi/full.png b/Resources/Textures/Buildings/rwindow.rsi/full.png
new file mode 100644
index 0000000000..b54c1e59b7
Binary files /dev/null and b/Resources/Textures/Buildings/rwindow.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/rwindow.rsi/meta.json b/Resources/Textures/Buildings/rwindow.rsi/meta.json
index e45955bc22..d0b59b807f 100644
--- a/Resources/Textures/Buildings/rwindow.rsi/meta.json
+++ b/Resources/Textures/Buildings/rwindow.rsi/meta.json
@@ -1 +1,164 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [{"name": "rwindow0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rwindow7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi",
+  "states": [
+    {
+      "name": "full",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow0",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow1",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow2",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow3",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow4",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow5",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow6",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "rwindow7",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Buildings/window.rsi/full.png b/Resources/Textures/Buildings/window.rsi/full.png
new file mode 100644
index 0000000000..7a620720ce
Binary files /dev/null and b/Resources/Textures/Buildings/window.rsi/full.png differ
diff --git a/Resources/Textures/Buildings/window.rsi/meta.json b/Resources/Textures/Buildings/window.rsi/meta.json
index 906d239759..b3ba878755 100644
--- a/Resources/Textures/Buildings/window.rsi/meta.json
+++ b/Resources/Textures/Buildings/window.rsi/meta.json
@@ -1 +1,164 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [{"name": "window0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi",
+  "states": [
+    {
+      "name": "full",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window0",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window1",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window2",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window3",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window4",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window5",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window6",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "window7",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}