diff --git a/src/layer/poi.js b/src/layer/poi.js
index 885c12d30..1352e90d3 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -345,7 +345,7 @@ export const poi = {
         "parking",
         "police",
         "school",
-        "college",
+        ...getSubclasses(iconDefs.college),
         "library",
         "townhall",
         ...getSubclasses(iconDefs.post_office),
@@ -368,9 +368,15 @@ export const poi = {
     [
       "match",
       ["get", "subclass"],
-      ["station", "halt"],
+      [
+      ...getSubclasses(iconDefs.college),
+      ],
+      10,
+      [
+        "station",
+        "halt"],
       12,
-      ["bus_station", "subway", ...getSubclasses(iconDefs.college)],
+      ["bus_station", "subway"],
       14,
       [
         "bus_stop",