diff --git a/mesecons_textures/textures/jeija_wall_lever_back.png b/mesecons_textures/textures/jeija_wall_lever_back.png
new file mode 100644
index 0000000..9047e70
Binary files /dev/null and b/mesecons_textures/textures/jeija_wall_lever_back.png differ
diff --git a/mesecons_textures/textures/jeija_wall_lever_bottom.png b/mesecons_textures/textures/jeija_wall_lever_bottom.png
new file mode 100644
index 0000000..041da96
Binary files /dev/null and b/mesecons_textures/textures/jeija_wall_lever_bottom.png differ
diff --git a/mesecons_textures/textures/jeija_wall_lever_off.png b/mesecons_textures/textures/jeija_wall_lever_off.png
index b6b632d..474f8c1 100644
Binary files a/mesecons_textures/textures/jeija_wall_lever_off.png and b/mesecons_textures/textures/jeija_wall_lever_off.png differ
diff --git a/mesecons_textures/textures/jeija_wall_lever_on.png b/mesecons_textures/textures/jeija_wall_lever_on.png
index 959f1b4..01cbc24 100644
Binary files a/mesecons_textures/textures/jeija_wall_lever_on.png and b/mesecons_textures/textures/jeija_wall_lever_on.png differ
diff --git a/mesecons_textures/textures/jeija_wall_lever_sides.png b/mesecons_textures/textures/jeija_wall_lever_sides.png
new file mode 100644
index 0000000..5864f26
Binary files /dev/null and b/mesecons_textures/textures/jeija_wall_lever_sides.png differ
diff --git a/mesecons_textures/textures/jeija_wall_lever_tb.png b/mesecons_textures/textures/jeija_wall_lever_tb.png
new file mode 100644
index 0000000..50348d3
Binary files /dev/null and b/mesecons_textures/textures/jeija_wall_lever_tb.png differ
diff --git a/mesecons_textures/textures/jeija_wall_lever_top.png b/mesecons_textures/textures/jeija_wall_lever_top.png
new file mode 100644
index 0000000..31161ec
Binary files /dev/null and b/mesecons_textures/textures/jeija_wall_lever_top.png differ
diff --git a/mesecons_walllever/init.lua b/mesecons_walllever/init.lua
index 144c734..7dd8828 100644
--- a/mesecons_walllever/init.lua
+++ b/mesecons_walllever/init.lua
@@ -1,29 +1,59 @@
 -- WALL LEVER
 minetest.register_node("mesecons_walllever:wall_lever_off", {
-	drawtype = "signlike",
-	tile_images = {"jeija_wall_lever_off.png"},
+	drawtype = "nodebox",
+	tile_images = {
+		"jeija_wall_lever_tb.png",
+		"jeija_wall_lever_bottom.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_back.png",
+		"jeija_wall_lever_off.png",
+	},
 	inventory_image = "jeija_wall_lever_off.png",
 	wield_image = "jeija_wall_lever_off.png",
 	paramtype = "light",
-	paramtype2 = "wallmounted",
-	legacy_wallmounted = true,
+	paramtype2 = "facedir",
 	walkable = false,
 	selection_box = {
-		type = "wallmounted",
+		type = "fixed",
+		fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {{ -6/16, -6/16, 6/16, 6/16,  6/16, 8/16 },	-- the base "slab"
+			 { -5/16, -3/16, 5/16, 5/16,  3/16, 6/16 },	-- the lighted ring area
+			 { -4/16, -2/16, 4/16, 4/16,  2/16, 5/16 },	-- the raised bit that the lever "sits" on
+			 { -2/16, -1/16, 3/16, 2/16,  1/16, 4/16 },	-- the lever "hinge"
+			 { -1/16, -8/16, 4/16, 1/16,  0,    6/16 }}	-- the lever itself.
 	},
 	groups = {dig_immediate=2},
 	description="Lever",
 })
 minetest.register_node("mesecons_walllever:wall_lever_on", {
-	drawtype = "signlike",
-	tile_images = {"jeija_wall_lever_on.png"},
+	drawtype = "nodebox",
+	tile_images = {
+		"jeija_wall_lever_top.png",
+		"jeija_wall_lever_tb.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_sides.png",
+		"jeija_wall_lever_back.png",
+		"jeija_wall_lever_on.png",
+	},
 	inventory_image = "jeija_wall_lever_on.png",
 	paramtype = "light",
-	paramtype2 = "wallmounted",
-	legacy_wallmounted = true,
+	paramtype2 = "facedir",
 	walkable = false,
 	selection_box = {
-		type = "wallmounted",
+		type = "fixed",
+		fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {{ -6/16, -6/16,  6/16, 6/16, 6/16,  8/16 },	-- the base "slab"
+			 { -5/16, -3/16,  5/16, 5/16, 3/16,  6/16 },	-- the lighted ring area
+			 { -4/16, -2/16,  4/16, 4/16, 2/16,  5/16 },	-- the raised bit that the lever "sits" on
+			 { -2/16, -1/16,  3/16, 2/16, 1/16,  4/16 },	-- the lever "hinge"
+			 { -1/16,  0,     4/16, 1/16, 8/16,  6/16 }}	-- the lever itself.
 	},
 	groups = {dig_immediate=2,not_in_creative_inventory=1},
 	drop = '"mesecons_walllever:wall_lever_off" 1',