diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index bbf24d52..b2f90b0c 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -360,6 +360,49 @@ minetest.register_node("homedecor:fishtank", {
 	sunlight_propagates = true,
 	groups = {cracky=3,oddly_breakable_by_hand=3},
 	sounds = default.node_sound_glass_defaults(),
+	on_rightclick = function(pos, node, clicker)
+		fdir = minetest.get_node(pos).param2
+		minetest.add_node(pos, {name = "homedecor:fishtank_lighted", param2 = fdir})
+	end
+})
+
+minetest.register_node("homedecor:fishtank_lighted", {
+	drawtype = "nodebox",
+	description = "Fishtank",
+	tiles = {
+		"homedecor_fishtank_top.png",
+		"homedecor_fishtank_bottom.png",
+		"homedecor_fishtank_right_lighted.png",
+		"homedecor_fishtank_left_lighted.png",
+		"homedecor_fishtank_back_lighted.png",
+		"homedecor_fishtank_front_lighted.png"
+	},
+	paramtype = "light",
+	light_source = LIGHT_MAX-4,
+	paramtype2 = "facedir",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5,    -0.5,    -0.375,  0.5,    -0.4375, 0.375},
+			{-0.4375, -0.4375, -0.3125, 0.4375,  0.1875, 0.3125},
+			{-0.4375,  0.1875, -0.1875, 0.4375,  0.25,   0.1875},
+			{-0.1875,  0.0625,  0.0625, 0.1875,  0.25,   0.375},
+			{ 0.125,  -0.5,     0.25,   0.1875,  0.1875, 0.375},
+			{-0.375,   0.25,   -0.125,  0.375,   0.3125, 0.125},
+		}
+	},
+	use_texture_alpha = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 }
+	},
+	sunlight_propagates = true,
+	groups = {cracky=3,oddly_breakable_by_hand=3},
+	sounds = default.node_sound_glass_defaults(),
+	on_rightclick = function(pos, node, clicker)
+		fdir = minetest.get_node(pos).param2
+		minetest.add_node(pos, {name = "homedecor:fishtank", param2 = fdir})
+	end
 })
 
 minetest.register_node('homedecor:cardboard_box', {
diff --git a/homedecor/textures/homedecor_fishtank_back.png b/homedecor/textures/homedecor_fishtank_back.png
index d88a58cc..14bfaa6d 100644
Binary files a/homedecor/textures/homedecor_fishtank_back.png and b/homedecor/textures/homedecor_fishtank_back.png differ
diff --git a/homedecor/textures/homedecor_fishtank_back_lighted.png b/homedecor/textures/homedecor_fishtank_back_lighted.png
new file mode 100644
index 00000000..70e4a90d
Binary files /dev/null and b/homedecor/textures/homedecor_fishtank_back_lighted.png differ
diff --git a/homedecor/textures/homedecor_fishtank_front.png b/homedecor/textures/homedecor_fishtank_front.png
index b995bea8..b4064c45 100644
Binary files a/homedecor/textures/homedecor_fishtank_front.png and b/homedecor/textures/homedecor_fishtank_front.png differ
diff --git a/homedecor/textures/homedecor_fishtank_front_lighted.png b/homedecor/textures/homedecor_fishtank_front_lighted.png
new file mode 100644
index 00000000..fe2b5222
Binary files /dev/null and b/homedecor/textures/homedecor_fishtank_front_lighted.png differ
diff --git a/homedecor/textures/homedecor_fishtank_left.png b/homedecor/textures/homedecor_fishtank_left.png
index 4df2408d..24b3afce 100644
Binary files a/homedecor/textures/homedecor_fishtank_left.png and b/homedecor/textures/homedecor_fishtank_left.png differ
diff --git a/homedecor/textures/homedecor_fishtank_left_lighted.png b/homedecor/textures/homedecor_fishtank_left_lighted.png
new file mode 100644
index 00000000..0a0ee499
Binary files /dev/null and b/homedecor/textures/homedecor_fishtank_left_lighted.png differ
diff --git a/homedecor/textures/homedecor_fishtank_right.png b/homedecor/textures/homedecor_fishtank_right.png
index 2e31f15f..96d9c474 100644
Binary files a/homedecor/textures/homedecor_fishtank_right.png and b/homedecor/textures/homedecor_fishtank_right.png differ
diff --git a/homedecor/textures/homedecor_fishtank_right_lighted.png b/homedecor/textures/homedecor_fishtank_right_lighted.png
new file mode 100644
index 00000000..983586d5
Binary files /dev/null and b/homedecor/textures/homedecor_fishtank_right_lighted.png differ