diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 28bf7339f..36887969c 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -2269,149 +2269,4 @@ node|z18-[amenity=parking_space][parking_space=disabled],
 
 /* 8. Colored Labels */
 
-node[amenity=car_rental],
-node[amenity=car_sharing],
-node[amenity=internet_cafe],
-node[amenity=marketplace],
-node[amenity=motorcycle_rental],
-node[shop],
-{text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=car_wash],
-node[amenity=fuel],
-node[amenity=studio],
-node[amenity=vehicle_inspection],
-node[craft],
-node[landuse=industrial][industrial=mine],
-node[landuse=quarry],
-node[man_made=works],
-node[office],
-node[shop=agrarian],
-node[shop=car_parts],
-node[shop=car_repair],
-node[shop=car_repair][service=tyres],
-node[shop=funeral_directors],
-node[shop=gas],
-node[shop=motorcycle_repair],
-node[shop=tattoo],
-node[shop=trade],
-node[shop=tyres],
-node[shop=wholesale],
-{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[craft=tailor],
-node[craft=photographer],
-{text-color: @shop_label}
-
-node[amenity=bar],
-node[amenity=biergarten],
-node[amenity=cafe],
-node[amenity=fast_food],
-node[amenity=food_court],
-node[amenity=ice_cream],
-node[amenity=nightclub],
-node[amenity=pub],
-node[amenity=restaurant],
-{text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=casino],
-node[amenity=cinema],
-node[amenity=gambling],
-node[amenity=stripclub],
-node[amenity=theatre],
-node[leisure=adult_gaming_centre],
-node[leisure=amusement_arcade],
-node[leisure=bowling_alley],
-node[leisure=escape_game],
-node[shop=bookmaker],
-node[shop=lottery],
-node[tourism=aquarium],
-node[tourism=theme_park],
-node[tourism=zoo],
-{text-color: @entertainment_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=arts_centre],
-node[amenity=community_centre],
-node[amenity=conference_centre],
-node[amenity=events_venue],
-node[amenity=exhibition_centre],
-node[amenity=place_of_worship]
-node[amenity=social_facility],
-node[historic=ship],
-node[leisure=hackerspace],
-node[tourism=attraction],
-node[tourism=gallery],
-node[tourism=museum],
-{text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[leisure=resort],
-node[tourism=alpine_hut],
-node[tourism=apartment],
-node[tourism=chalet],
-node[tourism=guest_house],
-node[tourism=hostel],
-node[tourism=hotel],
-node[tourism=motel],
-node[tourism=wilderness_hut],
-{text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[leisure=dance],
-node[leisure=fitness_centre],
-node[leisure=sports_centre],
-node[leisure=stadium],
-{text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[landuse=plant_nursery],
-{text-color: @nature_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=public_bath],
-node[leisure=beach_resort],
-node[leisure=marina],
-node[leisure=sports_centre][sport=scuba_diving],
-node[leisure=sports_centre][sport=swimming],
-{text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-area[amenity=university][name]
-node[aeroway=gate],
-node[amenity=atm],
-node[amenity=bank],
-node[amenity=bureau_de_change],
-node[amenity=charging_station][motorcar?],
-node[amenity=childcare],
-node[amenity=college],
-node[amenity=courthouse],
-node[amenity=driving_school],
-node[amenity=fire_station],
-node[amenity=kindergarten],
-node[amenity=language_school],
-node[amenity=library],
-node[amenity=money_transfer],
-node[amenity=music_school],
-node[amenity=nursing_home],
-node[amenity=police],
-node[amenity=post_office],
-node[amenity=prison],
-node[amenity=school],
-node[amenity=townhall],
-node[amenity=university][name],
-node[barrier=border_control],
-node[building=guardhouse],
-node[office=diplomatic],
-node[office=security],
-node[shop=money_lender],
-node[tourism=information][information=office],
-{text-color: @neutral_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-area[amenity=hospital],
-node[amenity=clinic],
-node[amenity=dentist],
-node[amenity=doctors],
-node[amenity=hospital],
-node[amenity=pharmacy],
-node[amenity=veterinary],
-node[healthcare],
-{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=bicycle_rental],
-node[amenity=taxi],
-{text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+@import("../../default/include/Icons_Label_Colors.mapcss");
\ No newline at end of file
diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/Icons_Label_Colors.mapcss
new file mode 100644
index 000000000..9d55f011d
--- /dev/null
+++ b/data/styles/default/include/Icons_Label_Colors.mapcss
@@ -0,0 +1,148 @@
+/* Setting the colors for all POI icons */
+
+node[amenity=car_rental],
+node[amenity=car_sharing],
+node[amenity=internet_cafe],
+node[amenity=marketplace],
+node[amenity=motorcycle_rental],
+node[shop],
+{text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=car_wash],
+node[amenity=fuel],
+node[amenity=studio],
+node[amenity=vehicle_inspection],
+node[craft],
+node[landuse=industrial][industrial=mine],
+node[landuse=quarry],
+node[man_made=works],
+node[office],
+node[shop=agrarian],
+node[shop=car_parts],
+node[shop=car_repair],
+node[shop=car_repair][service=tyres],
+node[shop=funeral_directors],
+node[shop=gas],
+node[shop=motorcycle_repair],
+node[shop=tattoo],
+node[shop=trade],
+node[shop=tyres],
+node[shop=wholesale],
+{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[craft=tailor],
+node[craft=photographer],
+{text-color: @shop_label}
+
+node[amenity=bar],
+node[amenity=biergarten],
+node[amenity=cafe],
+node[amenity=fast_food],
+node[amenity=food_court],
+node[amenity=ice_cream],
+node[amenity=nightclub],
+node[amenity=pub],
+node[amenity=restaurant],
+{text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=casino],
+node[amenity=cinema],
+node[amenity=gambling],
+node[amenity=stripclub],
+node[amenity=theatre],
+node[leisure=adult_gaming_centre],
+node[leisure=amusement_arcade],
+node[leisure=bowling_alley],
+node[leisure=escape_game],
+node[shop=bookmaker],
+node[shop=lottery],
+node[tourism=aquarium],
+node[tourism=theme_park],
+node[tourism=zoo],
+{text-color: @entertainment_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=arts_centre],
+node[amenity=community_centre],
+node[amenity=conference_centre],
+node[amenity=events_venue],
+node[amenity=exhibition_centre],
+node[amenity=place_of_worship]
+node[amenity=social_facility],
+node[historic=ship],
+node[leisure=hackerspace],
+node[tourism=attraction],
+node[tourism=gallery],
+node[tourism=museum],
+{text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[leisure=resort],
+node[tourism=alpine_hut],
+node[tourism=apartment],
+node[tourism=chalet],
+node[tourism=guest_house],
+node[tourism=hostel],
+node[tourism=hotel],
+node[tourism=motel],
+node[tourism=wilderness_hut],
+{text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[leisure=dance],
+node[leisure=fitness_centre],
+node[leisure=sports_centre],
+node[leisure=stadium],
+{text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[landuse=plant_nursery],
+{text-color: @nature_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=public_bath],
+node[leisure=beach_resort],
+node[leisure=marina],
+node[leisure=sports_centre][sport=scuba_diving],
+node[leisure=sports_centre][sport=swimming],
+{text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+area[amenity=university][name]
+node[aeroway=gate],
+node[amenity=atm],
+node[amenity=bank],
+node[amenity=bureau_de_change],
+node[amenity=charging_station][motorcar?],
+node[amenity=childcare],
+node[amenity=college],
+node[amenity=courthouse],
+node[amenity=driving_school],
+node[amenity=fire_station],
+node[amenity=kindergarten],
+node[amenity=language_school],
+node[amenity=library],
+node[amenity=money_transfer],
+node[amenity=music_school],
+node[amenity=nursing_home],
+node[amenity=police],
+node[amenity=post_office],
+node[amenity=prison],
+node[amenity=school],
+node[amenity=townhall],
+node[amenity=university][name],
+node[barrier=border_control],
+node[building=guardhouse],
+node[office=diplomatic],
+node[office=security],
+node[shop=money_lender],
+node[tourism=information][information=office],
+{text-color: @neutral_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+area[amenity=hospital],
+node[amenity=clinic],
+node[amenity=dentist],
+node[amenity=doctors],
+node[amenity=hospital],
+node[amenity=pharmacy],
+node[amenity=veterinary],
+node[healthcare],
+{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=bicycle_rental],
+node[amenity=taxi],
+{text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
diff --git a/data/styles/vehicle/dark/colors.mapcss b/data/styles/vehicle/dark/colors.mapcss
index 6531b085a..ce7ad377b 100644
--- a/data/styles/vehicle/dark/colors.mapcss
+++ b/data/styles/vehicle/dark/colors.mapcss
@@ -169,11 +169,16 @@
 @poi_label: #666666;
 @subway_label: #555555;
 @shop_label: #6B425C;
+@industry_label: #574469;
 @food_label: #8C491C;
+@entertainment_label: #8C311B;
 @culture_label: #6E4426;
 @hotel_label: #614A43;
+@sport_label: #2B5C4B;
+@nature_label: #3C612E;
+@water_label: #0A6074;
+@neutral_label: #51585E;
 @healthcare_label: #983E44;
-@industry_label: #51585E;
 @public_transport_label: #2F6499;
 
 /* 6.4 Road labels */
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index b5037e9cc..f7b9e4cf5 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -787,215 +787,4 @@ node|z17-[amenity=motorcycle_parking],
 
 /* 8. Colored Labels */
 
-node[shop=mall],
-node[shop=car_repair][service=tyres],
-node[amenity=studio],
-node[shop=alcohol],
-node[shop=antiques],
-node[shop=art],
-node[shop=bakery],
-node[shop=beauty],
-node[shop=beverages],
-node[shop=bicycle],
-node[shop=bookmaker],
-node[shop=books],
-node[shop=butcher],
-node[shop=camera],
-node[shop=car],
-node[shop=caravan],
-node[shop=charity],
-node[shop=cheese],
-node[shop=chemist],
-node[shop=chocolate],
-node[shop=clothes],
-node[shop=computer],
-node[shop=confectionery],
-node[shop=convenience],
-node[shop=copyshop],
-node[shop=cosmetics],
-node[shop=deli],
-node[shop=department_store],
-node[shop=doityourself],
-node[shop=dry_cleaning],
-node[shop=electronics],
-node[shop=erotic],
-node[shop=farm],
-node[shop=florist],
-node[shop=furniture],
-node[shop=garden_centre],
-node[shop=gift],
-node[shop=greengrocer],
-node[shop=grocery],
-node[shop=hairdresser],
-node[shop=hardware],
-node[shop=health_food],
-node[shop=houseware],
-node[shop=interior_decoration],
-node[shop=jewelry],
-node[shop=kiosk],
-node[shop=kitchen],
-node[shop=laundry],
-node[amenity=marketplace],
-node[shop=mobile_phone],
-node[shop=motorcycle],
-node[shop=music],
-node[shop=musical_instrument],
-node[shop=optician],
-node[shop=outdoor],
-node[shop=pasta],
-node[shop=pastry],
-node[shop=pet],
-node[shop=photo],
-node[shop=rental],
-node[shop=rental][rental=bike],
-node[shop=seafood],
-node[shop=second_hand],
-node[shop=sewing],
-node[shop=shoes],
-node[shop=sports],
-node[shop=stationery],
-node[shop=supermarket],
-node[shop=tattoo],
-node[shop=ticket],
-node[shop=toys],
-node[shop=tyres],
-node[shop=video],
-node[shop=video_games],
-node[shop=wine],
-node[leisure=bowling_alley],
-node[shop=variety_store],
-node[amenity=internet_cafe],
-node[shop],
-node[shop=auction],
-node[shop=collector],
-node[shop=fabric],
-node[shop=funeral_directors],
-node[shop=hearing_aids],
-node[shop=lottery],
-node[shop=tobacco],
-node[shop=wholesale],
-{text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=bar],
-node[amenity=biergarten],
-node[amenity=cafe],
-node[amenity=fast_food],
-node[amenity=food_court],
-node[amenity=pub],
-node[amenity=restaurant],
-node[amenity=ice_cream],
-node[amenity=nightclub],
-node[amenity=stripclub],
-{text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=arts_centre],
-node[amenity=cinema],
-node[amenity=community_centre],
-node[amenity=place_of_worship]
-node[amenity=social_facility],
-node[amenity=theatre],
-node[attraction=amusement_ride],
-node[attraction=animal],
-node[attraction=big_wheel],
-node[attraction=bumper_car],
-node[attraction=carousel],
-node[attraction=historic],
-node[attraction=maze],
-node[attraction=roller_coaster],
-node[leisure=escape_game],
-node[leisure=stadium],
-node[tourism=aquarium],
-node[tourism=attraction],
-node[tourism=gallery],
-node[tourism=museum],
-node[tourism=theme_park],
-node[tourism=zoo]
-node[tourism=zoo],
-node[historic=ship],
-node[amenity=conference_centre],
-node[amenity=events_venue],
-node[amenity=exhibition_centre],
-node[leisure=marina],
-node[amenity=casino],
-node[amenity=gambling],
-node[amenity=public_bath],
-node[leisure=adult_gaming_centre],
-node[leisure=amusement_arcade],
-node[shop=massage],
-{text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[tourism=alpine_hut],
-node[leisure=resort],
-node[tourism=apartment],
-node[tourism=chalet],
-node[tourism=guest_house],
-node[tourism=hostel],
-node[tourism=hotel],
-node[tourism=motel],
-node[tourism=wilderness_hut],
-{text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-area[amenity=hospital],
-node[amenity=clinic],
-node[amenity=dentist],
-node[amenity=doctors],
-node[amenity=hospital],
-node[amenity=pharmacy],
-node[amenity=veterinary],
-node[healthcare],
-{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-area[amenity=university][name]
-node[aeroway=gate],
-node[amenity=atm],
-node[amenity=bank],
-node[amenity=bureau_de_change],
-node[amenity=charging_station][motorcar?],
-node[amenity=childcare],
-node[amenity=college],
-node[amenity=courthouse],
-node[amenity=driving_school],
-node[amenity=kindergarten],
-node[amenity=language_school],
-node[amenity=library],
-node[amenity=money_transfer],
-node[amenity=music_school],
-node[amenity=nursing_home],
-node[amenity=police],
-node[amenity=post_office],
-node[amenity=prison],
-node[amenity=school],
-node[amenity=townhall],
-node[amenity=university][name],
-node[barrier=border_control],
-node[leisure=beach_resort],
-node[leisure=hackerspace],
-node[office],
-node[amenity=fuel],
-node[landuse=industrial][industrial=mine],
-node[landuse=quarry],
-node[tourism=information][information=office],
-node[amenity=vehicle_inspection],
-node[shop=car_parts],
-node[shop=car_repair],
-node[shop=dry_cleaning],
-node[shop=laundry],
-node[shop=motorcycle_repair],
-node[amenity=car_wash],
-node[amenity=motorcycle_rental],
-node[leisure=dance],
-node[leisure=fitness_centre],
-node[leisure=sports_centre],
-node[leisure=sports_hall],
-node[man_made=works],
-node[shop=money_lender],
-node[shop=pawnbroker],
-node[sport=yoga],
-node[amenity=car_rental],
-node[amenity=car_sharing],
-node[amenity=fire_station],
-{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-
-node[amenity=bicycle_rental],
-node[amenity=taxi],
-{text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+@import("../../default/include/Icons_Label_Colors.mapcss");
\ No newline at end of file
diff --git a/data/styles/vehicle/light/colors.mapcss b/data/styles/vehicle/light/colors.mapcss
index 073899dc3..b7e2a9a93 100644
--- a/data/styles/vehicle/light/colors.mapcss
+++ b/data/styles/vehicle/light/colors.mapcss
@@ -140,11 +140,16 @@
 @poi_label: #444444;
 @subway_label: #333333;
 @shop_label: #8C5678;
+@industry_label: #907E9E;
 @food_label: #BA7141;
+@entertainment_label: #D16B53;
 @culture_label: #82512D;
 @hotel_label: #54413B;
+@sport_label: #459177;
+@nature_label: #40662A;
+@water_label: #06829E;
+@neutral_label: #494F54;
 @healthcare_label: #A6454B;
-@industry_label: #494F54;
 @public_transport_label: #234B73;
 
 /* ROADS LABELS */