diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index c783d66e1f..f4256c3886 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -324,6 +324,7 @@ area|z14-[area:highway=living_street],
 area|z14-[amenity=grave_yard],
 area|z14-[landuse=cemetery],
 area|z14-[amenity=university],
+area|z15-[landuse=garages],
 area|z15-[landuse=industrial],
 area|z15-[landuse=construction],
 area|z15-[landuse=churchyard],
@@ -352,7 +353,8 @@ area|z15-[landuse=industrial],
 area|z15-[landuse=construction],
 area|z15-[landuse=landfill],
 area|z15-[landuse=railway],
-area|z15-[landuse=quarry]
+area|z15-[landuse=quarry],
+area|z15-[landuse=garages],
 {fill-color: @industrial;}
 
 /* 7.2 Hospital */
@@ -440,9 +442,10 @@ area|z15-[landuse=churchyard]
 
 /* 7.8 Agricultural */
 area|z10-[landuse=farmland],
-area|z10-[landuse=farmyard],
 {fill-color: @farmland; fill-opacity: 1;}
 
+area|z10-[landuse=farmyard],
+{fill-color: @farmyard; fill-opacity: 1;}
 /* Parking */
 
 area|z15-[amenity=parking],
@@ -523,26 +526,22 @@ line|z19-[man_made=cutline],
 
 area|z14[building],
 area|z14[waterway=dam],
-area|z14[landuse=garages],
 {fill-color: @building;fill-opacity: 0.5;}
 
 area|z15[building],
 area|z15[waterway=dam],
-area|z15[landuse=garages],
 {fill-color: @building;fill-opacity: 0.6;}
 
 area|z14-15[aeroway=terminal],
 area|z16[building],
 area|z16[building:part],
 area|z16[waterway=dam],
-area|z16[landuse=garages],
 {fill-color: @building;fill-opacity: 0.8;casing-width: 1;casing-color: @building_border;}
 
 area|z16-[aeroway=terminal],
 area|z17-[building],
 area|z17-[building:part],
 area|z17-[waterway=dam],
-area|z17-[landuse=garages],
 {fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
 
 
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index cd2671c31a..11d222beb3 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -99,9 +99,11 @@ natural-wetland-bog                                 # area z11- (also has captio
 natural-wetland-marsh                               # area z11- (also has caption z16-)
 === 90
 
+landuse-farmyard                                    # area z10- (also has caption z15-)
+=== 81
+
 landuse-allotments                                  # area z12- (also has caption z15-)
 landuse-farmland                                    # area z10- (also has caption z15-)
-landuse-farmyard                                    # area z10- (also has caption z15-)
 landuse-field                                       # area z12-
 landuse-meadow                                      # area z12-
 landuse-orchard                                     # area z12- (also has caption z15-)
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index 34b9027e6e..9edd2d9d2f 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -402,7 +402,7 @@ piste:type-sled                                     # line z14-
 === 120
 
 building:part                                       # area z16-
-landuse-garages                                     # area z14-
+landuse-garages                                     # area z15-
 === 110
 
 barrier-retaining_wall                              # line z16-
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 4b371500db..74807dd71c 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -70,6 +70,7 @@
 @parking: #F2F2BC;
 @military: #E53935;
 @farmland: #EBE4A5;
+@farmyard: #E5D6AC;
 
 /*4.2 Aerodrome*/
 
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 17efa4a730..1db5c252fa 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -70,6 +70,7 @@
 @parking: #1F1B1B;
 @military: #B71C1C;
 @farmland: #151500;
+@farmyard: #212106;
 
 /*4.2 Aerodrome*/
 
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 6ad17cb6c8..c2deeb3148 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -283,7 +283,7 @@ area|z14-[area:highway=living_street],
 area|z14-[amenity=grave_yard],
 area|z14-[landuse=cemetery],
 area|z14-[amenity=university],
-area|z15-[landuse=industrial],
+area|z15-[landuse=garages],
 area|z15-[landuse=construction],
 area|z15-[landuse=churchyard],
 area|z15-[landuse=landfill],
@@ -302,7 +302,8 @@ area|z15-[landuse=industrial],
 area|z15-[landuse=construction],
 area|z15-[landuse=landfill],
 area|z15-[landuse=railway],
-area|z15-[landuse=quarry]
+area|z15-[landuse=quarry],
+area|z15-[landuse=garages],
 {fill-color: @industrial;fill-opacity: 1;}
 
 
@@ -365,6 +366,9 @@ area|z15-[landuse=churchyard]
 area|z14-[landuse=farmland],
 {fill-color: @farmland; fill-opacity: 1;}
 
+area|z14-[landuse=farmyard],
+{fill-color: @farmyard; fill-opacity: 1;}
+
 /* Parking */
 
 area|z15-[amenity=parking],
@@ -435,14 +439,12 @@ line|z19-[man_made=cutline],
 
 area|z15[building],
 area|z15[waterway=dam],
-area|z15[landuse=garages],
 {fill-color: @building;fill-opacity: 0.65;casing-width: 1;casing-color: @building_border;}
 
 area|z14-[aeroway=terminal],
 area|z16-[building],
 area|z16-[building:part],
 area|z16-[waterway=dam],
-area|z16-[landuse=garages],
 {fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}
 
 
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index a341566415..8865422e18 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -57,6 +57,9 @@ natural-grassland                                   # area z14-
 natural-heath                                       # area z14-
 === 80
 
+landuse-farmyard                                    # area z14-
+=== 71
+
 landuse-allotments                                  # area z14-
 landuse-farmland                                    # area z14-
 landuse-field                                       # area z14-
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss
index b06f80401d..e733b78bc3 100644
--- a/data/styles/vehicle/style-clear/colors.mapcss
+++ b/data/styles/vehicle/style-clear/colors.mapcss
@@ -133,6 +133,7 @@
 @parking_l: #FCFCC2;/*#F0EBC5;DCDCB9; #F2F2CE;*/
 @military: #E53935;
 @farmland: #ededc3;
+@farmyard: #e8dabb;
 
 /* BARRIERS */
 @fence: #888888;
diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss
index 54d062ac26..eec8329e17 100644
--- a/data/styles/vehicle/style-night/colors.mapcss
+++ b/data/styles/vehicle/style-night/colors.mapcss
@@ -70,6 +70,7 @@
 @parking: #191509;
 @parking_l: #1F190A;
 @farmland: #151500;
+@farmyard: #212106;
 
 /*4.2 Aerodrome*/