diff --git a/_maps/skyrat/automapper/templates/deltastation/deltastation_barber.dmm b/_maps/skyrat/automapper/templates/deltastation/deltastation_barber.dmm
index e379a88b6ea..ace61b51043 100644
--- a/_maps/skyrat/automapper/templates/deltastation/deltastation_barber.dmm
+++ b/_maps/skyrat/automapper/templates/deltastation/deltastation_barber.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "bZ" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/item/razor{
 	pixel_x = -6
 	},
@@ -8,10 +8,11 @@
 	pixel_x = 6
 	},
 /obj/machinery/light/directional/south,
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron/edge,
 /area/station/service/barber)
 "eI" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/structure/mirror/directional/south,
 /obj/item/hairbrush/comb{
 	pixel_y = 10
@@ -37,7 +38,7 @@
 /turf/closed/wall/r_wall,
 /area/station/science/robotics/mechbay)
 "iK" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /turf/open/floor/iron/dark/textured_corner{
 	dir = 4
 	},
@@ -172,6 +173,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start/hangover,
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/iron/dark/smooth_edge{
 	dir = 8
 	},
@@ -218,6 +220,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/landmark/start/barber,
 /obj/structure/cable,
+/obj/machinery/holopad,
 /turf/open/floor/iron,
 /area/station/service/barber)
 "Mt" = (
@@ -245,7 +248,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
 "Ts" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/structure/mirror/directional/south,
 /turf/open/floor/iron/edge,
 /area/station/service/barber)
diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm
index dddd5262a70..4ea55d3d1e3 100644
--- a/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm
+++ b/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm
@@ -33,7 +33,7 @@
 /area/station/maintenance/port/greater)
 "g" = (
 /obj/structure/mirror/directional/west,
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/item/razor{
 	pixel_x = -6
 	},
@@ -177,7 +177,7 @@
 /area/station/hallway/primary/central)
 "u" = (
 /obj/item/radio/intercom/directional/west,
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/item/reagent_containers/spray/quantum_hair_dye{
 	pixel_x = 6
 	},
@@ -196,7 +196,7 @@
 /area/station/service/barber)
 "w" = (
 /obj/structure/mirror/directional/west,
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/item/hairbrush/comb{
 	pixel_y = 10
 	},
@@ -267,7 +267,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/purple,
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/structure/window,
 /obj/item/hairbrush,
 /obj/item/lipstick/random,
@@ -309,7 +309,6 @@
 /turf/open/floor/iron,
 /area/station/service/barber)
 "H" = (
-/obj/item/storage/secure/safe/directional/south,
 /obj/machinery/light/directional/south,
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -392,7 +391,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/purple,
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/item/hairbrush,
 /turf/open/floor/iron,
 /area/station/service/barber)
diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm
index 92a800dd863..f3e361debe1 100644
--- a/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm
+++ b/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm
@@ -43,7 +43,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "de" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/item/hairbrush,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -72,6 +72,18 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"fe" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/machinery/button/curtain{
+	id = "barbershopcurtains";
+	pixel_y = -24;
+	pixel_x = -4
+	},
+/turf/open/floor/iron,
+/area/station/service/barber)
 "gn" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/purple{
@@ -176,15 +188,8 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron,
 /area/station/service/barber)
-"xz" = (
-/obj/structure/curtain/cloth/fancy/mechanical{
-	id = "barbershopcurtains1"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/service/barber)
 "yU" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/item/hairbrush,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -232,11 +237,6 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /obj/item/kirbyplants/random,
-/obj/machinery/button/curtain{
-	id = "barbershopcurtains";
-	pixel_x = -25;
-	pixel_y = -24
-	},
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
 /area/station/service/barber)
@@ -263,7 +263,7 @@
 /turf/open/floor/iron,
 /area/station/service/barber)
 "CC" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -314,7 +314,7 @@
 /obj/machinery/button/curtain{
 	id = "barbershopcurtains1";
 	pixel_x = -25;
-	pixel_y = 24
+	pixel_y = 6
 	},
 /turf/open/floor/iron,
 /area/station/service/barber)
@@ -357,7 +357,7 @@
 /turf/open/floor/iron,
 /area/station/service/barber)
 "Kg" = (
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -409,6 +409,11 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /obj/structure/chair/sofa/bench/right,
+/obj/machinery/button/curtain{
+	id = "barbershopcurtains";
+	pixel_y = 24;
+	pixel_x = -4
+	},
 /turf/open/floor/iron,
 /area/station/service/barber)
 "MC" = (
@@ -418,11 +423,6 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /obj/machinery/vending/barbervend,
-/obj/machinery/button/curtain{
-	id = "barbershopcurtains";
-	pixel_x = -25;
-	pixel_y = 24
-	},
 /turf/open/floor/iron,
 /area/station/service/barber)
 "MG" = (
@@ -492,10 +492,10 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/obj/machinery/door/airlock/public{
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
 	name = "Massage Parlour"
 	},
-/obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/station/service/barber)
 "WI" = (
@@ -520,7 +520,7 @@
 /obj/machinery/light/small/directional/east,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
-/obj/structure/table/reinforced/rglass,
+/obj/structure/table/glass,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -550,7 +550,7 @@ bb
 li
 "}
 (2,1,1) = {"
-xz
+KV
 Fb
 nY
 zo
@@ -626,7 +626,7 @@ Vw
 lT
 Vm
 Yk
-lT
+fe
 jh
 da
 "}