diff --git a/gallery.html b/gallery.html
index e94b0231..8b06d9dc 100644
--- a/gallery.html
+++ b/gallery.html
@@ -79,12 +79,6 @@
             </a>
             <h3>Waypoints</h3>
             <p>GPXSee showing a POI file on Windows 10</p>
-          </li><li>
-            <a href="gallery/poi2.png">
-              <img src="gallery/poi2_prev.png" width="200" height="265" alt=""/>
-            </a>
-            <h3>Waypoints</h3>
-            <p>GPXSee showing a POI file on Linux</p>
           </li><li>
             <a href="gallery/gear_ratio.png">
               <img src="gallery/gear_ratio_prev.png" width="200" height="267" alt=""/>
@@ -115,12 +109,24 @@
             </a>
             <h3>DEM+GPS elevation</h3>
             <p>DEM and GPS elevation comparison</p>
+          </li><li>
+            <a href="gallery/gps.png">
+              <img src="gallery/gps_prev.png" width="200" height="267" alt=""/>
+            </a>
+            <h3>GPS position</h3>
+            <p>GPXSee showing real-time GPS position</p>
           </li><li>
             <a href="gallery/garmin.png">
               <img src="gallery/garmin_prev.png" width="200" height="267" alt=""/>
             </a>
             <h3>Garmin IMG maps</h3>
             <p>GPXSee showing OpenTopo Garmin IMG map</p>
+          </li><li>
+            <a href="gallery/mapsforge.png">
+              <img src="gallery/mapsforge_prev.png" width="200" height="272" alt=""/>
+            </a>
+            <h3>Mapsforge maps</h3>
+            <p>GPXSee showing a Mapsforge map (TOTM style)</p>
           </li><li>
             <a href="gallery/enc.png">
               <img src="gallery/enc_prev.png" width="200" height="262" alt=""/>
@@ -133,12 +139,6 @@
             </a>
             <h3>Map overviews</h3>
             <p>GPXSee showing an overview of NY BSB charts.</p>
-          </li><li>
-            <a href="gallery/gps.png">
-              <img src="gallery/gps_prev.png" width="200" height="267" alt=""/>
-            </a>
-            <h3>GPS position</h3>
-            <p>GPXSee showing real-time GPS position</p>
           </li>
         </ul>
 
diff --git a/gallery/mapsforge.png b/gallery/mapsforge.png
new file mode 100644
index 00000000..4e5556ac
Binary files /dev/null and b/gallery/mapsforge.png differ
diff --git a/gallery/mapsforge_prev.png b/gallery/mapsforge_prev.png
new file mode 100644
index 00000000..b8b79230
Binary files /dev/null and b/gallery/mapsforge_prev.png differ
diff --git a/gallery/poi2.png b/gallery/poi2.png
deleted file mode 100644
index ed36d4c2..00000000
Binary files a/gallery/poi2.png and /dev/null differ
diff --git a/gallery/poi2_prev.png b/gallery/poi2_prev.png
deleted file mode 100644
index d98dea7d..00000000
Binary files a/gallery/poi2_prev.png and /dev/null differ