diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json
new file mode 100644
index 000000000..302fb0c35
--- /dev/null
+++ b/data/presets/presets/highway/bridleway.json
@@ -0,0 +1,19 @@
+{
+    "fields": [
+        "access",
+        "surface",
+        "structure"
+    ],
+    "icon": "highway-bridleway",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "steps"
+    },
+    "terms": [
+        "stairs",
+        "staircase"
+    ],
+    "name": "Steps"
+}
diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json
index 27db92393..42b35e3f5 100644
--- a/data/presets/presets/highway/steps.json
+++ b/data/presets/presets/highway/steps.json
@@ -3,6 +3,7 @@
         "access",
         "surface"
     ],
+    "icon": "highway-steps",
     "geometry": [
         "line"
     ],
@@ -14,4 +15,4 @@
         "staircase"
     ],
     "name": "Steps"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json
index e5bb42d3b..710dd5950 100644
--- a/data/presets/presets/power/line.json
+++ b/data/presets/presets/power/line.json
@@ -5,5 +5,6 @@
     "tags": {
         "power": "line"
     },
-    "name": "Power Line"
-}
\ No newline at end of file
+    "name": "Power Line",
+    "icon": "power-line"
+}
diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json
new file mode 100644
index 000000000..7f5fca123
--- /dev/null
+++ b/data/presets/presets/railway/abandoned.json
@@ -0,0 +1,14 @@
+{
+    "icon": "railway-abandoned",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "railway": "abandoned"
+    },
+    "fields": [
+        "structure"
+    ],
+    "terms": [],
+    "name": "Abandoned railway"
+}
diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json
new file mode 100644
index 000000000..70577f2d1
--- /dev/null
+++ b/data/presets/presets/railway/disused.json
@@ -0,0 +1,14 @@
+{
+    "icon": "railway-disused",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "railway": "disused"
+    },
+    "fields": [
+        "structure"
+    ],
+    "terms": [],
+    "name": "Disused railway"
+}
diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json
new file mode 100644
index 000000000..13d11450e
--- /dev/null
+++ b/data/presets/presets/railway/monorail.json
@@ -0,0 +1,14 @@
+{
+    "icon": "railway-monorail",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "railway": "monorail"
+    },
+    "fields": [
+        "structure"
+    ],
+    "terms": [],
+    "name": "Monorail"
+}
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
new file mode 100644
index 000000000..b31ffd1e3
--- /dev/null
+++ b/data/presets/presets/railway/tram.json
@@ -0,0 +1,14 @@
+{
+    "icon": "railway-light_rail",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "railway": "tram"
+    },
+    "fields": [
+        "structure"
+    ],
+    "terms": ["streetcar"],
+    "name": "Tram"
+}
diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json
index 3b865d20e..7e4c677da 100644
--- a/data/presets/presets/waterway/canal.json
+++ b/data/presets/presets/waterway/canal.json
@@ -1,5 +1,5 @@
 {
-    "icon": "waterway-river",
+    "icon": "waterway-canal",
     "geometry": [
         "line"
     ],
@@ -7,4 +7,4 @@
         "waterway": "canal"
     },
     "name": "Canal"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/ditch.json b/data/presets/presets/waterway/ditch.json
index a19605e06..20bacfffd 100644
--- a/data/presets/presets/waterway/ditch.json
+++ b/data/presets/presets/waterway/ditch.json
@@ -1,5 +1,5 @@
 {
-    "icon": "waterway-river",
+    "icon": "waterway-ditch",
     "geometry": [
         "line"
     ],
@@ -7,4 +7,4 @@
         "waterway": "ditch"
     },
     "name": "Ditch"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
index 3257f92a1..8a54ad4f8 100644
--- a/data/presets/presets/waterway/stream.json
+++ b/data/presets/presets/waterway/stream.json
@@ -1,5 +1,5 @@
 {
-    "icon": "waterway-river",
+    "icon": "waterway-stream",
     "fields": [
         "layer"
     ],
@@ -37,4 +37,4 @@
         "waterway": "stream"
     },
     "name": "Stream"
-}
\ No newline at end of file
+}