diff --git a/Resources/Prototypes/_NF/Entities/Structures/Windows/window_diagonal.yml b/Resources/Prototypes/_NF/Entities/Structures/Windows/window_diagonal.yml
index 42a90896346..9d02224dd3f 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Windows/window_diagonal.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Windows/window_diagonal.yml
@@ -12,13 +12,13 @@
     drawdepth: WallTops
     sprite: _NF/Structures/Windows/window_diagonal.rsi
     state: state0
+  - type: Icon
+    sprite: _NF/Structures/Windows/window_diagonal.rsi
+    state: state0
   - type: IconSmooth
     mode: Diagonal
     key: walls
     base: state
-  - type: Icon
-    sprite: _NF/Structures/Windows/window_diagonal.rsi
-    state: state0
   - type: Fixtures
     fixtures:
       fix1:
@@ -34,7 +34,7 @@
         - GlassLayer
 
 - type: entity
-  parent: WindowDiagonal
+  parent: ReinforcedWindow
   id: WindowReinforcedDiagonal
   name: reinforced window
   suffix: diagonal
@@ -50,34 +50,26 @@
   - type: Icon
     sprite: _NF/Structures/Windows/reinforced_window_diagonal.rsi
     state: state0
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: RGlass
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 300 #excess damage (nuke?). Avoid computational cost of spawning entities.
-      behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlassReinforced:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
+  - type: IconSmooth
+    mode: Diagonal
+    key: walls
+    base: state
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
 
 - type: entity
-  parent: WindowDiagonal
+  parent: PlasmaWindow
   id: WindowPlasmaDiagonal
   name: plasma window
   suffix: diagonal
@@ -93,32 +85,26 @@
   - type: Icon
     sprite: _NF/Structures/Windows/plasma_window_diagonal.rsi
     state: state0
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: RGlass
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlassPlasma:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: StaticPrice
-    price: 30
-  - type: RadiationBlocker
-    resistance: 2
+  - type: IconSmooth
+    mode: Diagonal
+    key: walls
+    base: state
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
 
 - type: entity
-  parent: WindowDiagonal
+  parent: ReinforcedPlasmaWindow
   id: WindowPlasmaReinforcedDiagonal
   name: reinforced plasma window
   suffix: diagonal
@@ -134,35 +120,20 @@
   - type: Icon
     sprite: _NF/Structures/Windows/reinforced_plasma_window_diagonal.rsi
     state: state0
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: RGlass
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1000
-      behaviors: #excess damage, don't spawn entities.
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 600
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlassPlasma:
-            min: 1
-            max: 2
-          PartRodMetal:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: StaticPrice
-    price: 65
-  - type: RadiationBlocker
-    resistance: 4
+  - type: IconSmooth
+    mode: Diagonal
+    key: walls
+    base: state
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer