diff --git a/artwork/styles/style-microg-normal-openmaptiles.json b/artwork/styles/style-microg-normal-openmaptiles.json
index 9eeaa216a3..ef11aa7d36 100644
--- a/artwork/styles/style-microg-normal-openmaptiles.json
+++ b/artwork/styles/style-microg-normal-openmaptiles.json
@@ -3353,7 +3353,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3402,6 +3404,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3475,7 +3478,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3517,6 +3522,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3669,7 +3675,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3718,6 +3726,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3791,7 +3800,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3833,6 +3844,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3984,7 +3996,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -4033,6 +4047,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -4128,7 +4143,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -4170,6 +4187,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -4321,7 +4339,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -4370,6 +4390,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -4465,7 +4486,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -4507,6 +4530,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
diff --git a/artwork/styles/style-microg-normal-stadia.json b/artwork/styles/style-microg-normal-stadia.json
index f75185a6c4..02dd3f032f 100644
--- a/artwork/styles/style-microg-normal-stadia.json
+++ b/artwork/styles/style-microg-normal-stadia.json
@@ -1288,16 +1288,32 @@
             "filter": [
                 "all",
                 [
-                    "match",
+                    "any",
                     [
-                        "get",
-                        "class"
+                        "match",
+                        [
+                            "get",
+                            "class"
+                        ],
+                        [
+                            "rail"
+                        ],
+                        true,
+                        false
                     ],
                     [
-                        "rail"
-                    ],
-                    true,
-                    false
+                        "match",
+                        [
+                            "get",
+                            "subclass"
+                        ],
+                        [
+                            "light_rail",
+                            "tram"
+                        ],
+                        true,
+                        false
+                    ]
                 ],
                 [
                     "match",
@@ -3507,7 +3523,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3556,6 +3574,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3629,7 +3648,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3671,6 +3692,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3823,7 +3845,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3872,6 +3896,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3945,7 +3970,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3987,6 +4014,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -4138,7 +4166,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -4187,6 +4217,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -4282,7 +4313,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -4324,6 +4357,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -4475,7 +4509,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -4524,6 +4560,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -4619,7 +4656,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -4661,6 +4700,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
diff --git a/artwork/styles/style-microg-satellite-stadia.json b/artwork/styles/style-microg-satellite-stadia.json
index 6585a97f9d..7f183c5146 100644
--- a/artwork/styles/style-microg-satellite-stadia.json
+++ b/artwork/styles/style-microg-satellite-stadia.json
@@ -392,16 +392,32 @@
             "filter": [
                 "all",
                 [
-                    "match",
+                    "any",
                     [
-                        "get",
-                        "class"
+                        "match",
+                        [
+                            "get",
+                            "class"
+                        ],
+                        [
+                            "rail"
+                        ],
+                        true,
+                        false
                     ],
                     [
-                        "rail"
-                    ],
-                    true,
-                    false
+                        "match",
+                        [
+                            "get",
+                            "subclass"
+                        ],
+                        [
+                            "light_rail",
+                            "tram"
+                        ],
+                        true,
+                        false
+                    ]
                 ],
                 [
                     "match",
@@ -2404,7 +2420,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -2453,6 +2471,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -2526,7 +2545,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -2568,6 +2589,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -2720,7 +2742,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -2769,6 +2793,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -2842,7 +2867,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -2884,6 +2911,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3035,7 +3063,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3084,6 +3114,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3179,7 +3210,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3221,6 +3254,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3372,7 +3406,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3421,6 +3457,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3516,7 +3553,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3558,6 +3597,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json b/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json
index f75185a6c4..02dd3f032f 100644
--- a/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json
+++ b/play-services-maps-core-mapbox/src/main/assets/style-microg-normal-stadia.json
@@ -1288,16 +1288,32 @@
             "filter": [
                 "all",
                 [
-                    "match",
+                    "any",
                     [
-                        "get",
-                        "class"
+                        "match",
+                        [
+                            "get",
+                            "class"
+                        ],
+                        [
+                            "rail"
+                        ],
+                        true,
+                        false
                     ],
                     [
-                        "rail"
-                    ],
-                    true,
-                    false
+                        "match",
+                        [
+                            "get",
+                            "subclass"
+                        ],
+                        [
+                            "light_rail",
+                            "tram"
+                        ],
+                        true,
+                        false
+                    ]
                 ],
                 [
                     "match",
@@ -3507,7 +3523,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3556,6 +3574,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3629,7 +3648,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3671,6 +3692,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3823,7 +3845,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3872,6 +3896,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3945,7 +3970,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3987,6 +4014,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -4138,7 +4166,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -4187,6 +4217,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -4282,7 +4313,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -4324,6 +4357,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -4475,7 +4509,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -4524,6 +4560,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -4619,7 +4656,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -4661,6 +4700,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
diff --git a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json b/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json
index 6585a97f9d..7f183c5146 100644
--- a/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json
+++ b/play-services-maps-core-mapbox/src/main/assets/style-microg-satellite-stadia.json
@@ -392,16 +392,32 @@
             "filter": [
                 "all",
                 [
-                    "match",
+                    "any",
                     [
-                        "get",
-                        "class"
+                        "match",
+                        [
+                            "get",
+                            "class"
+                        ],
+                        [
+                            "rail"
+                        ],
+                        true,
+                        false
                     ],
                     [
-                        "rail"
-                    ],
-                    true,
-                    false
+                        "match",
+                        [
+                            "get",
+                            "subclass"
+                        ],
+                        [
+                            "light_rail",
+                            "tram"
+                        ],
+                        true,
+                        false
+                    ]
                 ],
                 [
                     "match",
@@ -2404,7 +2420,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -2453,6 +2471,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -2526,7 +2545,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -2568,6 +2589,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -2720,7 +2742,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -2769,6 +2793,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -2842,7 +2867,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -2884,6 +2911,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3035,7 +3063,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3084,6 +3114,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3179,7 +3210,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3221,6 +3254,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",
@@ -3372,7 +3406,9 @@
                     "poi_generic_green",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "poi_generic_purple",
@@ -3421,6 +3457,7 @@
                             ]
                         ],
                         [
+                            "clothing_store",
                             "shop"
                         ],
                         "poi_generic_blue",
@@ -3516,7 +3553,9 @@
                     "hsl(117, 53%, 31%)",
                     [
                         "bank",
+                        "atm",
                         "parking",
+                        "toilets",
                         "garages"
                     ],
                     "#737b9b",
@@ -3558,6 +3597,7 @@
                         "#df7db1",
                         [
                             "grocery",
+                            "clothing_store",
                             "shop"
                         ],
                         "hsl(213, 40%, 48%)",