diff --git a/homedecor/cobweb.lua b/homedecor/cobweb.lua
new file mode 100644
index 00000000..3608e6bb
--- /dev/null
+++ b/homedecor/cobweb.lua
@@ -0,0 +1,118 @@
+minetest.register_node("homedecor:cobweb_corner", {
+	description = "Cobweb",
+	drawtype = "torchlike",
+	tiles = { "homedecor_cobweb_torchlike.png" },
+	inventory_image = "homedecor_cobweb_inv.png",
+	wield_image = "homedecor_cobweb_inv.png",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+	},
+	visual_scale = 1.4,
+	groups = { snappy = 3 },
+    after_place_node = function(pos, placer, itemstack, pointed_thing)
+		homedecor.rotate_cobweb(pos)
+	end
+})
+
+minetest.register_node("homedecor:cobweb_centered", {
+	description = "Cobweb",
+	drawtype = "nodebox",
+	tiles = { "homedecor_cobweb.png" },
+	inventory_image = "homedecor_cobweb_inv.png",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+	},
+	node_box = {
+		type = "fixed",
+		fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0 }
+	},
+	groups = { snappy = 3, not_in_creative_inventory = 1 },
+	drop = "homedecor:cobweb_corner"
+})
+
+minetest.register_node("homedecor:cobweb_plantlike", {
+	description = "Cobweb",
+	drawtype = "plantlike",
+	tiles = { "homedecor_cobweb_plantlike.png" },
+	inventory_image = "homedecor_cobweb_inv.png",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+	},
+	visual_scale = 1.189,
+	groups = { snappy = 3, not_in_creative_inventory = 1 },
+	drop = "homedecor:cobweb_corner"
+})
+
+-- helper function to rotate the cobweb after it's placed
+
+function homedecor.rotate_cobweb(pos)
+	local wall_xm = minetest.get_node({ x=pos.x-1, y=pos.y, z=pos.z }).name
+	local wall_xp = minetest.get_node({ x=pos.x+1, y=pos.y, z=pos.z }).name
+	local wall_zm = minetest.get_node({ x=pos.x,   y=pos.y, z=pos.z-1}).name
+	local wall_zp = minetest.get_node({ x=pos.x,   y=pos.y, z=pos.z+1}).name
+
+	local iswall_xm = (wall_xm ~= "air")
+	local iswall_xp = (wall_xp ~= "air")
+	local iswall_zm = (wall_zm ~= "air")
+	local iswall_zp = (wall_zp ~= "air")
+
+	print("wall_xm: "..dump(wall_xm))
+	print("wall_xp: "..dump(wall_xp))
+	print("wall_zm: "..dump(wall_zm))
+	print("wall_zp: "..dump(wall_zp))
+
+	-- only xm+zp, or only xp+zm means on-floor torchlike
+
+	if (iswall_xm and iswall_zp and not iswall_xp and not iswall_zm)
+	or (iswall_xp and iswall_zm and not iswall_xm and not iswall_zp) then 
+		minetest.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 1})
+	
+	-- only xm+zm, or only xp+zp means on-ceiling torchlike
+
+	elseif (iswall_xm and iswall_zm and not iswall_xp and not iswall_zp) 
+	or (iswall_xp and iswall_zp and not iswall_xm and not iswall_zm) then 
+		minetest.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 0})
+	
+	-- only xm+xp means nodebox (not rotated, 0 degrees)
+
+	elseif iswall_xm and iswall_xp and not iswall_zm and not iswall_zp then 
+		minetest.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 0})
+	
+	-- only zm+zp means nodebox rotated to 90 degrees
+
+	elseif iswall_zm and iswall_zp and not iswall_xm and not iswall_xp then 
+		minetest.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 1})
+	
+	-- if all else fails, place the plantlike version as a fallback.
+
+	else
+		minetest.set_node(pos, {name = "homedecor:cobweb_plantlike", param2 = 0})
+	end
+
+end
+
+-- convert existing cobwebs
+
+minetest.register_abm({
+	nodenames = { "homedecor:cobweb" },
+	interval = 1,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		homedecor_rotate_cobweb(pos)
+	end
+})
diff --git a/homedecor/init.lua b/homedecor/init.lua
index 13bf4ffc..29d65947 100644
--- a/homedecor/init.lua
+++ b/homedecor/init.lua
@@ -105,6 +105,8 @@ dofile(homedecor.modpath.."/furniture_bathroom.lua")
 dofile(homedecor.modpath.."/furniture_recipes.lua")
 dofile(homedecor.modpath.."/climate-control.lua")
 
+dofile(homedecor.modpath.."/cobweb.lua")
+
 dofile(homedecor.modpath.."/locked.lua")
 
 
diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index afe745c4..48057b16 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -893,26 +893,6 @@ minetest.register_node("homedecor:trash_can", {
 	}
 })
 
-minetest.register_node("homedecor:cobweb", {
-	description = "Cobweb",
-	drawtype = "plantlike",
-	tiles = { "homedecor_cobweb.png" },
-	inventory_image = "homedecor_cobweb_inv.png",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	sunlight_propagates = true,
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
-	},
-	visual_scale = 1.189,
-	groups = { snappy = 3 },
-    after_place_node = function(pos, placer, itemstack, pointed_thing)
-		minetest.add_node(pos, { name = "homedecor:cobweb", param2 = 0 })
-	end
-})
-
 minetest.register_node("homedecor:well_base", {
 	tiles = {
 		"homedecor_well_base_top.png",
diff --git a/homedecor/textures/homedecor_cobweb.png b/homedecor/textures/homedecor_cobweb.png
index 9cce2a22..2bb58a51 100644
Binary files a/homedecor/textures/homedecor_cobweb.png and b/homedecor/textures/homedecor_cobweb.png differ
diff --git a/homedecor/textures/homedecor_cobweb_plantlike.png b/homedecor/textures/homedecor_cobweb_plantlike.png
new file mode 100644
index 00000000..9cce2a22
Binary files /dev/null and b/homedecor/textures/homedecor_cobweb_plantlike.png differ
diff --git a/homedecor/textures/homedecor_cobweb_torchlike.png b/homedecor/textures/homedecor_cobweb_torchlike.png
new file mode 100644
index 00000000..4f1d12dc
Binary files /dev/null and b/homedecor/textures/homedecor_cobweb_torchlike.png differ