diff --git a/data/deprecated.json b/data/deprecated.json
index d8358a033..df8d934a9 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -16,6 +16,10 @@
       "old": {"amenity": "artwork"},
       "replace": {"tourism": "artwork"}
     },
+    {
+      "old": {"amenity": "bail_bonds"},
+      "replace": {"office": "bail_bond_agent"}
+    },
     {
       "old": {"amenity": "car_repair"},
       "replace": {"shop": "car_repair"}
@@ -645,6 +649,14 @@
       "old": {"shop": "bags"},
       "replace": {"shop": "bag"}
     },
+    {
+      "old": {"shop": "bail_bond"},
+      "replace": {"office": "bail_bond_agent"}
+    },
+    {
+      "old": {"shop": "bail_bonds"},
+      "replace": {"office": "bail_bond_agent"}
+    },
     {
       "old": {"shop": "betting"},
       "replace": {"shop": "bookmaker"}
diff --git a/data/presets.yaml b/data/presets.yaml
index c8dfda7af..61e3b7ca5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5812,6 +5812,11 @@ en:
         name: Nonprofit Organization Office
         # 'terms: association,non-profit,nonprofit,organization,society'
         terms: '<translate with synonyms or related terms for ''Nonprofit Organization Office'', separated by commas>'
+      office/bail_bond_agent:
+        # office=bail_bond_agent
+        name: Bail Bond Agent
+        # 'terms: bail bond dealer,bail bond man,bail bondsman,bail bondsperson'
+        terms: '<translate with synonyms or related terms for ''Bail Bond Agent'', separated by commas>'
       office/charity:
         # office=charity
         name: Charity Office
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e08244504..20739ae35 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -783,6 +783,7 @@
     "office/advertising_agency": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "advertising_agency"}, "terms": ["ad", "ad agency", "advert agency", "advertising", "marketing"], "name": "Advertising Agency"},
     "office/architect": {"icon": "fas-drafting-compass", "geometry": ["point", "area"], "tags": {"office": "architect"}, "terms": [], "name": "Architect Office"},
     "office/association": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "association"}, "terms": ["association", "non-profit", "nonprofit", "organization", "society"], "name": "Nonprofit Organization Office"},
+    "office/bail_bond_agent": {"icon": "maki-bank", "moreFields": ["{office}", "currency_multi", "payment_multi"], "geometry": ["point", "area"], "tags": {"office": "bail_bond_agent"}, "terms": ["bail bond dealer", "bail bond man", "bail bondsman", "bail bondsperson"], "name": "Bail Bond Agent"},
     "office/charity": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "charity"}, "terms": ["charitable organization"], "name": "Charity Office"},
     "office/company": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "company"}, "terms": [], "name": "Corporate Office"},
     "office/coworking": {"icon": "maki-suitcase", "fields": ["{office}", "internet_access"], "moreFields": ["internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["coworking", "office"], "tags": {"office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "name": "Coworking Space"},
diff --git a/data/presets/presets/office/bail_bond_agent.json b/data/presets/presets/office/bail_bond_agent.json
new file mode 100644
index 000000000..0422c5ad7
--- /dev/null
+++ b/data/presets/presets/office/bail_bond_agent.json
@@ -0,0 +1,22 @@
+{
+    "icon": "maki-bank",
+    "moreFields": [
+        "{office}",
+        "currency_multi",
+        "payment_multi"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "bail_bond_agent"
+    },
+    "terms": [
+        "bail bond dealer",
+        "bail bond man",
+        "bail bondsman",
+        "bail bondsperson"
+    ],
+    "name": "Bail Bond Agent"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index a9b6be202..e5c59e9e5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -753,6 +753,7 @@
     {"key": "office", "value": "advertising_agency", "description": "🄿 Advertising Agency", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "architect", "description": "🄿 Architect Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-drafting-compass.svg?sanitize=true"},
     {"key": "office", "value": "association", "description": "🄿 Nonprofit Organization Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
+    {"key": "office", "value": "bail_bond_agent", "description": "🄿 Bail Bond Agent", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"},
     {"key": "office", "value": "charity", "description": "🄿 Charity Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "company", "description": "🄿 Corporate Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "coworking", "description": "🄿 Coworking Space", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
@@ -1760,6 +1761,7 @@
     {"key": "aeroway", "value": "aerobridge", "description": "🄳 ➜ aeroway=jet_bridge"},
     {"key": "amenity", "value": "advertising", "description": "🄳 ➜ advertising=*"},
     {"key": "amenity", "value": "artwork", "description": "🄳 ➜ tourism=artwork"},
+    {"key": "amenity", "value": "bail_bonds", "description": "🄳 ➜ office=bail_bond_agent"},
     {"key": "amenity", "value": "car_repair", "description": "🄳 ➜ shop=car_repair"},
     {"key": "amenity", "value": "citymap_post", "description": "🄳 ➜ tourism=information"},
     {"key": "amenity", "value": "club", "description": "🄳 ➜ club=*"},
@@ -1895,6 +1897,8 @@
     {"key": "shop", "value": "baby", "description": "🄳 ➜ shop=baby_goods"},
     {"key": "shop", "value": "baby_care", "description": "🄳 ➜ shop=baby_goods"},
     {"key": "shop", "value": "bags", "description": "🄳 ➜ shop=bag"},
+    {"key": "shop", "value": "bail_bond", "description": "🄳 ➜ office=bail_bond_agent"},
+    {"key": "shop", "value": "bail_bonds", "description": "🄳 ➜ office=bail_bond_agent"},
     {"key": "shop", "value": "betting", "description": "🄳 ➜ shop=bookmaker"},
     {"key": "shop", "value": "cafe", "description": "🄳 ➜ amenity=cafe"},
     {"key": "shop", "value": "dive", "description": "🄳 ➜ shop=scuba_diving"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f87e96365..10a6e08a5 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -7438,6 +7438,10 @@
                     "name": "Nonprofit Organization Office",
                     "terms": "association,non-profit,nonprofit,organization,society"
                 },
+                "office/bail_bond_agent": {
+                    "name": "Bail Bond Agent",
+                    "terms": "bail bond dealer,bail bond man,bail bondsman,bail bondsperson"
+                },
                 "office/charity": {
                     "name": "Charity Office",
                     "terms": "charitable organization"