diff --git a/mods/compass/init.lua b/mods/compass/init.lua
index 1a12a9a0e..cc08f8cac 100644
--- a/mods/compass/init.lua
+++ b/mods/compass/init.lua
@@ -21,8 +21,8 @@ minetest.register_globalstep(function(dtime)
 			local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
 			if angle_north < 0 then angle_north = angle_north + 360 end
 			angle_dir = 90 - math.deg(dir)
-			local angle_relative = (angle_north - angle_dir) % 360
-			local compass_image = math.floor((angle_relative/30) + 0.5)%12
+			local angle_relative = (angle_north - angle_dir + 180) % 360
+			local compass_image = math.floor((angle_relative/11.25) + 0.5)%32
 
 			for j,stack in ipairs(player:get_inventory():get_list("main")) do
 				if minetest.get_item_group(stack:get_name(), "compass") ~= 0 and
@@ -34,20 +34,10 @@ minetest.register_globalstep(function(dtime)
 	end
 end)
 
-local images = {
-	"compass_0.png",
-	"compass_1.png",
-	"compass_2.png",
-	"compass_3.png",
-	"compass_4.png",
-	"compass_5.png",
-	"compass_6.png",
-	"compass_7.png",
-	"compass_8.png",
-	"compass_9.png",
-	"compass_10.png",
-	"compass_11.png",
-}
+local images = {}
+for frame=0,31 do
+	table.insert(images, "compass_compass.png^[verticalframe:32:"..frame)
+end
 
 local i
 for i,img in ipairs(images) do
diff --git a/mods/compass/textures/compass_0.png b/mods/compass/textures/compass_0.png
deleted file mode 100644
index 6aabd7f92..000000000
Binary files a/mods/compass/textures/compass_0.png and /dev/null differ
diff --git a/mods/compass/textures/compass_1.png b/mods/compass/textures/compass_1.png
deleted file mode 100644
index a8574779d..000000000
Binary files a/mods/compass/textures/compass_1.png and /dev/null differ
diff --git a/mods/compass/textures/compass_10.png b/mods/compass/textures/compass_10.png
deleted file mode 100644
index a18bd99f6..000000000
Binary files a/mods/compass/textures/compass_10.png and /dev/null differ
diff --git a/mods/compass/textures/compass_11.png b/mods/compass/textures/compass_11.png
deleted file mode 100644
index d793d6740..000000000
Binary files a/mods/compass/textures/compass_11.png and /dev/null differ
diff --git a/mods/compass/textures/compass_2.png b/mods/compass/textures/compass_2.png
deleted file mode 100644
index 9cbf52e0b..000000000
Binary files a/mods/compass/textures/compass_2.png and /dev/null differ
diff --git a/mods/compass/textures/compass_3.png b/mods/compass/textures/compass_3.png
deleted file mode 100644
index 32cb3473a..000000000
Binary files a/mods/compass/textures/compass_3.png and /dev/null differ
diff --git a/mods/compass/textures/compass_4.png b/mods/compass/textures/compass_4.png
deleted file mode 100644
index 001f4becb..000000000
Binary files a/mods/compass/textures/compass_4.png and /dev/null differ
diff --git a/mods/compass/textures/compass_5.png b/mods/compass/textures/compass_5.png
deleted file mode 100644
index cc198bcf4..000000000
Binary files a/mods/compass/textures/compass_5.png and /dev/null differ
diff --git a/mods/compass/textures/compass_6.png b/mods/compass/textures/compass_6.png
deleted file mode 100644
index 7f783ce73..000000000
Binary files a/mods/compass/textures/compass_6.png and /dev/null differ
diff --git a/mods/compass/textures/compass_7.png b/mods/compass/textures/compass_7.png
deleted file mode 100644
index 8cc9ef518..000000000
Binary files a/mods/compass/textures/compass_7.png and /dev/null differ
diff --git a/mods/compass/textures/compass_8.png b/mods/compass/textures/compass_8.png
deleted file mode 100644
index b12e478d8..000000000
Binary files a/mods/compass/textures/compass_8.png and /dev/null differ
diff --git a/mods/compass/textures/compass_9.png b/mods/compass/textures/compass_9.png
deleted file mode 100644
index 9cf651c9c..000000000
Binary files a/mods/compass/textures/compass_9.png and /dev/null differ
diff --git a/mods/compass/textures/compass_compass.png b/mods/compass/textures/compass_compass.png
new file mode 100644
index 000000000..796816860
Binary files /dev/null and b/mods/compass/textures/compass_compass.png differ