diff --git a/doc/grid.png b/doc/grid.png
index 0b9bd22..54fe888 100644
Binary files a/doc/grid.png and b/doc/grid.png differ
diff --git a/icons/config.json b/icons/config.json
index 74de8aa..ec4ac86 100644
--- a/icons/config.json
+++ b/icons/config.json
@@ -197,6 +197,9 @@
     "emoji": "☕",
     "name": "coffee cup"
   },
+  "comb_and_scissors": {
+    "name": "comb and scissors"
+  },
   "contrclockwise": {},
   "credit_card": {
     "emoji": "💳",
@@ -373,10 +376,20 @@
   "japan_castle": {
     "name": "Japanese map symbol for castle"
   },
+  "japan_court": {
+    "name": "Japanese map symbol for court house or building"
+  },
   "japan_elementary_school": {},
+  "japan_fire_station": {},
+  "japan_forest_service": {
+    "name": "Japanese map symbol for forest service office"
+  },
   "japan_historic": {
     "name": "Japanese map symbol for place of historic, cultural, or scenic interest"
   },
+  "japan_koban": {
+    "name": "Japanese map symbol for kōban"
+  },
   "japan_post": {
     "name": "Japanese map symbol for post office"
   },
diff --git a/icons/icons.svg b/icons/icons.svg
index 700c9e2..b9d00f9 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -148,8 +148,8 @@
      showgrid="false"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="494.46607"
-     inkscape:cx="153.51219"
+     inkscape:cy="454.46607"
+     inkscape:cx="333.51219"
      inkscape:zoom="2"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -21450,9 +21450,13 @@
        id="arrow_left"
        inkscape:label="#path7341" />
     <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 410.50195 82.992188 A 0.50005 0.50005 0 0 0 410.21875 83.080078 A 0.50005 0.50005 0 0 0 410.20312 83.091797 A 0.50005 0.50005 0 0 0 410.16797 83.121094 A 0.50005 0.50005 0 0 0 410.16016 83.125 A 0.50005 0.50005 0 0 0 410.13086 83.15625 A 0.50005 0.50005 0 0 0 410.12891 83.158203 A 0.50005 0.50005 0 0 0 410.12305 83.166016 A 0.50005 0.50005 0 0 0 410.10938 83.181641 A 0.50005 0.50005 0 0 0 410.09766 83.197266 A 0.50005 0.50005 0 0 0 410.07227 83.234375 A 0.50005 0.50005 0 0 0 410.07031 83.238281 A 0.50005 0.50005 0 0 0 410.05664 83.265625 A 0.50005 0.50005 0 0 0 410.04688 83.283203 A 0.50005 0.50005 0 0 0 410.03516 83.310547 A 0.50005 0.50005 0 0 0 410.01367 83.376953 A 0.50005 0.50005 0 0 0 410.00781 83.40625 A 0.50005 0.50005 0 0 0 410 83.476562 L 409.18555 90.400391 C 408.85236 90.152184 408.44425 90 408 90 C 406.90135 90 406 90.901353 406 92 C 406 92.893632 406.60026 93.64671 407.41406 93.900391 L 407.16211 94.132812 A 0.50005 0.50005 0 1 0 407.83789 94.867188 L 409.33203 93.492188 A 0.50005 0.50005 0 0 0 409.39062 93.429688 C 409.74124 93.088537 409.96295 92.621058 409.99023 92.103516 A 0.50005 0.50005 0 0 0 409.99609 92.058594 L 410.23828 90 L 410.76172 90 L 411.00391 92.058594 A 0.50005 0.50005 0 0 0 411.01172 92.115234 C 411.07308 93.160059 411.94068 94 413 94 C 414.09865 94 415 93.098647 415 92 C 415 90.901353 414.09865 90 413 90 C 412.55575 90 412.14764 90.152184 411.81445 90.400391 L 411 83.474609 A 0.50005 0.50005 0 0 0 410.50195 82.992188 z M 404.5 83 A 0.50005 0.50005 0 0 0 404.38477 83.011719 C 403.1123 83.071481 402.08737 84.088482 402.01367 85.357422 A 0.50005 0.50005 0 0 0 402.01367 85.359375 A 0.50005 0.50005 0 0 0 402 85.582031 L 402 87.419922 A 0.50005 0.50005 0 0 0 402 87.582031 L 402 89.419922 A 0.50005 0.50005 0 0 0 402 89.582031 L 402 93.5 A 0.50005 0.50005 0 1 0 403 93.5 L 403 90 L 405.5 90 A 0.50005 0.50005 0 1 0 405.5 89 L 403 89 L 403 88 L 405.5 88 A 0.50005 0.50005 0 1 0 405.5 87 L 403 87 L 403 86 L 405.5 86 A 0.50005 0.50005 0 1 0 405.5 85 L 403.08984 85 C 403.29449 84.416197 403.84232 84 404.5 84 L 405.5 84 A 0.50005 0.50005 0 1 0 405.5 83 L 404.53516 83 A 0.50005 0.50005 0 0 0 404.5 83 z M 408 91 C 408.55474 91 408.9926 91.436951 408.99805 91.990234 A 0.50005 0.50005 0 0 0 408.99805 92.009766 C 408.9926 92.563049 408.55474 93 408 93 C 407.44179 93 407 92.558207 407 92 C 407 91.441793 407.44179 91 408 91 z M 413 91 C 413.55821 91 414 91.441793 414 92 C 414 92.558207 413.55821 93 413 93 C 412.44526 93 412.0074 92.561096 412.00195 92.007812 A 0.50005 0.50005 0 0 0 412 91.994141 C 412.00316 91.438774 412.44379 91 413 91 z "
-       id="circle7365" />
+       id="comb_and_scissors"
+       inkscape:label="#circle7365">
+      <title
+         id="title8240">comb and scissors</title>
+    </path>
     <circle
        style="opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path7412"
diff --git a/scheme/default.yml b/scheme/default.yml
index 50b1247..41d403a 100644
--- a/scheme/default.yml
+++ b/scheme/default.yml
@@ -371,6 +371,8 @@ node_icons:
       shapes: [milk]
     - tags: {shop: fireplace}
       shapes: [{shape: fireplace, color: sell_color}]
+    - tags: {shop: hairdresser}
+      shapes: [comb_and_scissors]
     - tags: {shop: hifi}
       shapes: [{shape: hifi, color: sell_color}]
     - tags: {shop: houseware}