diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 8672b4054a..8a2514ed07 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -26,7 +26,7 @@ public enum CollisionGroup
     // 32 possible groups
     AllMask = -1,
 
-    MobMask = Impassable | MidImpassable | LowImpassable,
+    MobMask = Impassable | HighImpassable | MidImpassable | LowImpassable,
     MobLayer = Opaque | BulletImpassable,
     SmallMobMask = Impassable | LowImpassable,
     SmallMobLayer = Opaque | BulletImpassable,
@@ -57,6 +57,7 @@ public enum CollisionGroup
     GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
     HalfWallLayer = MidImpassable | LowImpassable,
     FullTileMask = Impassable | HighImpassable | MidImpassable | LowImpassable,
-
+    FullTileLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
+    
     SubfloorMask = Impassable | LowImpassable
 }
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index a2ed4c60d6..2ff2ed1616 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -48,8 +48,7 @@
           !type:PhysShapeAabb
           bounds: "-0.49,-0.49,0.49,0.49"  # don't want this colliding with walls or they won't close
         mask:
-        - Impassable
-        - HighImpassable
+        - TabletopMachineMask
         layer:
         - AirlockLayer
     - type: Door
diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
index d2a726446f..67659386a6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -20,7 +20,7 @@
       id: brrt
       hard: false
       layer:
-      - FullTileMask
+      - FullTileLayer
     - shape:
         !type:PhysShapeAabb
         bounds: "-0.49,-0.49,0.49,0.49"
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index abad938b39..34f19559f3 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -24,9 +24,9 @@
         !type:PhysShapeAabb
         bounds: "-0.25,-0.45,0.25,0.45"
       mask:
-      - FullTileMask
+      - MachineMask
       layer:
-      - WallLayer
+      - MachineLayer
       mass: 100
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
index 7cc004236a..720cd9c7fb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
@@ -13,7 +13,7 @@
       mask:
       - FullTileMask
       layer:
-      - FullTileMask
+      - WallLayer
   - type: InteractionOutline
   - type: Anchorable
   - type: Sprite
@@ -50,7 +50,7 @@
       mask:
       - FullTileMask
       layer:
-      - FullTileMask
+      - GlassLayer
   - type: Transform
     anchored: true
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Walls/girder.yml b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
index 2dffd9d499..b026cd6489 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
@@ -18,7 +18,7 @@
       mask:
       - MachineMask
       layer:
-      - FullTileMask
+      - GlassAirlockLayer
   - type: InteractionOutline
   - type: Construction
     graph: Girder
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index 6119dd59b2..0969147bb5 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -117,10 +117,10 @@
         !type:PhysShapeAabb
         bounds: "-0.49,-0.49,0.49,-0.3"
       mass: 50
-      layer:
-      - GlassLayer
       mask:
       - FullTileMask
+      layer:
+      - GlassLayer
   - type: Repairable
   - type: Damageable
     damageContainer: Inorganic