diff --git a/apps/waypoint_editor/ChangeLog b/apps/waypoint_editor/ChangeLog
deleted file mode 100644
index 0f45b79cc..000000000
--- a/apps/waypoint_editor/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-0.01: New App!
-0.02: Display waypoint name instead of its index in remove menu and fix icon
-0.03: Use text input for waypoint names, allow marking waypoint with current GPS position
diff --git a/apps/waypoint_editor/README.md b/apps/waypoint_editor/README.md
deleted file mode 100644
index f9c603a84..000000000
--- a/apps/waypoint_editor/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Waypoints
-
-Simple waypoint editor.
diff --git a/apps/waypoint_editor/app-icon.js b/apps/waypoint_editor/app-icon.js
deleted file mode 100644
index 6ab351afa..000000000
--- a/apps/waypoint_editor/app-icon.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("mEwxH+AH4A/AA0QF1wABF94xrFwgvV63W5/PF1AsBAAQvBAAQviFggvHGRXWFwvWFigvKGQgPCFwwvMFxQvL54PDF9wuHF8wuIF7/OAYguFF7mBrtdFQWAvWA5+qvV6FxIvXrwfCGAQqBvXP0guLF6XV1awCmggCmgvB1Wk1QEBRpQvTJ4OAAgM6F4oAEFwulF66zBvXV62sMAM0M4IuKOYOlwGrF6nP0oXD54tGRpDLCO4TvXDwIAHXhB3BSQYvfdZPVSQIvsUILWBF8xeEX4OkF8wQFd7mlDgPP52q5wvDAYISF1elBAYvWwBNB54DBGYIAEO5YvSFAInB1asBQAQzBF5HQxGsF64rBvWlX4fO0nOSQgvD6E0TANeL65XCd4ySFCYWCe4ZhDF6GIxHQ6vVGgQAESQfOTwQvZnQWBmgXDF4qSC5+kGYOr62sR4U0R6WsI4eCF5AzETwYYBwWC6AvlX4gAIR553DR5Ivhd4OCFwYvpAAwv/F7wMBF6ouLF5APHF54sMF44SNF5IsPF4gUSGQQXVAH4A/AH4A/ADY"))
diff --git a/apps/waypoint_editor/app.png b/apps/waypoint_editor/app.png
deleted file mode 100644
index e97f1bb7b..000000000
Binary files a/apps/waypoint_editor/app.png and /dev/null differ
diff --git a/apps/waypoint_editor/metadata.json b/apps/waypoint_editor/metadata.json
deleted file mode 100644
index 87f0ed8ce..000000000
--- a/apps/waypoint_editor/metadata.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "id": "waypoint_editor",
-  "name": "Waypoint editor",
-  "version":"0.03",
-  "description": "Allows editing waypoints on device",
-  "icon": "app.png",
-  "readme": "README.md",
-  "supports" : ["BANGLEJS2"],
-  "allow_emulator": true,
-  "tags": "tool,outdoors,gps",
-  "dependencies": {"textinput":"type"},
-  "storage": [
-      {"name":"waypoint_editor.app.js","url":"app.js"},
-      {"name":"waypoint_editor.img","url":"app-icon.js","evaluate":true}
-  ]
-}
diff --git a/apps/waypoints/ChangeLog b/apps/waypoints/ChangeLog
index 5560f00bc..fb5712587 100644
--- a/apps/waypoints/ChangeLog
+++ b/apps/waypoints/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Merge waypoint_editor here, so waypoints can be edited on device, too.
diff --git a/apps/waypoints/README.md b/apps/waypoints/README.md
index e252054f2..3fc9c02b3 100644
--- a/apps/waypoints/README.md
+++ b/apps/waypoints/README.md
@@ -36,7 +36,9 @@ has the following contents:
 The file contains the initial NONE waypoint which is useful if you
 just want to display course and speed. The next two entries are
 waypoints to No 10 Downing Street and to Stone Henge - obtained from
-Google Maps. The last five entries are entries which can be *marked*.
+Google Maps. The last five entries are entries which can be
+*marked*. (Some applications support marking but do not support
+creating/naming a waypoint).
 
 You add and delete entries using the Web IDE to load and then save
 the file from and to watch storage. The app itself does not limit the
@@ -44,13 +46,18 @@ number of entries although it does load the entire file into RAM
 which will obviously limit this.
 
 
-## Waypoint Editor
+## Editing waypoints over web interface
 
 Clicking on the download icon of `Waypoints` in the app loader invokes the
-waypoint editor.  The editor downloads and displays the current
+waypoint editor. The editor downloads and displays the current
 `waypoints.json` file. Clicking the `Edit` button beside an entry
 causes the entry to be deleted from the list and displayed in the
 edit boxes. It can be restored - by clicking the `Add waypoint`
 button. A new markable entry is created by using the `Add name`
 button. The edited `waypoints.json` file is uploaded to the Bangle by
 clicking the `Upload` button.
+
+## Editing waypoints on the device
+
+You can also edit waypoints on the device, just start the editor from
+the app launcher.
\ No newline at end of file
diff --git a/apps/waypoints/app-icon.js b/apps/waypoints/app-icon.js
index 49232b838..6ab351afa 100644
--- a/apps/waypoints/app-icon.js
+++ b/apps/waypoints/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="))
+require("heatshrink").decompress(atob("mEwxH+AH4A/AA0QF1wABF94xrFwgvV63W5/PF1AsBAAQvBAAQviFggvHGRXWFwvWFigvKGQgPCFwwvMFxQvL54PDF9wuHF8wuIF7/OAYguFF7mBrtdFQWAvWA5+qvV6FxIvXrwfCGAQqBvXP0guLF6XV1awCmggCmgvB1Wk1QEBRpQvTJ4OAAgM6F4oAEFwulF66zBvXV62sMAM0M4IuKOYOlwGrF6nP0oXD54tGRpDLCO4TvXDwIAHXhB3BSQYvfdZPVSQIvsUILWBF8xeEX4OkF8wQFd7mlDgPP52q5wvDAYISF1elBAYvWwBNB54DBGYIAEO5YvSFAInB1asBQAQzBF5HQxGsF64rBvWlX4fO0nOSQgvD6E0TANeL65XCd4ySFCYWCe4ZhDF6GIxHQ6vVGgQAESQfOTwQvZnQWBmgXDF4qSC5+kGYOr62sR4U0R6WsI4eCF5AzETwYYBwWC6AvlX4gAIR553DR5Ivhd4OCFwYvpAAwv/F7wMBF6ouLF5APHF54sMF44SNF5IsPF4gUSGQQXVAH4A/AH4A/ADY"))
diff --git a/apps/waypoints/app.js b/apps/waypoints/app.js
deleted file mode 100644
index 06c254a36..000000000
--- a/apps/waypoints/app.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// place your const, vars, functions or classes here
-
-// clear the screen
-g.clear();
-
-var n = 0;
-
-// redraw the screen
-function draw() {
-  g.reset().clearRect(Bangle.appRect);
-  g.setFont("6x8").setFontAlign(0,0).drawString("Up / Down",g.getWidth()/2,g.getHeight()/2 - 20);
-  g.setFont("Vector",60).setFontAlign(0,0).drawString(n,g.getWidth()/2,g.getHeight()/2 + 30);
-}
-
-// Respond to user input
-Bangle.setUI({mode: "updown"}, function(dir) {
-  if (dir<0) {
-    n--;
-    draw();
-  } else if (dir>0) {
-    n++;
-    draw();
-  } else {
-    n = 0;
-    draw();
-  }
-});
-
-// First draw...
-draw();
-
-// Load widgets
-Bangle.loadWidgets();
-Bangle.drawWidgets();
diff --git a/apps/waypoints/metadata.json b/apps/waypoints/metadata.json
index d7fa00f7e..db5b2e627 100644
--- a/apps/waypoints/metadata.json
+++ b/apps/waypoints/metadata.json
@@ -1,7 +1,7 @@
 { "id": "waypoints",
   "name": "Waypoints",
-  "version":"0.01",
-  "description": "Provides 'waypoints.json' used by various navigation apps, as well as a way to edit it from the App Loader with maps or a list",
+  "version":"0.02",
+  "description": "Provides 'waypoints.json' used by various navigation apps, as well as a way to edit it from the App Loader or from the device",
   "icon": "app.png",
   "tags": "tool,outdoors,gps",
   "type": "waypoints",
@@ -9,6 +9,8 @@
   "readme": "README.md",
   "interface": "interface.html",
   "storage": [
+    {"name":"waypoints.app.js","url":"waypoints.app.js"},
+    {"name":"waypoints.img","url":"app-icon.js","evaluate":true},
     {"name":"waypoints","url":"lib.js"}
   ],
   "data": [
diff --git a/apps/waypoint_editor/app.js b/apps/waypoints/waypoints.app.js
similarity index 100%
rename from apps/waypoint_editor/app.js
rename to apps/waypoints/waypoints.app.js