diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index d5c472a4e38..e946572c00d 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -32,6 +32,9 @@
 		padding_material = get_material_by_name(new_padding_material)
 	update_icon()
 
+/obj/structure/bed/padded/New(var/newloc)
+	..(newloc,"steel","cotton")
+
 // Reuse the cache/code from stools, todo maybe unify.
 /obj/structure/bed/update_icon()
 	// Prep icon.
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index f305d1a6889..06322fb98dd 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -44,6 +44,7 @@
 		var/cache_key = "[base_icon]-armrest-[padding_material.name]"
 		if(isnull(stool_cache[cache_key]))
 			var/image/I = image(icon, "[base_icon]_armrest")
+			I.layer = MOB_LAYER + 0.1
 			I.color = padding_material.icon_colour
 			stool_cache[cache_key] = I
 		overlays |= stool_cache[cache_key]
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index e776adfd0e0..37656c54630 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -48,6 +48,7 @@ var/list/name_to_material
 /material
 	var/name	                          // Unique name for use in indexing the list.
 	var/display_name                      // Prettier name for display.
+	var/use_name
 	var/flags = 0                         // Various status modifiers.
 
 	// Shards/tables/structures
@@ -85,7 +86,7 @@ var/list/name_to_material
 	// Noise made when a simple door made of this material opens or closes.
 	var/dooropen_noise = 'sound/effects/stonedoor_openclose.ogg'
 	// Path to resulting stacktype. Todo remove need for this.
-	var/stack_type = /obj/item/stack/material/steel
+	var/stack_type
 	// Wallrot crumble message.
 	var/rotting_touch_message = "crumbles under your touch"
 
@@ -94,6 +95,8 @@ var/list/name_to_material
 	..()
 	if(!display_name)
 		display_name = name
+	if(!use_name)
+		use_name = display_name
 	if(!shard_icon)
 		shard_icon = shard_type
 
@@ -408,40 +411,53 @@ var/list/name_to_material
 
 /material/carpet
 	name = "carpet"
-	display_name = "padding"
+	display_name = "comfy"
+	use_name = " red upholstery"
 	icon_colour = "#DA020A"
 
+/material/cotton
+	name = "cotton"
+	display_name ="cotton"
+	icon_colour = "#FFFFFF"
+
 /material/cloth_teal
 	name = "teal"
 	display_name ="teal"
+	use_name = "teal cloth"
 	icon_colour = "#00EAFA"
 
 /material/cloth_black
 	name = "black"
 	display_name = "black"
+	use_name = "black cloth"
 	icon_colour = "#505050"
 
-/material/cloth_
+/material/cloth_green
 	name = "green"
 	display_name = "green"
+	use_name = "green cloth"
 	icon_colour = "#01C608"
 
 /material/cloth_puple
 	name = "purple"
 	display_name = "purple"
+	use_name = "purple cloth"
 	icon_colour = "#9C56C4"
 
 /material/cloth_blue
 	name = "blue"
 	display_name = "blue"
+	use_name = "blue cloth"
 	icon_colour = "#6B6FE3"
 
 /material/cloth_beige
 	name = "beige"
 	display_name = "beige"
+	use_name = "beige cloth"
 	icon_colour = "#E8E7C8"
 
 /material/cloth_lime
 	name = "lime"
 	display_name = "lime"
+	use_name = "lime cloth"
 	icon_colour = "#62E36C"
diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi
index 6b53f857a5c..9b58b2983ed 100644
Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ