diff --git a/data/styles/default/dark/symbols/sweets-m.svg b/data/styles/default/dark/symbols/confectionery-m.svg
similarity index 100%
rename from data/styles/default/dark/symbols/sweets-m.svg
rename to data/styles/default/dark/symbols/confectionery-m.svg
diff --git a/data/styles/default/dark/symbols/beer-m.svg b/data/styles/default/dark/symbols/pub-m.svg
similarity index 100%
rename from data/styles/default/dark/symbols/beer-m.svg
rename to data/styles/default/dark/symbols/pub-m.svg
diff --git a/data/styles/default/dark/symbols/grocery-m.svg b/data/styles/default/dark/symbols/supermarket-m.svg
similarity index 100%
rename from data/styles/default/dark/symbols/grocery-m.svg
rename to data/styles/default/dark/symbols/supermarket-m.svg
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 1ab223fd56..9881a726cc 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -831,7 +831,7 @@ node|z15[amenity=pub],
 area|z15[amenity=pub],
 node|z15[amenity=biergarten],
 area|z15[amenity=biergarten]
-{icon-image: beer-m.svg;icon-min-distance: 28;}
+{icon-image: pub-m.svg;icon-min-distance: 28;}
 
 node|z16-[amenity=cafe],
 area|z16-[amenity=cafe]
@@ -851,7 +851,7 @@ node|z16-[amenity=pub],
 area|z16-[amenity=pub],
 node|z16-[amenity=biergarten],
 area|z16-[amenity=biergarten]
-{icon-image: beer-m.svg;icon-min-distance: 12;}
+{icon-image: pub-m.svg;icon-min-distance: 12;}
 
 
 /* 5.AMENITY (infrastructure) */
@@ -1983,10 +1983,10 @@ area|z17-[shop=mall],
 
 node|z16[shop=supermarket],
 area|z16[shop=supermarket],
-{icon-image: grocery-m.svg;font-size: 11;icon-min-distance: 16;}
+{icon-image: supermarket-m.svg;font-size: 11;icon-min-distance: 16;}
 node|z17-[shop=supermarket],
 area|z17-[shop=supermarket],
-{icon-image: grocery-m.svg;font-size: 11;icon-min-distance: 8;}
+{icon-image: supermarket-m.svg;font-size: 11;icon-min-distance: 8;}
 
 node|z16[shop=cheese],
 area|z16[shop=cheese]
@@ -2087,7 +2087,7 @@ node|z16[shop=confectionery],
 area|z16[shop=confectionery],
 node|z16[shop=chocolate],
 area|z16[shop=chocolate]
-{icon-image: sweets-m.svg;}
+{icon-image: confectionery-m.svg;}
 node|z16[amenity=ice_cream],
 area|z16[amenity=ice_cream]
 {icon-image: ice_cream-m.svg;}
@@ -2314,7 +2314,7 @@ node|z17-[shop=confectionery],
 area|z17-[shop=confectionery],
 node|z17-[shop=chocolate],
 area|z17-[shop=chocolate]
-{icon-image: sweets-m.svg;icon-min-distance: 24;}
+{icon-image: confectionery-m.svg;icon-min-distance: 24;}
 node|z17-[amenity=ice_cream],
 area|z17-[amenity=ice_cream]
 {icon-image: ice_cream-m.svg;icon-min-distance: 24;}
@@ -2479,7 +2479,7 @@ node|z17-[craft=caterer],
 {icon-image:caterer-m.svg;}
 node|z17-[craft=confectionery],
 area|z17-[craft=confectionery]
-{icon-image:sweets-m.svg;}
+{icon-image:confectionery-m.svg;}
 node|z17-[craft=electrician],
 area|z17-[craft=electrician]
 {icon-image:electrician-m.svg;}
diff --git a/data/styles/default/light/symbols/sweets-m.svg b/data/styles/default/light/symbols/confectionery-m.svg
similarity index 100%
rename from data/styles/default/light/symbols/sweets-m.svg
rename to data/styles/default/light/symbols/confectionery-m.svg
diff --git a/data/styles/default/light/symbols/beer-m.svg b/data/styles/default/light/symbols/pub-m.svg
similarity index 100%
rename from data/styles/default/light/symbols/beer-m.svg
rename to data/styles/default/light/symbols/pub-m.svg
diff --git a/data/styles/default/light/symbols/grocery-m.svg b/data/styles/default/light/symbols/supermarket-m.svg
similarity index 100%
rename from data/styles/default/light/symbols/grocery-m.svg
rename to data/styles/default/light/symbols/supermarket-m.svg
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 1e7f05db62..8b617c50da 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -460,7 +460,7 @@ area|z16[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 22;font-size: 12.75;}
 node|z16[amenity=pub],
 area|z16[amenity=pub]
-{icon-image: beer-m.svg;icon-min-distance: 22;font-size: 12.75;}
+{icon-image: pub-m.svg;icon-min-distance: 22;font-size: 12.75;}
 
 node|z17[amenity=cafe],
 area|z17[amenity=cafe]
@@ -470,7 +470,7 @@ area|z17[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=pub],
 area|z17[amenity=pub]
-{icon-image: beer-m.svg;icon-min-distance: 22;font-size: 13.75;}
+{icon-image: pub-m.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=fast_food],
 area|z17[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 25;font-size: 13.75;}
@@ -483,7 +483,7 @@ area|z18[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=pub],
 area|z18[amenity=pub]
-{icon-image: beer-m.svg;icon-min-distance: 25;font-size: 14.5;}
+{icon-image: pub-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=fast_food],
 area|z18[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 25;font-size: 14.5;}
@@ -496,7 +496,7 @@ area|z19-[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19-[amenity=pub],
 area|z19-[amenity=pub]
-{icon-image: beer-m.svg;icon-min-distance: 40;font-size: 14.5;}
+{icon-image: pub-m.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19-[amenity=fast_food],
 area|z19-[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 45;font-size: 14.5;}
@@ -706,18 +706,18 @@ area|z18-[shop=mall]
 
 node|z14[shop=supermarket],
 area|z14[shop=supermarket]
-{icon-image: grocery-m.svg;font-size:12.25;icon-min-distance: 4;}
+{icon-image: supermarket-m.svg;font-size:12.25;icon-min-distance: 4;}
 node|z15[shop=supermarket],
 area|z15[shop=supermarket]
-{icon-image: grocery-m.svg;font-size:12.5;icon-min-distance: 3;}
+{icon-image: supermarket-m.svg;font-size:12.5;icon-min-distance: 3;}
 node|z16-17[shop=supermarket],
 area|z16-17[shop=supermarket]
-{icon-image: grocery-m.svg;font-size: 13.25;icon-min-distance: 16;text-min-distance:6;}
+{icon-image: supermarket-m.svg;font-size: 13.25;icon-min-distance: 16;text-min-distance:6;}
 
 
 node|z18-[shop=supermarket],
 area|z18-[shop=supermarket]
-{icon-image: grocery-m.svg;font-size: 14.5;icon-min-distance: 15;}
+{icon-image: supermarket-m.svg;font-size: 14.5;icon-min-distance: 15;}
 
 node|z17-[shop=convenience],
 {icon-image: convenience-m.svg; font-size: 13.25;}