diff --git a/data/presets.yaml b/data/presets.yaml
index a54301baad..283371dca8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2303,6 +2303,11 @@ en:
         name: Bar
         # 'terms: dive,beer,bier,booze'
         terms: '<translate with synonyms or related terms for ''Bar'', separated by commas>'
+      amenity/bar/lgbtq:
+        # 'amenity=bar, lgbtq=primary'
+        name: LGBTQ+ Bar
+        # 'terms: gay bar,lesbian bar,lgbtq bar,lgbt bar,lgb bar'
+        terms: '<translate with synonyms or related terms for ''LGBTQ+ Bar'', separated by commas>'
       amenity/bbq:
         # amenity=bbq
         name: Barbecue/Grill
@@ -2419,6 +2424,11 @@ en:
         name: Community Center
         # 'terms: event,hall'
         terms: '<translate with synonyms or related terms for ''Community Center'', separated by commas>'
+      amenity/community_centre/lgbtq:
+        # 'amenity=community_centre, lgbtq=primary'
+        name: LGBTQ+ Community Center
+        # 'terms: lgbtq event,lgbtq hall,lgbt event,lgbt hall,lgb event,lgb hall'
+        terms: '<translate with synonyms or related terms for ''LGBTQ+ Community Center'', separated by commas>'
       amenity/compressed_air:
         # amenity=compressed_air
         name: Compressed Air
@@ -2605,6 +2615,11 @@ en:
         name: Nightclub
         # 'terms: disco*,night club,dancing,dance club'
         terms: '<translate with synonyms or related terms for ''Nightclub'', separated by commas>'
+      amenity/nightclub/lgbtq:
+        # 'amenity=nightclub, lgbtq=primary'
+        name: LGBTQ+ Nightclub
+        # 'terms: gay nightclub,lesbian nightclub,lgbtq nightclub,lgbt nightclub,lgb nightclub'
+        terms: '<translate with synonyms or related terms for ''LGBTQ+ Nightclub'', separated by commas>'
       amenity/nursing_home:
         # amenity=nursing_home
         name: Nursing Home
@@ -2721,6 +2736,11 @@ en:
         name: Pub
         # 'terms: alcohol,drink,dive,beer,bier,booze'
         terms: '<translate with synonyms or related terms for ''Pub'', separated by commas>'
+      amenity/pub/lgbtq:
+        # 'amenity=pub, lgbtq=primary'
+        name: LGBTQ+ Pub
+        # 'terms: gay pub,lesbian pub,lgbtq pub,lgbt pub,lgb pub'
+        terms: '<translate with synonyms or related terms for ''LGBTQ+ Pub'', separated by commas>'
       amenity/public_bath:
         # amenity=public_bath
         name: Public Bath
@@ -6180,6 +6200,11 @@ en:
         name: Erotic Store
         # 'terms: sex,porn'
         terms: '<translate with synonyms or related terms for ''Erotic Store'', separated by commas>'
+      shop/erotic/lgbtq:
+        # 'shop=erotic, lgbtq=primary'
+        name: LGBTQ+ Erotic Store
+        # 'terms: sex,porn'
+        terms: '<translate with synonyms or related terms for ''LGBTQ+ Erotic Store'', separated by commas>'
       shop/fabric:
         # shop=fabric
         name: Fabric Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 74cc6f4a8c..f6a498d9f0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -58,6 +58,7 @@
     "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["name", "brand", "lit", "opening_hours", "wheelchair", "covered"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
     "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["opening_hours", "currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
     "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "brewery"], "moreFields": ["smoking", "opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
+    "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
     "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "inscription", "lit"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple", "fee"], "moreFields": ["payment_multi", "covered"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
@@ -82,6 +83,7 @@
     "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"},
     "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "address", "website", "internet_access"], "moreFields": ["religion", "denomination", "internet_access/fee", "internet_access/ssid", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
     "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
+    "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
     "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "fee", "payment_multi", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
     "amenity/courthouse": {"icon": "temaki-courthouse", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
     "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
@@ -120,6 +122,7 @@
     "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
     "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
     "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
+    "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
     "amenity/parking": {"icon": "maki-car", "fields": ["operator", "parking", "capacity", "access_simple", "fee", "surface"], "moreFields": ["name", "supervised", "park_ride", "maxstay", "payment_multi", "address", "website", "phone", "email", "fax", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
@@ -143,6 +146,7 @@
     "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
     "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
     "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["outdoor_seating", "diet_multi", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+    "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"},
     "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
     "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "operator", "capacity", "website", "lit"], "moreFields": ["wheelchair"], "geometry": ["point", "area"], "terms": ["library", "bookcrossing"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"},
     "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
@@ -892,6 +896,7 @@
     "shop/e-cigarette": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "e-cigarette"}, "terms": ["electronic", "vape", "vaping", "vapor"], "name": "E-Cigarette Shop"},
     "shop/electronics": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["appliance", "audio", "blueray", "camera", "computer", "dvd", "home theater", "radio", "speaker", "tv", "video"], "tags": {"shop": "electronics"}, "name": "Electronics Store"},
     "shop/erotic": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic"}, "name": "Erotic Store"},
+    "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"},
     "shop/fabric": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sew"], "tags": {"shop": "fabric"}, "name": "Fabric Store"},
     "shop/farm": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["farm shop", "farm stand"], "tags": {"shop": "farm"}, "name": "Produce Stand"},
     "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "name": "Fashion Store"},
diff --git a/data/presets/presets/amenity/bar/lgbtq.json b/data/presets/presets/amenity/bar/lgbtq.json
new file mode 100644
index 0000000000..2944b7440d
--- /dev/null
+++ b/data/presets/presets/amenity/bar/lgbtq.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-bar",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "gay bar",
+        "lesbian bar",
+        "lgbtq bar",
+        "lgbt bar",
+        "lgb bar"
+    ],
+    "tags": {
+        "amenity": "bar",
+        "lgbtq": "primary"
+    },
+    "name": "LGBTQ+ Bar"
+}
diff --git a/data/presets/presets/amenity/community_centre/lgbtq.json b/data/presets/presets/amenity/community_centre/lgbtq.json
new file mode 100644
index 0000000000..f6fbef8d0b
--- /dev/null
+++ b/data/presets/presets/amenity/community_centre/lgbtq.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-town-hall",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "lgbtq event",
+        "lgbtq hall",
+        "lgbt event",
+        "lgbt hall",
+        "lgb event",
+        "lgb hall"
+    ],
+    "tags": {
+        "amenity": "community_centre",
+        "lgbtq": "primary"
+    },
+    "name": "LGBTQ+ Community Center"
+}
diff --git a/data/presets/presets/amenity/nightclub/lgbtq.json b/data/presets/presets/amenity/nightclub/lgbtq.json
new file mode 100644
index 0000000000..5d12f78d80
--- /dev/null
+++ b/data/presets/presets/amenity/nightclub/lgbtq.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-bar",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "nightclub",
+        "lgbtq": "primary"
+    },
+    "terms": [
+        "gay nightclub",
+        "lesbian nightclub",
+        "lgbtq nightclub",
+        "lgbt nightclub",
+        "lgb nightclub"
+    ],
+    "name": "LGBTQ+ Nightclub"
+}
diff --git a/data/presets/presets/amenity/pub/lgbtq.json b/data/presets/presets/amenity/pub/lgbtq.json
new file mode 100644
index 0000000000..f8c3b9f82f
--- /dev/null
+++ b/data/presets/presets/amenity/pub/lgbtq.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-beer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "pub",
+        "lgbtq": "primary"
+    },
+    "terms": [
+        "gay pub",
+        "lesbian pub",
+        "lgbtq pub",
+        "lgbt pub",
+        "lgb pub"
+    ],
+    "name": "LGBTQ+ Pub"
+}
diff --git a/data/presets/presets/shop/erotic/lgbtq.json b/data/presets/presets/shop/erotic/lgbtq.json
new file mode 100644
index 0000000000..4cb57ca3ba
--- /dev/null
+++ b/data/presets/presets/shop/erotic/lgbtq.json
@@ -0,0 +1,16 @@
+{
+    "icon": "maki-shop",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "sex",
+        "porn"
+    ],
+    "tags": {
+        "shop": "erotic",
+        "lgbtq": "primary"
+    },
+    "name": "LGBTQ+ Erotic Store"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index fe6d87eb09..490350311b 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -61,6 +61,7 @@
     {"key": "amenity", "value": "atm", "description": "🄿 ATM", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"},
     {"key": "amenity", "value": "bank", "description": "🄿 Bank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"},
     {"key": "amenity", "value": "bar", "description": "🄿 Bar", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bar-15.svg?sanitize=true"},
+    {"key": "lgbtq", "value": "primary", "description": "🄿 LGBTQ+ Bar, 🄿 LGBTQ+ Community Center, 🄿 LGBTQ+ Nightclub, 🄿 LGBTQ+ Pub, 🄿 LGBTQ+ Erotic Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bar-15.svg?sanitize=true"},
     {"key": "amenity", "value": "bbq", "description": "🄿 Barbecue/Grill", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bbq-15.svg?sanitize=true"},
     {"key": "amenity", "value": "bench", "description": "🄿 Bench", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/bench.svg?sanitize=true"},
     {"key": "amenity", "value": "bicycle_parking", "description": "🄿 Bicycle Parking", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ad85bdf370..77b832aef0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4110,6 +4110,10 @@
                     "name": "Bar",
                     "terms": "dive,beer,bier,booze"
                 },
+                "amenity/bar/lgbtq": {
+                    "name": "LGBTQ+ Bar",
+                    "terms": "gay bar,lesbian bar,lgbtq bar,lgbt bar,lgb bar"
+                },
                 "amenity/bbq": {
                     "name": "Barbecue/Grill",
                     "terms": "bbq,grill"
@@ -4206,6 +4210,10 @@
                     "name": "Community Center",
                     "terms": "event,hall"
                 },
+                "amenity/community_centre/lgbtq": {
+                    "name": "LGBTQ+ Community Center",
+                    "terms": "lgbtq event,lgbtq hall,lgbt event,lgbt hall,lgb event,lgb hall"
+                },
                 "amenity/compressed_air": {
                     "name": "Compressed Air",
                     "terms": ""
@@ -4358,6 +4366,10 @@
                     "name": "Nightclub",
                     "terms": "disco*,night club,dancing,dance club"
                 },
+                "amenity/nightclub/lgbtq": {
+                    "name": "LGBTQ+ Nightclub",
+                    "terms": "gay nightclub,lesbian nightclub,lgbtq nightclub,lgbt nightclub,lgb nightclub"
+                },
                 "amenity/parking_entrance": {
                     "name": "Parking Garage Entrance/Exit",
                     "terms": ""
@@ -4450,6 +4462,10 @@
                     "name": "Pub",
                     "terms": "alcohol,drink,dive,beer,bier,booze"
                 },
+                "amenity/pub/lgbtq": {
+                    "name": "LGBTQ+ Pub",
+                    "terms": "gay pub,lesbian pub,lgbtq pub,lgbt pub,lgb pub"
+                },
                 "amenity/public_bath": {
                     "name": "Public Bath",
                     "terms": "onsen,foot bath,hot springs"
@@ -7446,6 +7462,10 @@
                     "name": "Erotic Store",
                     "terms": "sex,porn"
                 },
+                "shop/erotic/lgbtq": {
+                    "name": "LGBTQ+ Erotic Store",
+                    "terms": "sex,porn"
+                },
                 "shop/fabric": {
                     "name": "Fabric Store",
                     "terms": "sew"