diff --git a/Resources/Prototypes/Entities/table.yml b/Resources/Prototypes/Entities/table.yml
index 2885b7119f..060504d6fe 100644
--- a/Resources/Prototypes/Entities/table.yml
+++ b/Resources/Prototypes/Entities/table.yml
@@ -1,16 +1,23 @@
 - type: entity
   id: table
-  name: "[engine] worktop"
+  name: "worktop"
   components:
   - type: Clickable
   - type: Sprite
-    texture: Objects/worktop_single.png
+    netsync: false
+    sprite: Buildings/table_solid.rsi
+    state: plain_preview
 
   - type: Icon
-    texture: Objects/worktop_single.png
+    sprite: Buildings/table_solid.rsi
+    state: plain_preview
 
   - type: BoundingBox
-    aabb: "-0.45,-1,0.95,1"
-    DebugColor: "#0000FF"
-
   - type: Collidable
+
+  - type: SnapGrid
+    offset: Center
+
+  - type: IconSmooth
+    key: tables
+    base: solid_
diff --git a/Resources/Textures/Buildings/table_solid.rsi/meta.json b/Resources/Textures/Buildings/table_solid.rsi/meta.json
new file mode 100644
index 0000000000..447dced093
--- /dev/null
+++ b/Resources/Textures/Buildings/table_solid.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", "states": [{"name": "plain_preview", "directions": 1, "delays": [[1.0]]}, {"name": "solid_0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "solid_7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_0.png b/Resources/Textures/Buildings/table_solid.rsi/solid_0.png
new file mode 100644
index 0000000000..55c7c54235
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_0.png differ
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_1.png b/Resources/Textures/Buildings/table_solid.rsi/solid_1.png
new file mode 100644
index 0000000000..cd2e6ea711
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_1.png differ
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_2.png b/Resources/Textures/Buildings/table_solid.rsi/solid_2.png
new file mode 100644
index 0000000000..55c7c54235
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_2.png differ
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_3.png b/Resources/Textures/Buildings/table_solid.rsi/solid_3.png
new file mode 100644
index 0000000000..cd2e6ea711
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_3.png differ
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_4.png b/Resources/Textures/Buildings/table_solid.rsi/solid_4.png
new file mode 100644
index 0000000000..adcf8d2fec
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_4.png differ
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_5.png b/Resources/Textures/Buildings/table_solid.rsi/solid_5.png
new file mode 100644
index 0000000000..e8f375236d
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_5.png differ
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_6.png b/Resources/Textures/Buildings/table_solid.rsi/solid_6.png
new file mode 100644
index 0000000000..adcf8d2fec
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_6.png differ
diff --git a/Resources/Textures/Buildings/table_solid.rsi/solid_7.png b/Resources/Textures/Buildings/table_solid.rsi/solid_7.png
new file mode 100644
index 0000000000..2567c9a581
Binary files /dev/null and b/Resources/Textures/Buildings/table_solid.rsi/solid_7.png differ