diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 230c1a3295..ad0b33f966 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -263,18 +263,32 @@
 /obj/structure/table/wood/fancy
 	name = "fancy table"
 	desc = "A standard metal table frame covered with an amazingly fancy, patterned cloth."
-	icon = 'icons/obj/smooth_structures/fancy_table.dmi'
+	icon = 'icons/obj/structures.dmi'
 	icon_state = "fancy_table"
 	frame = /obj/structure/table_frame
 	framestack = /obj/item/stack/rods
 	buildstack = /obj/item/stack/tile/carpet
 	canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black)
 
+/obj/structure/table/wood/fancy/New()
+	// New() is used so that the /black subtype can override `icon` easily and
+	// the correct value will be used by the smoothing subsystem.
+	. = ..()
+	// Needs to be set dynamically because table smooth sprites are 32x34,
+	// which the editor treats as a two-tile-tall object. The sprites are that
+	// size so that the north/south corners look nice - examine the detail on
+	// the sprites in the editor to see why.
+	icon = 'icons/obj/smooth_structures/fancy_table.dmi'
+
 /obj/structure/table/wood/fancy/black
-	icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
 	icon_state = "fancy_table_black"
 	buildstack = /obj/item/stack/tile/carpet/black
 
+/obj/structure/table/wood/fancy/black/New()
+	. = ..()
+	// Ditto above.
+	icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
+
 /*
  * Reinforced tables
  */
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index d4e6d62f60..897508fa8c 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ