diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 1f19184b50..2878302e9a 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -59,6 +59,9 @@ public enum CollisionGroup
     TableMask = Impassable | MidImpassable,
     TableLayer = MidImpassable,
 
+    // Tables that SmallMobs can't go under
+    CounterLayer = MidImpassable | LowImpassable,
+
     // Tabletop machines, windoors, firelocks
     TabletopMachineMask = Impassable | HighImpassable,
     // Tabletop machines
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index 27cb4d8b68..3cbbccd3ca 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -57,4 +57,4 @@
         mask:
         - TableMask
         layer:
-        - TableLayer
+        - CounterLayer
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index fda2ac5e18..edf653d066 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -77,7 +77,7 @@
         mask:
         - TableMask
         layer:
-        - TableLayer
+        - CounterLayer
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Wood
@@ -201,7 +201,7 @@
 
 - type: entity
   id: TableReinforced
-  parent: TableBase
+  parent: CounterBase
   name: reinforced table
   description: A square piece of metal standing on four metal legs. Extra robust.
   components:
@@ -471,7 +471,7 @@
 
 - type: entity
   id: TableBrass
-  parent: TableBase
+  parent: CounterBase
   name: brass table
   description: A shiny, corrosion resistant brass table. Steampunk!
   components:
@@ -615,7 +615,7 @@
 
 - type: entity
   id: TableStone
-  parent: TableBase
+  parent: CounterBase
   name: stone table
   description: Literally the sturdiest thing you have ever seen.
   components:
@@ -675,7 +675,7 @@
       collection: FootstepCarpet
 
 - type: entity
-  parent: TableBase
+  parent: CounterBase
   id: TableXeno
   name: xeno table
   description: I wouldn't put the silverware on it.
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index 4867fc84d8..1009374cd6 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -105,7 +105,7 @@
           mask:
             - TableMask
           layer:
-            - TableLayer
+            - CounterLayer
     - type: TimedDespawn
       lifetime: 180
     - type: PointLight
diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
index 6722181b26..feec88eeaf 100644
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -29,10 +29,7 @@
           - 0.50,0.50
           - -0.50,0.50
         layer:
-        - Impassable
-        - MidImpassable
-        - LowImpassable
-        - DoorPassable
+        - ConveyorMask
         hard: False
   - type: Conveyor
   - type: DeviceNetwork