diff --git a/icons/map-pinned.json b/icons/map-pinned.json
new file mode 100644
index 000000000..7d0be2ed9
--- /dev/null
+++ b/icons/map-pinned.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "location",
+    "waypoint",
+    "marker",
+    "drop"
+  ],
+  "categories": [
+    "maps",
+    "navigation",
+    "travel",
+    "account"
+  ]
+}
\ No newline at end of file
diff --git a/icons/map-pinned.svg b/icons/map-pinned.svg
new file mode 100644
index 000000000..fd6722426
--- /dev/null
+++ b/icons/map-pinned.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M18 8c0 4.5-6 9-6 9s-6-4.5-6-9a6 6 0 0 1 12 0" />
+  <circle cx="12" cy="8" r="2" />
+  <path d="M8.835 14H5a1 1 0 0 0-.9.7l-2 6c-.1.1-.1.2-.1.3 0 .6.4 1 1 1h18c.6 0 1-.4 1-1 0-.1 0-.2-.1-.3l-2-6a1 1 0 0 0-.9-.7h-3.835" />
+</svg>
diff --git a/icons/milestone.json b/icons/milestone.json
index f11b34eeb..7faacff02 100644
--- a/icons/milestone.json
+++ b/icons/milestone.json
@@ -4,9 +4,11 @@
     "karsa-mistmere"
   ],
   "tags": [
-    "sign",
     "signpost",
     "direction",
+    "right",
+    "east",
+    "forward",
     "version control"
   ],
   "categories": [
diff --git a/icons/route-off.json b/icons/route-off.json
new file mode 100644
index 000000000..f6ad2a180
--- /dev/null
+++ b/icons/route-off.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "path",
+    "journey",
+    "planner",
+    "points",
+    "stops",
+    "stations",
+    "reset",
+    "clear",
+    "cancelled",
+    "closed",
+    "blocked"
+  ],
+  "categories": [
+    "maps",
+    "navigation"
+  ]
+}
\ No newline at end of file
diff --git a/icons/route-off.svg b/icons/route-off.svg
new file mode 100644
index 000000000..6b998107d
--- /dev/null
+++ b/icons/route-off.svg
@@ -0,0 +1,19 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <circle cx="6" cy="19" r="3" />
+  <path d="M9 19h8.5c.4 0 .9-.1 1.3-.2" />
+  <path d="M5.2 5.2A3.5 3.53 0 0 0 6.5 12H12" />
+  <path d="m2 2 20 20" />
+  <path d="M21 15.3a3.5 3.5 0 0 0-3.3-3.3" />
+  <path d="M15 5h-4.3" />
+  <circle cx="18" cy="5" r="3" />
+</svg>
diff --git a/icons/route.json b/icons/route.json
new file mode 100644
index 000000000..9bb5f7090
--- /dev/null
+++ b/icons/route.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "path",
+    "journey",
+    "planner",
+    "points",
+    "stops",
+    "stations"
+  ],
+  "categories": [
+    "maps",
+    "navigation"
+  ]
+}
\ No newline at end of file
diff --git a/icons/route.svg b/icons/route.svg
new file mode 100644
index 000000000..12f708814
--- /dev/null
+++ b/icons/route.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <circle cx="6" cy="19" r="3" />
+  <path d="M9 19h8.5a3.5 3.5 0 0 0 0-7h-11a3.5 3.5 0 0 1 0-7H15" />
+  <circle cx="18" cy="5" r="3" />
+</svg>
diff --git a/icons/signpost-big.json b/icons/signpost-big.json
new file mode 100644
index 000000000..17f39a336
--- /dev/null
+++ b/icons/signpost-big.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "bidirectional",
+    "left",
+    "right",
+    "east",
+    "west"
+  ],
+  "categories": [
+    "arrows",
+    "navigation",
+    "development",
+    "gaming"
+  ]
+}
\ No newline at end of file
diff --git a/icons/signpost-big.svg b/icons/signpost-big.svg
new file mode 100644
index 000000000..144495f83
--- /dev/null
+++ b/icons/signpost-big.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M10 9H4L2 7l2-2h6" />
+  <path d="M14 5h6l2 2-2 2h-6" />
+  <path d="M10 22V4a2 2 0 1 1 4 0v18" />
+  <path d="M8 22h8" />
+</svg>
diff --git a/icons/signpost.json b/icons/signpost.json
new file mode 100644
index 000000000..17f39a336
--- /dev/null
+++ b/icons/signpost.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "bidirectional",
+    "left",
+    "right",
+    "east",
+    "west"
+  ],
+  "categories": [
+    "arrows",
+    "navigation",
+    "development",
+    "gaming"
+  ]
+}
\ No newline at end of file
diff --git a/icons/signpost.svg b/icons/signpost.svg
new file mode 100644
index 000000000..cea53aeb3
--- /dev/null
+++ b/icons/signpost.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M12 3v3" />
+  <path d="M18.5 13h-13L2 9.5 5.5 6h13L22 9.5Z" />
+  <path d="M12 13v8" />
+</svg>
diff --git a/icons/waypoints.json b/icons/waypoints.json
new file mode 100644
index 000000000..e133c9f3c
--- /dev/null
+++ b/icons/waypoints.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "indirection",
+    "vpn",
+    "virtual private network",
+    "proxy",
+    "connections",
+    "bounce",
+    "reroute",
+    "path",
+    "journey",
+    "planner",
+    "stops",
+    "stations",
+    "shared",
+    "spread",
+    "viral"
+  ],
+  "categories": [
+    "security",
+    "account",
+    "maps",
+    "navigation",
+    "development",
+    "social"
+  ]
+}
\ No newline at end of file
diff --git a/icons/waypoints.svg b/icons/waypoints.svg
new file mode 100644
index 000000000..c8d788034
--- /dev/null
+++ b/icons/waypoints.svg
@@ -0,0 +1,19 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <circle cx="12" cy="4.5" r="2.5" />
+  <path d="m10.2 6.3-3.9 3.9" />
+  <circle cx="4.5" cy="12" r="2.5" />
+  <path d="M7 12h10" />
+  <circle cx="19.5" cy="12" r="2.5" />
+  <path d="m13.8 17.7 3.9-3.9" />
+  <circle cx="12" cy="19.5" r="2.5" />
+</svg>