diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua
index aba1f5f..42f4de1 100644
--- a/mesecons_button/init.lua
+++ b/mesecons_button/init.lua
@@ -1,36 +1,56 @@
 -- WALL BUTTON
 minetest.register_node("mesecons_button:button_off", {
     drawtype = "nodebox",
-    tile_images = {"jeija_wall_button_off.png"},
+    tiles = {
+	"jeija_wall_button_sides.png",	
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_sides.png",
+	"jeija_wall_button_off.png"
+	},
     paramtype = "light",
     paramtype2 = "facedir",
     legacy_wallmounted = true,
     walkable = false,
     selection_box = {
         type = "fixed",
-	fixed = {-0.2, -0.15, 0.3, 0.2, 0.15, 0.5},
+	fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
     },
     node_box = {
-        type = "fixed",
-	fixed = {-0.2, -0.15, 0.3, 0.2, 0.15, 0.5},
+        type = "fixed",	
+	fixed = {
+		{ -6/16, -6/16, 7/16, 6/16, 6/16, 8/16 },	-- the thin plate behind the button
+		{ -4/16, -2/16, 5/16, 4/16, 2/16, 7/16 }	-- the button itself
+	}
     },
     groups = {dig_immediate=2},
     description = "Button",
 })
 minetest.register_node("mesecons_button:button_on", {
 	drawtype = "nodebox",
-	tile_images = {"jeija_wall_button_on.png"},
+	tiles = {
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_sides.png",
+		"jeija_wall_button_on.png"
+		},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	legacy_wallmounted = true,
 	walkable = false,
     selection_box = {
         type = "fixed",
-	fixed = {-0.2, -0.15, 0.4, 0.2, 0.15, 0.5},
+	fixed = { -6/16, -6/16, 5/16, 6/16, 6/16, 8/16 }
     },
     node_box = {
         type = "fixed",
-	fixed = {-0.2, -0.15, 0.4, 0.2, 0.15, 0.5},
+	fixed = {
+		{ -6/16, -6/16, 7/16, 6/16, 6/16, 8/16 },
+		{ -4/16, -2/16, 13/32, 4/16, 2/16, 7/16 }
+	}
     },
 	groups = {dig_immediate=2, not_in_creative_inventory=1},
 	drop = 'mesecons_button:button_off',
diff --git a/mesecons_textures/textures/jeija_wall_button_off.png b/mesecons_textures/textures/jeija_wall_button_off.png
index fadf3f3..0e3ff25 100644
Binary files a/mesecons_textures/textures/jeija_wall_button_off.png and b/mesecons_textures/textures/jeija_wall_button_off.png differ
diff --git a/mesecons_textures/textures/jeija_wall_button_on.png b/mesecons_textures/textures/jeija_wall_button_on.png
index 5d5f822..1d97464 100644
Binary files a/mesecons_textures/textures/jeija_wall_button_on.png and b/mesecons_textures/textures/jeija_wall_button_on.png differ
diff --git a/mesecons_textures/textures/jeija_wall_button_sides.png b/mesecons_textures/textures/jeija_wall_button_sides.png
new file mode 100644
index 0000000..b532537
Binary files /dev/null and b/mesecons_textures/textures/jeija_wall_button_sides.png differ