diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 354096e0..dea650bc 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -446,9 +446,8 @@ minetest.register_node("default:bookshelf", {
 
 minetest.register_node("default:glass", {
 	description = "Glass",
-	drawtype = "glasslike",
-	tiles = {"default_glass.png"},
-	inventory_image = minetest.inventorycube("default_glass.png"),
+	drawtype = "glasslike_framed",
+	tiles = {"default_glass_frame.png", "default_glass_detail.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = false,
@@ -1278,8 +1277,8 @@ minetest.register_node("default:diamondblock", {
 
 minetest.register_node("default:obsidian_glass", {
 	description = "Obsidian Glass",
-	drawtype = "glasslike",
-	tiles = {"default_obsidian_glass.png"},
+	drawtype = "glasslike_framed",
+	tiles = {"default_obsidian_glass_frame.png", "default_obsidian_glass_detail.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	sunlight_propagates = true,
diff --git a/mods/default/textures/default_glass.png b/mods/default/textures/default_glass.png
index b4c7fb5f..ac81b2ab 100644
Binary files a/mods/default/textures/default_glass.png and b/mods/default/textures/default_glass.png differ
diff --git a/mods/default/textures/default_glass_detail.png b/mods/default/textures/default_glass_detail.png
new file mode 100644
index 00000000..b459665a
Binary files /dev/null and b/mods/default/textures/default_glass_detail.png differ
diff --git a/mods/default/textures/default_glass_frame.png b/mods/default/textures/default_glass_frame.png
new file mode 100644
index 00000000..119e4338
Binary files /dev/null and b/mods/default/textures/default_glass_frame.png differ
diff --git a/mods/default/textures/default_obsidian_glass.png b/mods/default/textures/default_obsidian_glass.png
index ef5f8b5a..c213a968 100644
Binary files a/mods/default/textures/default_obsidian_glass.png and b/mods/default/textures/default_obsidian_glass.png differ
diff --git a/mods/default/textures/default_obsidian_glass_detail.png b/mods/default/textures/default_obsidian_glass_detail.png
new file mode 100644
index 00000000..3bfa63c2
Binary files /dev/null and b/mods/default/textures/default_obsidian_glass_detail.png differ
diff --git a/mods/default/textures/default_obsidian_glass_frame.png b/mods/default/textures/default_obsidian_glass_frame.png
new file mode 100644
index 00000000..3c4dab41
Binary files /dev/null and b/mods/default/textures/default_obsidian_glass_frame.png differ