diff --git a/data/classificator.txt b/data/classificator.txt
index 8abc864446..54b0bffc9b 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -562,7 +562,9 @@ world  +
         dog_park  -
         fitness_centre  -
         fitness_station  -
-        garden  -
+        garden  +
+            residential  -
+            {}
         golf_course  -
         ice_rink  -
         landscape_reserve  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 178d49b690..d40b8325bd 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index fde1bfc4a5..7225bd8fd6 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -36077,6 +36077,93 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 12372094
+      priority: -15916
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 11781233
+      priority: -15916
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 11453035
+      priority: -15916
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 11584112
+      priority: -15916
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 11190117
+      priority: -15916
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 18
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 19
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index c3c8140c5d..1970aca40c 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index a142d4f929..f6407bf7e7 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -35718,6 +35718,93 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 12372094
+      priority: -15916
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 11781233
+      priority: -15916
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 11453035
+      priority: -15916
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 11584112
+      priority: -15916
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 11190117
+      priority: -15916
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 18
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 19
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 11a4758696..97a2595f89 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index e49639ba21..b3f854f71e 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -35861,6 +35861,93 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1317888
+      priority: -15916
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 1317888
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 18
+    area {
+      color: 1317888
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 19
+    area {
+      color: 1317888
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 7213ed9607..1a498ea9d0 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 66a6d0589e..772c75d85b 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -22325,6 +22325,65 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 27e889033d..09c2032e55 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 3077c11e7b..d0ad47da64 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -22649,6 +22649,65 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 0d6c4d8eed..94a1324152 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -134,7 +134,7 @@ sport|tennis;133;
 landuse|vineyard;134;
 aeroway|taxiway;135;
 aeroway|aerodrome;136;
-deprecated|deprecated;137;x
+leisure|garden|residential;[leisure=garden][garden:type=residential];;name;int_name;137;
 amenity|fire_station;138;
 landuse|retail;139;
 leisure|nature_reserve;140;
diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index 53870e98f9..b6de4b0a69 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -453,11 +453,11 @@ node|z17-[landuse=residential]::int_name,
 
 area|z14-[leisure=park][name],
 area|z14-[landuse=forest][name],
-area|z16-[leisure=garden][name]
+area|z16-[leisure=garden][garden:type!=residential][name]
 {text: name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 10;}
 area|z14-[leisure=park][name]::int_name,
 area|z14-[landuse=forest][name]::int_name,
-area|z16-[leisure=garden][name]::int_name
+area|z16-[leisure=garden][garden:type!=residential][name]::int_name
 {text: int_name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
 
 /*
@@ -489,21 +489,21 @@ area|z16[landuse=forest][name]
 {icon-image: nparkf-m.svg;text-offset: 1;font-size: 11;}
 area|z16[leisure=park][name]
 {icon-image: park-m.svg;text-offset: 1;font-size: 11;}
-area|z16[leisure=garden][name]
+area|z16[leisure=garden][garden:type!=residential][name]
 {icon-image: garden-m.svg;text-offset: 1;font-size: 11;}
 
 area|z17[landuse=forest][name]
 {icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;}
 area|z17[leisure=park][name]
 {icon-image: park-m.svg;text-offset: 1;font-size: 12;}
-area|z17[leisure=garden][name]
+area|z17[leisure=garden][garden:type!=residential][name]
 {icon-image: garden-m.svg;text-offset: 1;font-size: 12;}
 
 area|z18-[landuse=forest]
 {icon-image: nparkf-m.svg;text-offset: 1;font-size: 13;}
 area|z18-[leisure=park]
 {icon-image: park-m.svg;text-offset: 1;font-size: 13;}
-area|z18-[leisure=garden]
+area|z18-[leisure=garden][garden:type!=residential]
 {icon-image: garden-m.svg;text-offset: 1;font-size: 13;}
 area|z18-[leisure=park]::int_name,
 area|z18-[leisure=garden]::int_name,
diff --git a/data/types.txt b/data/types.txt
index 5a3fd054af..89344855ee 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -134,7 +134,7 @@ landuse|forest|mixed
 *landuse|vineyard
 *aeroway|taxiway
 *aeroway|aerodrome
-mapswithme
+*leisure|garden|residential
 *amenity|fire_station
 *landuse|retail
 *leisure|nature_reserve
diff --git a/data/visibility.txt b/data/visibility.txt
index dbe835f9fa..d431407a3a 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -562,7 +562,9 @@ world  00000000000000000000  +
         dog_park  00000000000000000000  -
         fitness_centre  00000000000000000000  -
         fitness_station  00000000000000000000  -
-        garden  00000000000011111111  -
+        garden  00000000000011111111  +
+            residential  00000000000011111111  -
+            {}
         golf_course  00000000000000111111  -
         ice_rink  00000000000000000000  -
         landscape_reserve  00000000000000000000  -