diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js
index 5441c32a7b..e994ff354e 100644
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -37,7 +37,8 @@ OpenLayers.Control.PanZoom.prototype =
         this._addButton("panright", "east-mini.png", px.add(sz.w, 0), sz);
         this._addButton("pandown", "south-mini.png", centered.add(0, sz.h*2), sz);
         this._addButton("zoomin", "zoom-plus-mini.png", centered.add(0, sz.h*3+5), sz);
-        this._addButton("zoomout", "zoom-minus-mini.png", centered.add(0, sz.h*4+5), sz);
+        this._addButton("zoomworld", "zoom-world-mini.png", centered.add(0, sz.h*4+5), sz);
+        this._addButton("zoomout", "zoom-minus-mini.png", centered.add(0, sz.h*5+5), sz);
         return this.div;
     },
     _addButton:function(id, img, xy, sz) {
@@ -100,7 +101,7 @@ OpenLayers.Control.PanZoom.prototype =
                 break;
             case "zoomin": this.map.zoomIn(); break;
             case "zoomout": this.map.zoomOut(); break;
-            case "zoomextents": this.map.zoomExtent(); break;
+            case "zoomworld": this.map.zoomExtent(); break;
         }
         Event.stop(evt);
     },
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 4ad20955f0..a54da66d48 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -444,10 +444,10 @@ OpenLayers.Map.prototype = {
     zoomExtent: function() {
         var fullExtent = this.getFullExtent();
         var oldZoom = this.zoom;
-        this.zoom = this.getZoomForExtent( fullExtent );
         this.setCenter(
           new OpenLayers.LonLat((fullExtent.left+fullExtent.right)/2,
-                                (fullExtent.bottom+fullExtent.top)/2)
+                                (fullExtent.bottom+fullExtent.top)/2),
+                                0
                                );
     },