diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png
new file mode 100644
index 00000000..298cdf95
Binary files /dev/null and b/DynmapCore/src/main/resources/extracted/web/images/block_nether_flat.png differ
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_nether.png b/DynmapCore/src/main/resources/extracted/web/images/block_nether_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_nether.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_nether_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png
new file mode 100644
index 00000000..574d213b
Binary files /dev/null and b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_flat.png differ
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_the_end.png b/DynmapCore/src/main/resources/extracted/web/images/block_the_end_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_the_end.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_the_end_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_biome.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_biome.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_biome.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_biome.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_cave.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_cave.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_cave.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_cave.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_flat.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_flat.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_flat.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_flat.png
diff --git a/DynmapCore/src/main/resources/extracted/web/images/block_surface.png b/DynmapCore/src/main/resources/extracted/web/images/block_world_surface.png
similarity index 100%
rename from DynmapCore/src/main/resources/extracted/web/images/block_surface.png
rename to DynmapCore/src/main/resources/extracted/web/images/block_world_surface.png
diff --git a/DynmapCore/src/main/resources/extracted/web/js/map.js b/DynmapCore/src/main/resources/extracted/web/js/map.js
index 9d8ca201..d8b97938 100644
--- a/DynmapCore/src/main/resources/extracted/web/js/map.js
+++ b/DynmapCore/src/main/resources/extracted/web/js/map.js
@@ -278,12 +278,17 @@ DynMap.prototype = {
 					worldsadded[wname] = true;
 				}
 
+				var worldName = wname;
+				if(wname.startsWith('world_')) {
+					worldName = wname.substring(6);
+				}
+
 				map.element = $('<li/>')
 					.addClass('map item')
 					.append($('<a/>')
 							.attr({ title: map.options.title, href: '#' })
 							.addClass('maptype')
-							.css({ backgroundImage: 'url(' + (map.options.icon || ('images/block_' + mapindex + '.png')) + ')' })
+							.css({ backgroundImage: 'url(' + (map.options.icon || ('images/block_' + worldName + '_' + mapindex + '.png')) + ')' })
 							.text(map.options.title)
 					)
 					.click(function() {
diff --git a/DynmapCore/src/main/resources/worlds.txt b/DynmapCore/src/main/resources/worlds.txt
index a4abfc7d..88b0e6b9 100644
--- a/DynmapCore/src/main/resources/worlds.txt
+++ b/DynmapCore/src/main/resources/worlds.txt
@@ -115,9 +115,9 @@ worlds:
   #      background: "#300806"
   #      mapzoomin: 1
   #    - class: org.dynmap.hdmap.HDMap
-  #      name: nether
+  #      name: surface
   #      title: "Surface"
-  #      prefix: nt
+  #      prefix: surface
   #      perspective: iso_SE_30_hires
   #      shader: stdtexture
   #      lighting: nethershadows