diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
index 586c91978f..54d2a99397 100644
--- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
+++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
@@ -81,6 +81,9 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
             base.Startup();
 
             SnapGrid.OnPositionChanged += SnapGridOnPositionChanged;
+            // ensures lastposition initial value is populated on spawn. Just calling
+            // the hook here would cause a dirty event to fire needlessly
+            _lastPosition = (Owner.Transform.GridID, SnapGrid.Position);
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner,null, SnapGrid.Offset, Mode));
             if (Mode == IconSmoothingMode.Corners)
             {
diff --git a/Resources/Prototypes/Entities/Buildings/table.yml b/Resources/Prototypes/Entities/Buildings/table.yml
index 13c343ea83..51931cd5b9 100644
--- a/Resources/Prototypes/Entities/Buildings/table.yml
+++ b/Resources/Prototypes/Entities/Buildings/table.yml
@@ -28,8 +28,9 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 50
-    spawnondestroy: TableParts
+    spawnondestroy: SteelSheet1
 
+# TODO: drop wood instead of steel when destroyed when that's added
 - type: entity
   id: TableWood
   parent: Table
@@ -41,4 +42,4 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 50
-    spawnondestroy: TableParts
+    spawnondestroy: SteelSheet1
diff --git a/Resources/Prototypes/Entities/Items/table_parts.yml b/Resources/Prototypes/Entities/Items/table_parts.yml
deleted file mode 100644
index ca95909b86..0000000000
--- a/Resources/Prototypes/Entities/Items/table_parts.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: entity
-  name: Table Parts
-  parent: BaseItem
-  id: TableParts
-  description: Parts of a table.
-  components:
-  - type: Sprite
-    sprite: Objects/Parts/table_parts.rsi
-    state: icon
-
-  - type: Icon
-    sprite: Objects/Parts/table_parts.rsi
-    state: icon
-
-  - type: Item
-    Size: 25
-    sprite: Objects/Parts/table_parts.rsi