diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index d24a278b41..902b5652fd 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -25,6 +25,18 @@
 	. = ..()
 	reagents.add_reagent("ash", 30) //double the amount of ash.
 
+/obj/effect/decal/cleanable/glass
+	name = "tiny shards"
+	desc = "Back to sand."
+	icon = 'icons/obj/shards.dmi'
+	icon_state = "tiny"
+
+/obj/effect/decal/cleanable/glass/Initialize()
+	. = ..()
+	setDir(pick(GLOB.cardinals))
+
+/obj/effect/decal/cleanable/glass/ex_act()
+	qdel(src)
 
 /obj/effect/decal/cleanable/dirt
 	name = "dirt"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 3326a2a0a8..add789c0b8 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -27,6 +27,7 @@
 	var/breaksound = "shatter"
 	var/hitsound = 'sound/effects/Glasshit.ogg'
 	var/rad_insulation = RAD_VERY_LIGHT_INSULATION
+	var/spawn_cleanable_shards = TRUE
 
 /obj/structure/window/examine(mob/user)
 	..()
@@ -283,6 +284,8 @@
 	if(!disassembled)
 		playsound(src, breaksound, 70, 1)
 		if(!(flags_1 & NODECONSTRUCT_1))
+			if(spawn_cleanable_shards)
+				new /obj/effect/decal/cleanable/glass(get_turf(src))
 			for(var/i in debris)
 				var/obj/item/I = i
 				I.forceMove(drop_location())
@@ -417,6 +420,7 @@
 	explosion_block = 1
 	glass_type = /obj/item/stack/sheet/plasmaglass
 	rad_insulation = RAD_NO_INSULATION
+	spawn_cleanable_shards = FALSE
 
 /obj/structure/window/plasma/spawner/east
 	dir = EAST
@@ -610,7 +614,7 @@
 		new /obj/effect/temp_visual/ratvar/window(get_turf(src))
 		amount_of_gears = 4
 	for(var/i in 1 to amount_of_gears)
-		debris += new/obj/item/clockwork/alloy_shards/medium/gear_bit()
+		debris += new /obj/item/clockwork/alloy_shards/medium/gear_bit()
 	change_construction_value(fulltile ? 2 : 1)
 
 /obj/structure/window/reinforced/clockwork/setDir(direct)
@@ -672,6 +676,7 @@
 	decon_speed = 10
 	CanAtmosPass = ATMOS_PASS_YES
 	resistance_flags = FLAMMABLE
+	spawn_cleanable_shards = FALSE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	breaksound = 'sound/items/poster_ripped.ogg'
 	hitsound = 'sound/weapons/slashmiss.ogg'
diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi
index 5ae1402c36..a575ab292f 100644
Binary files a/icons/obj/shards.dmi and b/icons/obj/shards.dmi differ