diff --git a/examples/mapbox.html b/examples/mapbox.html
index 3ccbffe776..4ccac1434e 100644
--- a/examples/mapbox.html
+++ b/examples/mapbox.html
@@ -7,49 +7,6 @@
         <title>OpenLayers MapBox Example</title>
         <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
         <link rel="stylesheet" href="style.css" type="text/css">
-        <style>
-            .olControlAttribution {
-                bottom: 5px;
-                font-size: 9px;
-            }
-            div.olControlZoomPanel {
-                top: 10px;
-                left: 10px;
-            }
-            div.olControlZoomPanel .olControlZoomInItemInactive,
-            div.olControlZoomPanel .olControlZoomOutItemInactive {
-                background: rgba(0, 0, 0, 0.2);
-                position: absolute;
-            }
-            div.olControlZoomPanel .olControlZoomInItemInactive {
-                border-radius: 3px 3px 0 0;
-            }
-            div.olControlZoomPanel .olControlZoomOutItemInactive {
-                border-radius: 0 0 3px 3px ;
-                top: 20px;
-            }
-            div.olControlZoomPanel div:hover {
-                background: rgba(0, 0, 0, 0.5);
-            }
-            div.olControlZoomPanel .olControlZoomOutItemInactive:after ,
-            div.olControlZoomPanel .olControlZoomInItemInactive:after {
-                font-weight: bold;
-                content: '+';
-                font-size: 18px;
-                padding: 0 2px;
-                z-index: 2000;
-                color: #fff;
-                line-height: 1em;
-            }
-            div.olControlZoomPanel .olControlZoomOutItemInactive:after {
-                content: '–';
-                line-height: 0.9em;
-                padding: 0 5px;
-            }
-            div.olControlZoomPanel .olControlZoomToMaxExtentItemInactive {
-                display: none;
-            }
-        </style>
     </head>
     <body>
         <h1 id="title">Basic MapBox OSM Example</h1>
diff --git a/examples/mapbox.js b/examples/mapbox.js
index ee57d66e0c..134d0d865e 100644
--- a/examples/mapbox.js
+++ b/examples/mapbox.js
@@ -6,13 +6,14 @@ var streets = new OpenLayers.Layer.XYZ(
         "http://c.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png",
         "http://d.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png"
     ], {
-        attribution: "Tiles © <a href='http://mapbox.com/'>MapBox</a> | " + 
-            "Data © <a href='http://www.openstreetmap.org/'>OpenStreetMap</a> " +
+        attribution: "Tiles &copy; <a href='http://mapbox.com/'>MapBox</a> | " + 
+            "Data &copy; <a href='http://www.openstreetmap.org/'>OpenStreetMap</a> " +
             "and contributors, CC-BY-SA",
         sphericalMercator: true,
+        wrapDateLine: true,
         transitionEffect: "resize",
         buffer: 1,
-        numZoomLevels: 16
+        numZoomLevels: 17
     }
 );
 
@@ -26,7 +27,7 @@ var map = new OpenLayers.Map({
                 enableKinetic: true
             }
         }),
-        new OpenLayers.Control.ZoomPanel(),
+        new OpenLayers.Control.Zoom(),
         new OpenLayers.Control.Permalink({anchor: true})
     ],
     center: [0, 0],
