diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index a5a4c02f89..4d69166c66 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2091,6 +2091,13 @@ node|z17-[amenity=parcel_locker],
 area|z17-[amenity=parcel_locker],
 {icon-image: mail-m.svg;icon-min-distance: 20;}
 
+node|z17[amenity=vending_machine][vending=fuel],
+area|z17[amenity=vending_machine][vending=fuel]
+{icon-image: zero-icon.svg;text: none;}
+node|z18-[amenity=vending_machine][vending=fuel],
+area|z18-[amenity=vending_machine][vending=fuel]
+{icon-image: fuel-dispenser-m.svg;}
+
 node|z17-[aeroway=gate],
 area|z17-[aeroway=gate]
 {icon-image: gate-m.svg;font-size: 11;}
diff --git a/data/styles/clear/style-clear/symbols/fuel-dispenser-m.svg b/data/styles/clear/style-clear/symbols/fuel-dispenser-m.svg
new file mode 100644
index 0000000000..905501b00a
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/fuel-dispenser-m.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0s-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765s0.34994-0.77765 0.77765-0.77765 0.77765 0.34994 0.77765 0.77765-0.34994 0.77765-0.77765 0.77765z" fill="#717065"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg b/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg
new file mode 100644
index 0000000000..cedf00f520
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/fuel-dispenser-m.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m18.264 8.2895 0.0077765-0.0077765-2.4807-2.4807c-0.22552-0.22552-0.59879-0.22552-0.82431 0s-0.22552 0.59879 0 0.82431l1.2287 1.2287c-0.81653 0.31106-1.3687 1.1431-1.2287 2.1074 0.12442 0.85541 0.85541 1.5475 1.7108 1.6408 0.3655 0.038882 0.68433-0.02333 0.98761-0.15553v5.6069c0 0.42771-0.34994 0.77765-0.77765 0.77765s-0.77765-0.34994-0.77765-0.77765v-3.4994c0-0.85541-0.69988-1.5553-1.5553-1.5553h-0.77765v-5.4435c0-0.85541-0.69988-1.5553-1.5553-1.5553h-4.6659c-0.85541 0-1.5553 0.69988-1.5553 1.5553v11.665c0 0.42771 0.34994 0.77765 0.77765 0.77765h6.2212c0.42771 0 0.77765-0.34994 0.77765-0.77765v-5.0547h1.1665v3.7794c0 1.0187 0.73099 1.9441 1.7419 2.0452 1.1665 0.11665 2.1463-0.7932 2.1463-1.9363v-7.3877c0-0.53658-0.21774-1.0265-0.56768-1.3764zm-6.0423 2.1541h-4.6659v-3.1106c0-0.42771 0.34994-0.77765 0.77765-0.77765h3.1106c0.42771 0 0.77765 0.34994 0.77765 0.77765v3.1106zm4.6659 0c-0.42771 0-0.77765-0.34994-0.77765-0.77765s0.34994-0.77765 0.77765-0.77765 0.77765 0.34994 0.77765 0.77765-0.34994 0.77765-0.77765 0.77765z" fill="#fff" opacity=".6"/>
+</svg>
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 11167a013f..5fa68106a9 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -824,6 +824,13 @@ node|z17-[amenity=vending_machine][vending=parking_tickets],
 area|z17-[amenity=vending_machine][vending=parking_tickets]
 {icon-image: parking-meter-m.svg;font-size: 13.5;}
 
+node|z17[amenity=vending_machine][vending=fuel],
+area|z17[amenity=vending_machine][vending=fuel]
+{icon-image: zero-icon.svg;text: none;}
+node|z18-[amenity=vending_machine][vending=fuel],
+area|z18-[amenity=vending_machine][vending=fuel]
+{icon-image: fuel-dispenser-m.svg;}
+
 node|z17-[amenity=parcel_locker],
 area|z17-[amenity=parcel_locker],
 {icon-image: mail-m.svg;icon-min-distance: 20;}