diff --git a/amenities.mss b/amenities.mss
index 1f429037..debe1a53 100644
--- a/amenities.mss
+++ b/amenities.mss
@@ -552,6 +552,7 @@
   [feature = 'amenity_restaurant'][zoom >= 16],
   [feature = 'shop_bakery'][zoom >= 16],
   [feature = 'shop_convenience'][zoom >= 16],
+  [feature = 'shop_convenience;gas'][zoom >= 16],
   [feature = 'shop_greengrocer'][zoom >= 16],
   [feature = 'shop_pastry'][zoom >= 16],
   {
@@ -570,6 +571,7 @@
 		}
 		[feature = 'shop_bakery'],
 		[feature = 'shop_convenience'],
+		[feature = 'shop_convenience;gas'],
 		[feature = 'shop_greengrocer'],
 		[feature = 'shop_pastry'] {
 			marker-fill: @shop-icon;
@@ -604,9 +606,13 @@
     [feature = 'shop_bakery'][zoom >= 16] {
       marker-file: url('symbols/openstreetmap-carto/shop/bakery.svg');
     }
-    [feature = 'shop_convenience'][zoom >= 16] {
+    [feature = 'shop_convenience'][zoom >= 16],
+    [feature = 'shop_convenience;gas'][zoom >= 16] {
       marker-file: url('symbols/openstreetmap-carto/shop/convenience.svg');
     }
+    [feature = 'shop_convenience;gas'][compressed_air = 'yes'][zoom >= 16] {
+      marker-file: url('symbols/shop/convenience_air.svg');
+    }
     [feature = 'shop_greengrocer'][zoom >= 16] {
       marker-file: url('symbols/openstreetmap-carto/shop/greengrocer.svg');
     }
@@ -690,6 +696,7 @@
   [feature = 'shop_bicycle'][zoom >= 16],
   [feature = 'shop_bakery'][zoom >= 18],
   [feature = 'shop_convenience'][zoom >= 18],
+  [feature = 'shop_convenience;gas'][zoom >= 18],
   [feature = 'shop_greengrocer'][zoom >= 18],
   [feature = 'shop_pastry'][zoom >= 18] {
 		[way_pixels > 3000][zoom >= 17],
diff --git a/project.mml b/project.mml
index 0e714ee4..1bb60636 100644
--- a/project.mml
+++ b/project.mml
@@ -630,10 +630,10 @@ Layer:
           tags->'shelter' AS shelter,
           way,
           name,
-          COALESCE(
+          COALESCE( -- order is important here
             'aeroway_' || aeroway,
             'tourism_' || tourism,
-            'amenity_' || amenity,
+            'amenity_' || CASE WHEN amenity != 'fuel' THEN amenity ELSE NULL END,
             'shop_' || shop,
             'emergency_' || CASE WHEN tags->'emergency' IS NOT NULL then tags->'emergency' ELSE NULL END,
             'healthcare_' || CASE WHEN tags->'healthcare' IN ('clinic', 'hospital') THEN tags->'healthcare' ELSE NULL END,
@@ -683,7 +683,7 @@ Layer:
           OR tags->'compressed_air'='yes'
           OR (amenity='motorcycle_parking' AND (bicycle IS NULL OR bicycle='yes' OR bicycle='designated'))
           OR tags->'healthcare' IN ('clinic', 'hospital')
-          OR shop IN ('bicycle', 'bakery', 'convenience', 'greengrocer', 'supermarket', 'pastry')
+          OR shop IN ('bicycle', 'bakery', 'convenience', 'convenience;gas', 'greengrocer', 'supermarket', 'pastry')
           OR (shop='sports' AND (tags->'service:bicycle:retail'='yes' OR tags->'service:bicycle:repair'='yes' OR tags->'service:bicycle:rental'='yes' OR tags->'service:bicycle:pump'='yes' OR tags->'service:bicycle:diy'='yes'))
           OR leisure='picnic_table'
           OR (
@@ -710,7 +710,7 @@ Layer:
                 -- Supermarkets
                 WHEN shop='supermarket' THEN 40
                 -- Convenience
-                WHEN shop='convenience' THEN 50
+                WHEN shop='convenience' OR shop='convenience;gas' THEN 50
                 -- Food
                 WHEN shop IS NOT NULL OR amenity IN ('bar', 'biergarten', 'cafe', 'fast_food', 'food_court', 'pub', 'restaurant') THEN 60
                 -- Everything else
@@ -736,10 +736,10 @@ Layer:
           tags->'shelter' AS shelter,
           way,
           name,
-          COALESCE(
+          COALESCE( -- order is important here
             'aeroway_' || aeroway,
             'tourism_' || tourism,
-            'amenity_' || amenity,
+            'amenity_' || CASE WHEN amenity != 'fuel' THEN amenity ELSE NULL END,
             'shop_' || shop,
             'emergency_' || CASE WHEN tags->'emergency' IS NOT NULL then tags->'emergency' ELSE NULL END,
             'healthcare_' || CASE WHEN tags->'healthcare' IN ('clinic', 'hospital') THEN tags->'healthcare' ELSE NULL END,
@@ -804,7 +804,7 @@ Layer:
           OR tags->'compressed_air'='yes'
           OR (amenity='motorcycle_parking' AND (bicycle IS NULL OR bicycle='yes' OR bicycle='designated'))
           OR tags->'healthcare' IN ('clinic', 'hospital')
-          OR shop IN ('bicycle', 'bakery', 'convenience', 'greengrocer', 'supermarket', 'pastry')
+          OR shop IN ('bicycle', 'bakery', 'convenience', 'convenience;gas', 'greengrocer', 'supermarket', 'pastry')
           OR (shop='sports' AND (tags->'service:bicycle:retail'='yes' OR tags->'service:bicycle:repair'='yes' OR tags->'service:bicycle:rental'='yes' OR tags->'service:bicycle:pump'='yes' OR tags->'service:bicycle:diy'='yes'))
           OR leisure='picnic_table'
           OR (
@@ -832,7 +832,7 @@ Layer:
                 -- Supermarkets
                 WHEN shop='supermarket' THEN 40
                 -- Convenience
-                WHEN shop='convenience' THEN 50
+                WHEN shop='convenience' OR shop='convenience;gas' THEN 50
                 -- Food
                 WHEN shop IS NOT NULL OR amenity IN ('bar', 'biergarten', 'cafe', 'fast_food', 'food_court', 'pub', 'restaurant') THEN 60
                 -- Everything else
@@ -886,10 +886,10 @@ Layer:
             tags->'shelter' AS shelter,
             way,
             name,
-            COALESCE(
+            COALESCE( -- order is important here
               'aeroway_' || aeroway,
               'tourism_' || tourism,
-              'amenity_' || amenity,
+              'amenity_' || CASE WHEN amenity != 'fuel' THEN amenity ELSE NULL END,
               'shop_' || shop,
               'emergency_' || CASE WHEN tags->'emergency' IS NOT NULL then tags->'emergency' ELSE NULL END,
               'healthcare_' || CASE WHEN tags->'healthcare' IN ('clinic', 'hospital') THEN tags->'healthcare' ELSE NULL END,
@@ -938,7 +938,7 @@ Layer:
             OR amenity IN ('bar', 'bicycle_rental', 'bicycle_parking', 'bicycle_repair_station', 'biergarten', 'cafe', 'compressed_air', 'drinking_water', 'fast_food', 'food_court', 'fountain', 'hospital', 'ice_cream', 'internet_cafe', 'pharmacy', 'police', 'post_office', 'post_box', 'pub', 'public_bath', 'restaurant', 'shelter', 'shower', 'toilets')
             OR tags->'compressed_air'='yes'
             OR (amenity='motorcycle_parking' AND (bicycle IS NULL OR bicycle='yes' OR bicycle='designated'))
-            OR shop IN ('bicycle', 'bakery', 'convenience', 'greengrocer', 'supermarket', 'pastry')
+            OR shop IN ('bicycle', 'bakery', 'convenience', 'convenience;gas', 'greengrocer', 'supermarket', 'pastry')
             OR (shop='sports' AND (tags->'service:bicycle:retail'='yes' OR tags->'service:bicycle:repair'='yes' OR tags->'service:bicycle:rental'='yes' OR tags->'service:bicycle:pump'='yes' OR tags->'service:bicycle:diy'='yes'))
             OR tags->'healthcare' IN ('clinic', 'hospital')
             OR leisure='picnic_table'
@@ -966,7 +966,7 @@ Layer:
                 -- Supermarkets
                 WHEN shop='supermarket' THEN 40
                 -- Convenience
-                WHEN shop='convenience' THEN 50
+                WHEN shop='convenience' OR shop='convenience;gas' THEN 50
                 -- Food
                 WHEN shop IS NOT NULL OR amenity IN ('bar', 'biergarten', 'cafe', 'fast_food', 'food_court', 'pub', 'restaurant') THEN 60
                 -- Everything else
@@ -1008,10 +1008,10 @@ Layer:
             tags->'shelter' AS shelter,
             way,
             name,
-            COALESCE(
+            COALESCE( -- order is important here
               'aeroway_' || aeroway,
               'tourism_' || tourism,
-              'amenity_' || amenity,
+              'amenity_' || CASE WHEN amenity != 'fuel' THEN amenity ELSE NULL END,
               'shop_' || shop,
               'emergency_' || CASE WHEN tags->'emergency' IS NOT NULL then tags->'emergency' ELSE NULL END,
               'healthcare_' || CASE WHEN tags->'healthcare' IN ('clinic', 'hospital') THEN tags->'healthcare' ELSE NULL END,
@@ -1075,7 +1075,7 @@ Layer:
             OR amenity IN ('bar', 'bicycle_rental', 'bicycle_parking', 'bicycle_repair_station', 'biergarten', 'cafe', 'compressed_air', 'drinking_water', 'fast_food', 'food_court', 'fountain', 'hospital', 'ice_cream', 'internet_cafe', 'pharmacy', 'police', 'post_office', 'post_box', 'pub', 'public_bath', 'restaurant', 'shelter', 'shower', 'toilets')
             OR tags->'compressed_air'='yes'
             OR (amenity='motorcycle_parking' AND (bicycle IS NULL OR bicycle='yes' OR bicycle='designated'))
-            OR shop IN ('bicycle', 'bakery', 'convenience', 'greengrocer', 'supermarket', 'pastry')
+            OR shop IN ('bicycle', 'bakery', 'convenience', 'convenience;gas', 'greengrocer', 'supermarket', 'pastry')
             OR (shop='sports' AND (tags->'service:bicycle:retail'='yes' OR tags->'service:bicycle:repair'='yes' OR tags->'service:bicycle:rental'='yes' OR tags->'service:bicycle:pump'='yes' OR tags->'service:bicycle:diy'='yes'))
             OR tags->'healthcare' IN ('clinic', 'hospital')
             OR leisure='picnic_table'
@@ -1104,7 +1104,7 @@ Layer:
                 -- Supermarkets
                 WHEN shop='supermarket' THEN 40
                 -- Convenience
-                WHEN shop='convenience' THEN 50
+                WHEN shop='convenience' OR shop='convenience;gas' THEN 50
                 -- Food
                 WHEN shop IS NOT NULL OR amenity IN ('bar', 'biergarten', 'cafe', 'fast_food', 'food_court', 'pub', 'restaurant') THEN 60
                 -- Everything else
diff --git a/symbols/shop/convenience_air.svg b/symbols/shop/convenience_air.svg
new file mode 100644
index 00000000..f1699c5c
--- /dev/null
+++ b/symbols/shop/convenience_air.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <g
+     id="hbars"
+     transform="matrix(0.71910101,0,0,0.71910101,0.19970163,1.1948915)">
+    <rect
+       x="1"
+       y="6"
+       width="11"
+       height="0.5"
+       id="rect5" />
+    <rect
+       x="2"
+       y="8"
+       width="9.5"
+       height="0.5"
+       id="rect7" />
+  </g>
+  <g
+     id="vbars"
+     transform="matrix(0.71910101,0,0,0.71910101,0.19970163,1.1948915)">
+    <rect
+       x="3"
+       y="4.5"
+       width="0.5"
+       height="5.5"
+       id="rect10" />
+    <rect
+       x="5"
+       y="4.5"
+       width="0.5"
+       height="5.5"
+       id="rect12" />
+    <rect
+       x="7.5"
+       y="4.5"
+       width="0.5"
+       height="5.5"
+       id="rect14" />
+    <rect
+       x="9.5"
+       y="4.5"
+       width="0.5"
+       height="5.5"
+       id="rect16" />
+  </g>
+  <path
+     style="stroke-width:0.71910101"
+     id="handle"
+     d="M 4.4423975,4.0712955 5.8805996,1.9139925 A 0.36399938,0.36399938 0 0 1 6.5493635,2.2016329 L 5.3053188,4.0712955 Z" />
+  <path
+     id="body"
+     d="M 0.19970163,4.0712955 H 9.5480147 l -1.438202,5.033707 H 1.6379036 Z M 1.0985779,4.7903965 H 8.6491384 L 7.5704869,8.3859015 H 2.1772294 Z"
+     style="fill-rule:evenodd;stroke-width:0.71910101" />
+  <g
+     transform="matrix(0.497416,0,0,0.497416,7.6205923,7.1020759)"
+     id="g4767">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.96117997;stroke-linecap:round;stroke-opacity:1"
+       d="M 2.6341,12.848 H 6.6732"
+       id="path4741" />
+    <rect
+       x="3.3138001"
+       y="3.7993"
+       width="2.6798"
+       height="9.3210001"
+       rx="0.79680997"
+       ry="0.79680997"
+       style="color:#000000;clip-rule:evenodd;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#000000;fill-rule:evenodd;color-rendering:auto;image-rendering:auto;shape-rendering:auto;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="rect4743" />
+    <path
+       d="M 4.6537,3.9546 V 1.1583"
+       style="color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:none;stroke:#000000;stroke-width:0.96117997;stroke-linecap:round;color-rendering:auto;image-rendering:auto;shape-rendering:auto;stroke-opacity:1"
+       id="path4745" />
+    <path
+       d="M 2.6767,1.1195 H 6.6306"
+       style="color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:none;stroke:#000000;stroke-width:0.87879997;stroke-linecap:round;color-rendering:auto;image-rendering:auto;shape-rendering:auto;stroke-opacity:1"
+       id="path4747" />
+    <path
+       d="m 5.4226,10.441 c 0,0 0.52178,-2.0322 2.7188,-1.5654 2.197,0.46686 3.268,-0.54925 3.268,-0.54925"
+       style="color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:none;stroke:#000000;stroke-width:0.87879997;stroke-linecap:round;color-rendering:auto;image-rendering:auto;shape-rendering:auto;stroke-opacity:1"
+       id="path4749" />
+    <path
+       d="M 9.7616,8.6563 11.272,7.88735"
+       style="color:#000000;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:none;stroke:#000000;stroke-width:0.87879997;stroke-linecap:round;color-rendering:auto;image-rendering:auto;shape-rendering:auto;stroke-opacity:1"
+       id="path4751" />
+  </g>
+</svg>