diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 153d347597..18b0afc0f5 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -205,7 +205,7 @@ node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-im
node|z16[amenity=kindergarten], area|z16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}*/
node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
-node|z16[amenity=hospital], area|z16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z16[amenity=hospital], area|z16[amenity=hospital]{ icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
node|z16[amenity=clinic], area|z16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
node|z16[amenity=university][name], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; -x-me-text-priority:16000;}
node|z16[amenity=university][!name], area|z16[amenity=university][!name] { }
@@ -224,6 +224,8 @@ node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; t
node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
node|z17[amenity=clinic], area|z17[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z17[amenity=doctors],area|z17[amenity=doctors]{ icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z17[amenity=dentist],area|z17[amenity=dentist]{ icon-image: dentist-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
node|z17[amenity=university][name], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10; -x-me-text-priority:16000;}
node|z17[amenity=university][!name], area|z17[amenity=university][!name] { }
node|z17[amenity=cinema], area|z17[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
@@ -256,6 +258,8 @@ node|z18-[amenity=school], area|z18-[amenity=school] { icon-image: school-l.svg;
node|z18-[amenity=college], area|z18-[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
node|z18-[amenity=hospital], area|z18-[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; }
node|z18-[amenity=clinic], area|z18-[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
+node|z18-[amenity=doctors],area|z18-[amenity=doctors]{ icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
+node|z18-[amenity=dentist],area|z18-[amenity=dentist]{ icon-image: dentist-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
node|z18-[amenity=university][name], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; -x-me-text-priority:16000;}
node|z18-[amenity=university][!name], area|z18-[amenity=university][!name] { }
node|z18-[amenity=cinema], area|z18-[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss
index df0a709fd5..6ba9d305dc 100644
--- a/data/styles/clear/include/landuse.mapcss
+++ b/data/styles/clear/include/landuse.mapcss
@@ -174,14 +174,16 @@ area|z17-[sport=multi]
/* hospital*/
-area|z14-15[amenity=hospital] {
+area|z14-15[amenity=hospital],
+area|z14-15[amenity=doctors] {
fill-color: @hospital;
fill-opacity: 1;
fill-position: background;
z-index: 2;
}
-area|z16-[amenity=hospital] {
+area|z16-[amenity=hospital],
+area|z16-[amenity=doctors]{
fill-color: @hospital;
fill-opacity: 1;
fill-position: background;
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index dda99a394e..ee1c3d8392 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -116,8 +116,8 @@
/* LANDUSE */
-@pedestrian_area: #E3E1D2;
-@pedestrian_area_light: #EDEBDB;
+@pedestrian_area: #EDE8D6;
+@pedestrian_area_light: #F2EEDA;
@unversity: #F8E4BA;
@hospital: #F8D9D9;/*FADCDB*/
diff --git a/data/styles/clear/style-clear/symbols/dentist-l.svg b/data/styles/clear/style-clear/symbols/dentist-l.svg
new file mode 100644
index 0000000000..5d14d14a59
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/dentist-l.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/dentist-m.svg b/data/styles/clear/style-clear/symbols/dentist-m.svg
new file mode 100644
index 0000000000..c683337f97
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/dentist-m.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/dentist-s.svg b/data/styles/clear/style-clear/symbols/dentist-s.svg
new file mode 100644
index 0000000000..8f29030dd0
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/dentist-s.svg
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-l.svg b/data/styles/clear/style-clear/symbols/hospital-l.svg
index df9f588c26..22fb7fb4b2 100644
--- a/data/styles/clear/style-clear/symbols/hospital-l.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-l.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-m.svg b/data/styles/clear/style-clear/symbols/hospital-m.svg
index 2fdd43afa1..fea2f89044 100644
--- a/data/styles/clear/style-clear/symbols/hospital-m.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-m.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/hospital-s.svg b/data/styles/clear/style-clear/symbols/hospital-s.svg
index 1608301939..191881843d 100644
--- a/data/styles/clear/style-clear/symbols/hospital-s.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-s.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 443eae2f28..24a4df3a06 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -77,21 +77,21 @@
/* TRANSPORT */
-@railway_light: #212119;
-@railway: #212119;
-@railway_tunnel: #212119;
-@railway_dash: #000000;
+@railway_light: #333333;
+@railway: #333333;
+@railway_tunnel: #222222;
+@railway_dash: #111111;
@aerialway: #4E4E3D;
@tram: #5C5C51;
@ferry: #2A4541;
- @aerodrome: #382D45;
+ @aerodrome: #30263B;
/*aerodrome*/
@aerodrome0: #382D45;
- @aerodrome1: #382D45;
- @aerodrome2: #382D45;
- @aerodrome3: #382D45;
- @aerodrome4: #382D45;
- @aerodrome5: #382D45;
+ @aerodrome1: #342A40;
+ @aerodrome2: #30263B;
+ @aerodrome3: #30263B;
+ @aerodrome4: #2B2336;
+ @aerodrome5: #292133;
/* NATURAL */
@glacier: #111111;
@water: #002222;
diff --git a/data/styles/clear/style-night/symbols/airport-l.svg b/data/styles/clear/style-night/symbols/airport-l.svg
index b4cc83306a..7085c42082 100644
--- a/data/styles/clear/style-night/symbols/airport-l.svg
+++ b/data/styles/clear/style-night/symbols/airport-l.svg
@@ -7,7 +7,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/airport-m.svg b/data/styles/clear/style-night/symbols/airport-m.svg
index 3fffcbc07e..57207bb731 100644
--- a/data/styles/clear/style-night/symbols/airport-m.svg
+++ b/data/styles/clear/style-night/symbols/airport-m.svg
@@ -7,7 +7,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/airport-s.svg b/data/styles/clear/style-night/symbols/airport-s.svg
index 8320aa3f80..41f8fcf919 100644
--- a/data/styles/clear/style-night/symbols/airport-s.svg
+++ b/data/styles/clear/style-night/symbols/airport-s.svg
@@ -7,7 +7,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alcohol-l.svg b/data/styles/clear/style-night/symbols/alcohol-l.svg
index 4a84528671..7b1848ca70 100644
--- a/data/styles/clear/style-night/symbols/alcohol-l.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-l.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alcohol-m.svg b/data/styles/clear/style-night/symbols/alcohol-m.svg
index db53469fd9..da015d9074 100644
--- a/data/styles/clear/style-night/symbols/alcohol-m.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-m.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alcohol-s.svg b/data/styles/clear/style-night/symbols/alcohol-s.svg
index 78a6aaa81c..c6f2a76315 100644
--- a/data/styles/clear/style-night/symbols/alcohol-s.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-s.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-l.svg b/data/styles/clear/style-night/symbols/alpine_hut-l.svg
index d719bdb1f1..6308e2898a 100644
--- a/data/styles/clear/style-night/symbols/alpine_hut-l.svg
+++ b/data/styles/clear/style-night/symbols/alpine_hut-l.svg
@@ -8,7 +8,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-m.svg b/data/styles/clear/style-night/symbols/alpine_hut-m.svg
index 780c828299..73594c908c 100644
--- a/data/styles/clear/style-night/symbols/alpine_hut-m.svg
+++ b/data/styles/clear/style-night/symbols/alpine_hut-m.svg
@@ -8,7 +8,7 @@
-
+
diff --git a/data/styles/clear/style-night/symbols/america-football-l.svg b/data/styles/clear/style-night/symbols/america-football-l.svg
index f52c4b5ca1..72c76dadb3 100644
--- a/data/styles/clear/style-night/symbols/america-football-l.svg
+++ b/data/styles/clear/style-night/symbols/america-football-l.svg
@@ -10,7 +10,7 @@