diff --git a/data/presets.yaml b/data/presets.yaml
index 6a3e89e63..45bd7f932 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -876,6 +876,9 @@ en:
       highway/residential: 
         name: Residential Road
         terms: "<translate with synonyms or related terms for 'Residential Road', separated by commas>"
+      highway/rest_area: 
+        name: Rest Area
+        terms: "<translate with synonyms or related terms for 'Rest Area', separated by commas>"
       highway/road: 
         name: Unknown Road
         terms: "<translate with synonyms or related terms for 'Unknown Road', separated by commas>"
@@ -903,6 +906,9 @@ en:
       highway/service/parking_aisle: 
         name: Parking Aisle
         terms: "<translate with synonyms or related terms for 'Parking Aisle', separated by commas>"
+      highway/services: 
+        name: Service Area
+        terms: "<translate with synonyms or related terms for 'Service Area', separated by commas>"
       highway/steps: 
         name: Steps
         terms: "<translate with synonyms or related terms for 'Steps', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9315933b6..df5620ced 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3373,6 +3373,22 @@
         "terms": [],
         "name": "Residential Road"
     },
+    "highway/rest_area": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "highway": "rest_area"
+        },
+        "terms": [
+            "rest stop",
+            "turnout",
+            "lay-by"
+        ],
+        "name": "Rest Area"
+    },
     "highway/road": {
         "icon": "highway-road",
         "fields": [
@@ -3533,6 +3549,22 @@
         },
         "name": "Parking Aisle"
     },
+    "highway/services": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "highway": "services"
+        },
+        "terms": [
+            "services",
+            "travel plaza",
+            "service station"
+        ],
+        "name": "Service Area"
+    },
     "highway/steps": {
         "fields": [
             "access",
diff --git a/data/presets/presets/highway/rest_area.json b/data/presets/presets/highway/rest_area.json
new file mode 100644
index 000000000..5d000ddb2
--- /dev/null
+++ b/data/presets/presets/highway/rest_area.json
@@ -0,0 +1,16 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "highway": "rest_area"
+    },
+    "terms": [
+        "rest stop",
+        "turnout",
+        "lay-by"
+    ],
+    "name": "Rest Area"
+}
\ No newline at end of file
diff --git a/data/presets/presets/highway/services.json b/data/presets/presets/highway/services.json
new file mode 100644
index 000000000..e2203c813
--- /dev/null
+++ b/data/presets/presets/highway/services.json
@@ -0,0 +1,16 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "highway": "services"
+    },
+    "terms": [
+        "services",
+        "travel plaza",
+        "service station"
+    ],
+    "name": "Service Area"
+}
\ No newline at end of file
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 386ab538c..ebec7ca06 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1598,6 +1598,10 @@
                 "name": "Residential Road",
                 "terms": ""
             },
+            "highway/rest_area": {
+                "name": "Rest Area",
+                "terms": "rest stop,turnout,lay-by"
+            },
             "highway/road": {
                 "name": "Unknown Road",
                 "terms": ""
@@ -1634,6 +1638,10 @@
                 "name": "Parking Aisle",
                 "terms": ""
             },
+            "highway/services": {
+                "name": "Service Area",
+                "terms": "services,travel plaza,service station"
+            },
             "highway/steps": {
                 "name": "Steps",
                 "terms": "stairs,staircase"