diff --git a/layers/place-suburb.yml b/layers/place-suburb.yml
index 910c154..9b05a22 100644
--- a/layers/place-suburb.yml
+++ b/layers/place-suburb.yml
@@ -25,6 +25,14 @@ layout:
     - 16
   text-field: ['upcase', ['get', 'name']]
   text-letter-spacing: 0.2
+  text-padding:
+    - interpolate
+    - - linear
+    - - zoom
+    - 11
+    - 20
+    - 15
+    - 0
   visibility: visible
 paint:
   text-color: '#888888'
diff --git a/layers/poi-z12.yml b/layers/poi-z12.yml
new file mode 100644
index 0000000..afb6dff
--- /dev/null
+++ b/layers/poi-z12.yml
@@ -0,0 +1,49 @@
+id: poi-z12
+type: symbol
+source: geolonia
+source-layer: poi
+minzoom: 12
+filter:
+  - all
+  - - '=='
+    - $type
+    - Point
+  - - has
+    - name
+  - - 'in'
+    - class
+    - college
+    - stadium
+    - landmark
+    - town_hall
+    - hospital
+  - - '!in'
+    - subclass
+    - community_centre # class town_hall内でも
+  - - '!='
+    - disputed
+    - japan_northern_territories
+layout:
+  text-padding: 2
+  text-font:
+    - Noto Sans Universal Regular
+  text-anchor: top
+  icon-anchor: bottom
+  icon-image:
+    - coalesce
+    - - image
+      - - get
+        - class
+    - - image
+      - circle-stroked
+  text-field: '{name}'
+  text-offset:
+    - 0
+    - 0.3
+  text-size: 12
+  text-max-width: 9
+paint:
+  text-halo-blur: 0.5
+  text-color: '#666'
+  text-halo-width: 1
+  text-halo-color: '#ffffff'
diff --git a/style.yml b/style.yml
index 2363e82..d139e8f 100644
--- a/style.yml
+++ b/style.yml
@@ -146,7 +146,7 @@ layers:
   - !!inc/file layers/poi-z16-primary.yml
   - !!inc/file layers/poi-z15.yml
   - !!inc/file layers/poi-z14.yml
-  - !!inc/file layers/poi-z11.yml
+  - !!inc/file layers/poi-z12.yml
   - !!inc/file layers/poi-railway.yml
   - !!inc/file layers/poi-airport-primary.yml
   - !!inc/file layers/road_shield_prefectural.yml