diff --git a/amenity-points.mss b/amenity-points.mss
index 0042a99d68..e9976b6778 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1729,11 +1729,11 @@
   }
 
   [feature = 'tourism_attraction'][zoom >= 17] {
-    marker-file: url('symbols/circle1.svg');
+    marker-file: url('symbols/square.svg');
     marker-fill: @tourism;
     marker-placement: interior;
     marker-clip: false;
-    marker-width: 6;
+    marker-width: 3;
   }
 
   // waste_disposal tagging on nodes - tagging on ways is defined earlier
@@ -3235,7 +3235,7 @@
     text-size: @standard-font-size;
     text-wrap-width: @standard-wrap-width;
     text-line-spacing: @standard-line-spacing-size;
-    text-dy: 6;
+    text-dy: 4;
     text-fill: @tourism;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
diff --git a/symbols/circle1.svg b/symbols/circle1.svg
deleted file mode 100644
index 93d8c5f320..0000000000
--- a/symbols/circle1.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   height="5.9999456"
-   width="6.0001445"
-   id="svg6"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <g
-     transform="matrix(0.58537995,0,0,0.58535991,0.95124242,-610.96191)"
-     id="layer1">
-    <path
-       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4333"
-       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
-       transform="matrix(1.1666667,0,0,1.1666667,0,1033.6955)" />
-    <path
-       style="display:inline;fill:none;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4327-3"
-       d="m 6.875,1048.8622 a 3.375,3.3750069 0 1 1 -6.75,0 3.375,3.3750069 0 1 1 6.75,0 z" />
-    <path
-       style="display:inline;fill:none;stroke:#660033;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4327"
-       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
-       transform="matrix(1.125,0,0,1.1250023,0.125,1034.2372)" />
-    <path
-       transform="translate(-1.625,1043.7372)"
-       id="path860"
-       d="M 4.6837917,9.3166409 C 4.2959821,9.2695823 3.813548,9.1446351 3.4994295,9.0098991 2.1161506,8.4165645 1.1853335,7.2108185 0.95350422,5.712002 c -0.0436691,-0.2823283 -0.0436691,-0.8951316 0,-1.17746 C 1.1204352,3.4553042 1.6314902,2.5551731 2.4783904,1.8487305 2.8865687,1.5082482 3.5214869,1.189143 4.0741973,1.0466899 4.6292786,0.90362556 5.3412695,0.87981473 5.8986314,0.98567602 6.7197348,1.1416305 7.489991,1.5436017 8.0721749,2.1199764 8.7382184,2.7793738 9.149308,3.5886862 9.2939049,4.5251971 9.3398752,4.8229323 9.3397477,5.4250584 9.2936507,5.721347 9.2193769,6.1987528 9.0965469,6.59082 8.8954902,6.9922562 8.2852787,8.2106226 7.1929341,9.0283349 5.846645,9.2745742 c -0.1757469,0.032144 -0.3057905,0.041041 -0.6582285,0.045032 -0.2415662,0.00273 -0.4686478,0.0014 -0.5046258,-0.00296 z M 5.5961568,7.6181801 C 6.5775028,7.430292 7.3436521,6.6974308 7.5954224,5.7057796 7.6424737,5.5204583 7.6459956,5.479423 7.6454159,5.123272 7.6448683,4.7872741 7.6394548,4.7182832 7.601414,4.5625768 7.4598671,3.9832027 7.1415619,3.4820743 6.6931928,3.1327051 5.3987787,2.1240977 3.5377332,2.5652283 2.8314172,4.0480763 c -0.1775929,0.3728408 -0.2494915,0.7270199 -0.2353385,1.1593 0.00987,0.3014608 0.037656,0.4609999 0.1264519,0.726037 0.3076878,0.9183868 1.1302042,1.591439 2.0921169,1.7119465 0.187748,0.023521 0.5897151,0.00954 0.7815093,-0.02718 z"
-       style="opacity:0;fill:#000000;stroke:none;stroke-width:0.01868984" />
-    <path
-       transform="translate(-1.625,1043.7372)"
-       id="path862"
-       d="M 4.6837917,9.3166409 C 4.2959821,9.2695823 3.813548,9.1446351 3.4994295,9.0098991 2.1161506,8.4165645 1.1853335,7.2108185 0.95350422,5.712002 c -0.0436691,-0.2823283 -0.0436691,-0.8951316 0,-1.17746 C 1.1204352,3.4553042 1.6314902,2.5551731 2.4783904,1.8487305 2.8865687,1.5082482 3.5214869,1.189143 4.0741973,1.0466899 4.6292786,0.90362556 5.3412695,0.87981473 5.8986314,0.98567602 6.7197348,1.1416305 7.489991,1.5436017 8.0721749,2.1199764 8.7382184,2.7793738 9.149308,3.5886862 9.2939049,4.5251971 9.3398752,4.8229323 9.3397477,5.4250584 9.2936507,5.721347 9.2193769,6.1987528 9.0965469,6.59082 8.8954902,6.9922562 8.2852787,8.2106226 7.1929341,9.0283349 5.846645,9.2745742 c -0.1757469,0.032144 -0.3057905,0.041041 -0.6582285,0.045032 -0.2415662,0.00273 -0.4686478,0.0014 -0.5046258,-0.00296 z M 5.5961568,7.6181801 C 6.5775028,7.430292 7.3436521,6.6974308 7.5954224,5.7057796 7.6424737,5.5204583 7.6459956,5.479423 7.6454159,5.123272 7.6448683,4.7872741 7.6394548,4.7182832 7.601414,4.5625768 7.4598671,3.9832027 7.1415619,3.4820743 6.6931928,3.1327051 5.3987787,2.1240977 3.5377332,2.5652283 2.8314172,4.0480763 c -0.1775929,0.3728408 -0.2494915,0.7270199 -0.2353385,1.1593 0.00987,0.3014608 0.037656,0.4609999 0.1264519,0.726037 0.3076878,0.9183868 1.1302042,1.591439 2.0921169,1.7119465 0.187748,0.023521 0.5897151,0.00954 0.7815093,-0.02718 z"
-       style="opacity:0;fill:#800050;stroke:none;stroke-width:0.01868984;image-rendering:auto" />
-    <path
-       transform="translate(-1.625,1043.7372)"
-       id="path866"
-       d="M 4.6519039,9.3104623 C 3.3997087,9.1592151 2.3190243,8.5000145 1.6279554,7.465901 1.2538165,6.9060405 1.0419914,6.339945 0.94121316,5.6306056 0.90574337,5.3809472 0.91455621,4.7960478 0.9580397,4.5138456 1.1719299,3.1257267 2.0305914,1.9501704 3.2723295,1.3454517 3.8539944,1.0621845 4.3523216,0.94177953 5.009,0.9258403 5.5597346,0.91247258 5.9419028,0.96378044 6.4111058,1.1140796 7.7701592,1.5494231 8.8292926,2.6644449 9.1943613,4.0442018 9.2941129,4.4212074 9.3291589,4.700402 9.3293812,5.1198394 9.3296322,5.592085 9.2830632,5.9198873 9.1559738,6.340484 8.8175896,7.4603515 8.0382384,8.3812406 6.9948627,8.8940734 6.8520213,8.9642818 6.6574128,9.0503363 6.5623996,9.0853058 6.3519339,9.1627671 5.9848245,9.2554017 5.7395899,9.2929293 5.4889036,9.3312913 4.9025966,9.3407422 4.6519039,9.3104623 Z M 5.5145065,7.6311716 C 6.5547478,7.4731884 7.3853026,6.6791544 7.6127298,5.6252107 7.6671731,5.3729085 7.6672225,4.8685489 7.6128337,4.6217809 7.4973302,4.0978136 7.285009,3.7092628 6.9099713,3.3355435 6.5235952,2.9505257 6.1004277,2.7269703 5.5664488,2.6257735 5.3408596,2.583021 4.9090184,2.583021 4.6834293,2.6257735 4.1513655,2.7266074 3.7248972,2.9519065 3.3399068,3.3355435 2.964869,3.7092628 2.7525479,4.0978136 2.6370505,4.6217809 c -0.054395,0.246768 -0.054346,0.7511276 1.038e-4,1.0034298 0.2286489,1.0596056 1.0743448,1.8606133 2.1241945,2.011948 0.1683522,0.024268 0.5752481,0.021033 0.7531637,-0.00599 z"
-       style="opacity:0;fill:#800050;stroke:none;stroke-width:0.01731411" />
-    <path
-       transform="translate(-1.625,1043.7372)"
-       id="path868"
-       d="M 4.6519039,9.3104623 C 3.3997087,9.1592151 2.3190243,8.5000145 1.6279554,7.465901 1.2538165,6.9060405 1.0419914,6.339945 0.94121316,5.6306056 0.90574337,5.3809472 0.91455621,4.7960478 0.9580397,4.5138456 1.1719299,3.1257267 2.0305914,1.9501704 3.2723295,1.3454517 3.8539944,1.0621845 4.3523216,0.94177953 5.009,0.9258403 5.5597346,0.91247258 5.9419028,0.96378044 6.4111058,1.1140796 7.7701592,1.5494231 8.8292926,2.6644449 9.1943613,4.0442018 9.2941129,4.4212074 9.3291589,4.700402 9.3293812,5.1198394 9.3296322,5.592085 9.2830632,5.9198873 9.1559738,6.340484 8.8175896,7.4603515 8.0382384,8.3812406 6.9948627,8.8940734 6.8520213,8.9642818 6.6574128,9.0503363 6.5623996,9.0853058 6.3519339,9.1627671 5.9848245,9.2554017 5.7395899,9.2929293 5.4889036,9.3312913 4.9025966,9.3407422 4.6519039,9.3104623 Z M 5.5145065,7.6311716 C 6.5547478,7.4731884 7.3853026,6.6791544 7.6127298,5.6252107 7.6671731,5.3729085 7.6672225,4.8685489 7.6128337,4.6217809 7.4973302,4.0978136 7.285009,3.7092628 6.9099713,3.3355435 6.5235952,2.9505257 6.1004277,2.7269703 5.5664488,2.6257735 5.3408596,2.583021 4.9090184,2.583021 4.6834293,2.6257735 4.1513655,2.7266074 3.7248972,2.9519065 3.3399068,3.3355435 2.964869,3.7092628 2.7525479,4.0978136 2.6370505,4.6217809 c -0.054395,0.246768 -0.054346,0.7511276 1.038e-4,1.0034298 0.2286489,1.0596056 1.0743448,1.8606133 2.1241945,2.011948 0.1683522,0.024268 0.5752481,0.021033 0.7531637,-0.00599 z"
-       style="opacity:0;fill:#800050;stroke:none;stroke-width:0.01731411" />
-    <path
-       transform="translate(-1.625,1043.7372)"
-       id="path870"
-       d="M 4.6519039,9.3104623 C 3.3997087,9.1592151 2.3190243,8.5000145 1.6279554,7.465901 1.2538165,6.9060405 1.0419914,6.339945 0.94121316,5.6306056 0.90574337,5.3809472 0.91455621,4.7960478 0.9580397,4.5138456 1.1719299,3.1257267 2.0305914,1.9501704 3.2723295,1.3454517 3.8539944,1.0621845 4.3523216,0.94177953 5.009,0.9258403 5.5597346,0.91247258 5.9419028,0.96378044 6.4111058,1.1140796 7.7701592,1.5494231 8.8292926,2.6644449 9.1943613,4.0442018 9.2941129,4.4212074 9.3291589,4.700402 9.3293812,5.1198394 9.3296322,5.592085 9.2830632,5.9198873 9.1559738,6.340484 8.8175896,7.4603515 8.0382384,8.3812406 6.9948627,8.8940734 6.8520213,8.9642818 6.6574128,9.0503363 6.5623996,9.0853058 6.3519339,9.1627671 5.9848245,9.2554017 5.7395899,9.2929293 5.4889036,9.3312913 4.9025966,9.3407422 4.6519039,9.3104623 Z M 5.5145065,7.6311716 C 6.5547478,7.4731884 7.3853026,6.6791544 7.6127298,5.6252107 7.6671731,5.3729085 7.6672225,4.8685489 7.6128337,4.6217809 7.4973302,4.0978136 7.285009,3.7092628 6.9099713,3.3355435 6.5235952,2.9505257 6.1004277,2.7269703 5.5664488,2.6257735 5.3408596,2.583021 4.9090184,2.583021 4.6834293,2.6257735 4.1513655,2.7266074 3.7248972,2.9519065 3.3399068,3.3355435 2.964869,3.7092628 2.7525479,4.0978136 2.6370505,4.6217809 c -0.054395,0.246768 -0.054346,0.7511276 1.038e-4,1.0034298 0.2286489,1.0596056 1.0743448,1.8606133 2.1241945,2.011948 0.1683522,0.024268 0.5752481,0.021033 0.7531637,-0.00599 z"
-       style="opacity:0;fill:#800050;stroke:none;stroke-width:0.01731411" />
-    <path
-       transform="translate(-1.625,1043.7372)"
-       id="path872"
-       d="M 4.6519039,9.3104623 C 3.3997087,9.1592151 2.3190243,8.5000145 1.6279554,7.465901 1.2538165,6.9060405 1.0419914,6.339945 0.94121316,5.6306056 0.90574337,5.3809472 0.91455621,4.7960478 0.9580397,4.5138456 1.1719299,3.1257267 2.0305914,1.9501704 3.2723295,1.3454517 3.8539944,1.0621845 4.3523216,0.94177953 5.009,0.9258403 5.5597346,0.91247258 5.9419028,0.96378044 6.4111058,1.1140796 7.7701592,1.5494231 8.8292926,2.6644449 9.1943613,4.0442018 9.2941129,4.4212074 9.3291589,4.700402 9.3293812,5.1198394 9.3296322,5.592085 9.2830632,5.9198873 9.1559738,6.340484 8.8175896,7.4603515 8.0382384,8.3812406 6.9948627,8.8940734 6.8520213,8.9642818 6.6574128,9.0503363 6.5623996,9.0853058 6.3519339,9.1627671 5.9848245,9.2554017 5.7395899,9.2929293 5.4889036,9.3312913 4.9025966,9.3407422 4.6519039,9.3104623 Z M 5.5145065,7.6311716 C 6.5547478,7.4731884 7.3853026,6.6791544 7.6127298,5.6252107 7.6671731,5.3729085 7.6672225,4.8685489 7.6128337,4.6217809 7.4973302,4.0978136 7.285009,3.7092628 6.9099713,3.3355435 6.5235952,2.9505257 6.1004277,2.7269703 5.5664488,2.6257735 5.3408596,2.583021 4.9090184,2.583021 4.6834293,2.6257735 4.1513655,2.7266074 3.7248972,2.9519065 3.3399068,3.3355435 2.964869,3.7092628 2.7525479,4.0978136 2.6370505,4.6217809 c -0.054395,0.246768 -0.054346,0.7511276 1.038e-4,1.0034298 0.2286489,1.0596056 1.0743448,1.8606133 2.1241945,2.011948 0.1683522,0.024268 0.5752481,0.021033 0.7531637,-0.00599 z"
-       style="opacity:0;fill:#800050;stroke:none;stroke-width:0.01731411" />
-  </g>
-</svg>