diff --git a/layers/mountain_peak/style.json b/layers/mountain_peak/style.json
index f47736d8..befc0f0c 100644
--- a/layers/mountain_peak/style.json
+++ b/layers/mountain_peak/style.json
@@ -6,6 +6,15 @@
       "source": "openmaptiles",
       "source-layer": "mountain_peak",
       "maxzoom": 16,
+      "filter": [
+        "all",
+        [
+          "!in",
+          "class",
+          "cliff",
+          "volcano"
+        ]
+      ],
       "layout": {
         "text-size": 10,
         "icon-image": "peak",
@@ -38,15 +47,55 @@
         "text-halo-color": "rgba(255, 255, 255, .8)",
         "text-halo-width": 1
       },
+      "order": 197
+    },
+    {
+      "id": "mountain_peak_volcano",
+      "type": "symbol",
+      "source": "openmaptiles",
+      "source-layer": "mountain_peak",
+      "maxzoom": 16,
       "filter": [
         "all",
         [
-          "!=",
+          "==",
           "class",
-          "cliff"
+          "volcano"
         ]
       ],
-      "order": 197
+      "layout": {
+        "text-size": 10,
+        "icon-image": "volcano",
+        "text-field": {
+          "stops": [
+            [
+              6,
+              " "
+            ],
+            [
+              12,
+              "{name} {ele}m"
+            ]
+          ]
+        },
+        "text-anchor": "top",
+        "text-offset": [
+          0,
+          0.5
+        ],
+        "text-max-width": 6,
+        "text-line-height": 1.1,
+        "text-font": [
+          "Noto Sans Regular",
+          "Noto Sans Italic"
+        ]
+      },
+      "paint": {
+        "text-color": "#d40000",
+        "text-halo-color": "rgba(255, 255, 255, .8)",
+        "text-halo-width": 1
+      },
+      "order": 198
     }
   ]
 }
\ No newline at end of file
diff --git a/layers/place/style.json b/layers/place/style.json
index c1564dc0..3ee5457d 100644
--- a/layers/place/style.json
+++ b/layers/place/style.json
@@ -129,7 +129,7 @@
           "village"
         ]
       ],
-      "order": 198
+      "order": 199
     },
     {
       "id": "place_town",
@@ -177,7 +177,7 @@
           "town"
         ]
       ],
-      "order": 199
+      "order": 200
     },
     {
       "id": "place_state",
@@ -228,7 +228,7 @@
           3
         ]
       ],
-      "order": 200
+      "order": 201
     },
     {
       "id": "place_city",
@@ -311,7 +311,7 @@
           1
         ]
       ],
-      "order": 201
+      "order": 202
     },
     {
       "id": "place_capital",
@@ -396,7 +396,7 @@
           2
         ]
       ],
-      "order": 202
+      "order": 203
     },
     {
       "id": "country_other",
@@ -449,7 +449,7 @@
           "iso_a2"
         ]
       ],
-      "order": 203
+      "order": 204
     },
     {
       "id": "country_3",
@@ -518,7 +518,7 @@
           "iso_a2"
         ]
       ],
-      "order": 204
+      "order": 205
     },
     {
       "id": "country_2",
@@ -587,7 +587,7 @@
           "iso_a2"
         ]
       ],
-      "order": 205
+      "order": 206
     },
     {
       "id": "country_1",
@@ -656,7 +656,7 @@
           "iso_a2"
         ]
       ],
-      "order": 206
+      "order": 207
     }
   ]
 }
\ No newline at end of file
diff --git a/style/icons/volcano.svg b/style/icons/volcano.svg
new file mode 100644
index 00000000..ca1a7212
--- /dev/null
+++ b/style/icons/volcano.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 1L0 8H8L4 1Z" fill="#D40000"/>
+</svg>