Index: images/svg/amenity/amenity_firestation.svg
===================================================================
--- images/svg/amenity/amenity_firestation.svg	(revision 15861)
+++ images/svg/amenity/amenity_firestation.svg	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -6,7 +6,6 @@
    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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
@@ -161,14 +160,6 @@
       </g>
     </g>
   </g>
-  <image
-     y="573.99469"
-     x="-1801.1931"
-     id="image3356"
-     height="190"
-     width="239"
-     sodipodi:absref="U:\svn.openstreetmap.org\applications\share\map-icons\svg-twotone\pastedpic_10102008_233747.png"
-     xlink:href="pastedpic_10102008_233747.png" />
   <path
      style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 170.84645,479.71764 C 134.26479,459.08465 111.96923,410.84242 128.43193,338.74121 C 139.98073,288.16121 173.63315,225.7375 147.84207,173.75941 C 179.12805,195.38395 211.6556,246.80618 244.46049,304.88437 C 246.72251,242.07667 214.13127,200.92511 237.55918,115.09824 C 253.63467,221.27702 318.11863,227.8581 350.85571,324.43808 C 364.7804,279.02904 393.74644,264.08309 379.61117,151.33015 C 521.95367,345.72774 440.82571,414.78419 412.39237,484.31853 L 421.59417,387.70014 C 376.95048,516.74999 341.18167,540.55802 308.87272,569.43472 C 326.92995,508.85654 334.05033,448.27833 297.3705,387.70014 C 288.46535,487.16243 263.33162,466.46438 258.26309,546.43034 C 208.00879,508.50069 197.68748,469.5924 188.67484,406.10364 C 181.83766,413.53277 170.29289,444.58439 170.84645,479.71764 z"
Index: images/svg/amenity/amenity_firestation2.svg
===================================================================
--- images/svg/amenity/amenity_firestation2.svg	(revision 15861)
+++ images/svg/amenity/amenity_firestation2.svg	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -6,7 +6,6 @@
    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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
@@ -161,14 +160,6 @@
       </g>
     </g>
   </g>
-  <image
-     y="573.99469"
-     x="-1801.1931"
-     id="image3356"
-     height="190"
-     width="239"
-     sodipodi:absref="U:\svn.openstreetmap.org\applications\share\map-icons\svg-twotone\pastedpic_10102008_233747.png"
-     xlink:href="pastedpic_10102008_233747.png" />
   <path
      style="fill:#ffffff"
      d="M 289.9375 4.84375 C 275.5532 4.811408 258.79554 9.2025283 246.78125 16.125 C 245.12495 17.079322 242.06189 18.802219 239.96875 19.96875 C 237.87554 21.135282 232.47189 24.277691 227.96875 26.9375 C 215.39214 34.365923 204.32209 39.745937 195.875 42.5625 C 179.05895 48.169582 164.10423 50.481359 145.59375 50.28125 C 129.82378 50.110766 122.59594 50.993751 116.96875 53.8125 C 112.95011 55.825499 110.6796 57.976504 109 61.375 C 107.69699 64.011451 107.56153 64.544331 107.40625 68.3125 C 107.22127 72.801546 107.67898 75.81366 108.90625 78.125 C 109.74226 79.699338 112.36514 83.044054 116.46875 87.8125 C 117.83059 89.394942 120.12848 92.125229 121.59375 93.875 C 123.05895 95.624759 126.08341 99.115221 128.28125 101.625 C 130.47909 104.13479 132.94398 106.99964 133.78125 108 C 135.5552 110.11952 143.01714 118.43319 146.375 122.03125 C 147.6506 123.39803 150.97442 127.07901 153.75 130.21875 C 156.80884 133.67892 159.90839 137.1378 163.0625 140.65625 C 168.42348 136.12477 174.0484 131.85522 179.875 127.90625 C 179.57836 127.56681 179.38505 127.36441 179.09375 127.03125 C 173.86765 121.05422 167.13367 113.32872 164.125 109.875 C 157.11705 101.83041 152.18284 96.188691 149.78125 93.5 C 148.73472 92.328295 146.48703 89.780505 144.8125 87.8125 C 143.13796 85.844495 140.98639 83.369976 140.03125 82.3125 C 139.07608 81.255021 137.88504 79.838468 137.375 79.1875 C 136.86495 78.53653 135.35771 76.771109 134.03125 75.25 C 131.95107 72.864606 131.69149 72.402274 132.15625 71.9375 C 132.78523 71.308536 137.09358 71.135266 158.34375 70.875 C 178.65164 70.626272 180.44199 70.369463 194.28125 65.8125 C 202.23139 63.194709 208.40933 60.451258 218.09375 55.21875 C 226.13259 50.875317 235.51026 45.76069 239.59375 43.46875 C 249.76199 37.76158 260.47057 32.580354 265.84375 30.78125 C 270.17054 29.332513 277.73757 27.284185 281.875 26.46875 C 287.42869 25.37418 297.30431 25.275504 302.5625 26.25 C 314.85166 28.527546 330.93041 34.80229 342.5625 41.84375 C 345.15972 43.416012 348.19841 45.156329 349.3125 45.71875 C 350.42651 46.281172 354.6937 48.648646 358.8125 50.96875 C 362.93137 53.288856 367.17222 55.644512 368.21875 56.21875 C 369.26535 56.792984 372.42422 58.558316 375.25 60.15625 C 386.7526 66.660832 398.87151 71.956019 409.78125 75.21875 C 417.68865 77.58358 421.87888 78.218521 432.53125 78.65625 C 450.46883 79.393323 458.22633 80.058895 458.75 80.90625 C 458.84524 81.060364 454.78161 85.378084 449.71875 90.5 C 441.09474 99.224638 422.63659 117.51545 407.59375 132.3125 C 413.56528 136.70219 419.2842 141.41985 424.71875 146.4375 C 430.50585 140.64159 436.18311 134.92621 443.1875 127.9375 C 466.8925 104.28557 479.88993 91.056824 480.75 89.6875 C 482.90429 86.257451 483.06219 85.622524 483.09375 79.53125 C 483.11736 74.961723 482.97316 73.483901 482.375 71.65625 C 481.46669 68.880969 479.02979 66.064014 476.375 64.71875 C 469.43914 61.20407 462.98894 59.872269 449.09375 59.0625 C 432.67351 58.105584 429.63457 57.799959 422.5 56.40625 C 411.61625 54.280139 400.82382 50.643899 389.15625 45.1875 C 384.60291 43.058112 382.63521 41.936301 369.40625 33.96875 C 364.56509 31.053016 358.82283 27.657917 356.625 26.40625 C 354.42723 25.154584 350.65709 22.946941 348.25 21.5 C 336.27809 14.303626 320.36743 7.9868128 309.6875 6.1875 C 304.84932 5.372371 297.40992 4.8605508 289.9375 4.84375 z M 80.40625 95.875 C 76.779581 95.784943 72.646878 96.306649 69.875 97.34375 C 63.000055 99.91598 60.301187 108.02832 59.375 129.09375 C 58.614286 146.39807 58.476911 147.48237 55.375 158.8125 C 52.612451 168.90318 49.753185 176.19138 43.59375 188.8125 C 39.012488 197.69408 34.209166 207.09194 28.1875 214.90625 C 28.1875 215.59993 25.315633 221.48363 24.375 222.71875 C 23.16456 224.30816 15.004088 240.22214 13.0625 244.78125 C 7.7670688 257.21586 5.082409 268.04897 4.1875 280.8125 C 3.356263 292.6679 4.784594 301.97826 9.78125 317.46875 C 11.812948 323.76746 16.399521 333.61075 25.40625 350.96875 C 38.327956 375.87162 41.615464 383.06644 45.4375 394.84375 C 50.685791 411.0157 51.718198 418.35392 51.5 437.75 C 51.40855 445.87725 51.522986 451.67049 51.78125 453.34375 C 53.555802 464.83928 59.514737 471.37664 68.8125 472.03125 C 71.611167 472.22831 71.898233 472.17607 74.5 470.90625 C 78.078222 469.15986 80.393233 467.65764 87.75 462.34375 C 93.472295 458.2104 96.529111 455.81258 104.03125 449.625 C 105.74354 448.21269 108.09876 446.34826 109.25 445.46875 C 110.40123 444.5893 112.63328 442.66336 114.21875 441.1875 C 115.80422 439.71158 119.19833 436.69782 121.78125 434.5 C 129.75125 427.71817 134.36926 423.73584 139.46875 419.21875 C 134.76385 413.64571 130.35607 407.79321 126.28125 401.71875 C 126.1664 401.82254 125.90332 402.07279 125.8125 402.15625 C 124.55098 403.31544 122.64028 404.95681 121.59375 405.78125 C 120.54715 406.60569 117.70697 408.99573 115.28125 411.09375 C 109.31879 416.25084 102.38208 422.17222 97.28125 426.4375 C 93.317719 429.75178 91.949471 430.93251 83.75 438 C 81.968896 439.53524 78.916789 442.09655 77 443.71875 C 75.083284 445.34095 73.443542 446.68749 73.34375 446.6875 C 72.669422 446.6875 72.503231 443.46945 72.46875 428.78125 C 72.443132 417.84513 72.300787 411.32235 72 409.5625 C 70.65194 401.67581 67.567318 391.54859 63.78125 382.5625 C 61.866247 378.01726 55.961795 366.40491 46.78125 349.0625 C 35.339267 327.44797 32.260604 320.70972 29 310.0625 C 23.491435 292.07443 23.408507 280.32239 28.625 263.4375 C 32.290872 251.5717 37.267815 241.15735 47.46875 224.03125 C 62.55836 198.69749 66.618697 190.9672 72.34375 176.75 C 78.492833 161.47993 78.866815 159.12101 80.21875 127.75 C 80.470981 121.89538 80.542234 121.47916 81.25 121.34375 C 81.832581 121.23229 90.158496 129.37518 117.125 156.5 C 122.95973 162.36897 128.16802 167.62735 132.90625 172.4375 C 137.23642 166.72362 141.89993 161.26783 146.8125 156.0625 C 146.37469 155.62039 146.07842 155.33343 145.625 154.875 C 126.15133 135.19563 107.07012 114.62287 85.96875 96.71875 C 84.576789 96.216171 82.582251 95.929034 80.40625 95.875 z M 505.65625 107.65625 C 503.36366 107.71429 501.97684 108.12561 500.75 108.9375 C 499.90975 109.49355 495.80285 113.04371 491.625 116.84375 C 487.44714 120.64379 482.97853 124.69102 481.6875 125.8125 C 480.39649 126.93398 476.28455 130.70404 472.53125 134.1875 C 459.19012 146.56967 454.10148 151.21175 450.03125 154.78125 C 447.76385 156.76975 444.76051 159.43162 443.375 160.6875 C 442.62382 161.36837 441.58839 162.27356 440.75 163.03125 C 445.53274 168.60322 450.00869 174.44723 454.15625 180.53125 C 455.48154 179.31131 457.01088 177.91912 457.96875 177.03125 C 460.67865 174.51945 464.63014 170.95325 466.75 169.09375 C 468.86987 167.23425 472.89296 163.54819 475.71875 160.90625 C 478.54452 158.26432 482.2317 154.89912 483.90625 153.4375 C 485.58079 151.9759 489.37064 148.56731 492.3125 145.84375 C 503.69938 135.30155 506.72003 132.72062 507.125 133.125 C 507.37895 133.37856 507.57994 139.49017 507.71875 150.3125 C 507.9925 171.6582 508.0575 172.08305 512.53125 186.375 C 515.83006 196.91352 517.27825 200.12142 531.21875 228.21875 C 543.1486 252.26345 544.32923 254.9345 549 268 C 554.51326 283.42181 556.0412 295.49768 553.96875 307.3125 C 552.74998 314.26096 552.19087 316.32829 549.96875 322.125 C 545.28532 334.34217 542.25954 340.17696 529.46875 361.625 C 525.59912 368.11381 521.49285 375.04275 520.34375 377.03125 C 519.1946 379.01975 517.66472 381.68159 516.9375 382.9375 C 513.16565 389.45135 505.70182 406.17283 504.125 411.65625 C 502.19793 418.35769 501.18772 424.81947 500.84375 432.78125 C 500.31709 444.9727 499.65272 455.50424 499.34375 456.5625 C 499.191 457.08579 498.8106 457.56471 498.5 457.625 C 497.51646 457.81593 497.55199 457.85013 480.46875 441.53125 C 475.86724 437.13562 465.52576 427.29627 457.46875 419.65625 C 453.71762 416.09928 451.27299 413.75809 448.375 411 C 444.1905 416.52497 439.72964 421.82442 435 426.875 C 440.25118 431.93759 445.73728 437.22811 447.40625 438.875 C 449.10312 440.54952 453.70902 445.01357 457.65625 448.78125 C 461.60339 452.54894 466.91327 457.60736 469.4375 460.03125 C 471.96182 462.45516 478.48174 468.62422 483.9375 473.75 C 495.37762 484.49815 494.70432 484.11293 501.65625 483.90625 C 505.66462 483.78709 506.20004 483.68017 508.53125 482.53125 C 510.20333 481.7072 511.7395 480.56959 513.03125 479.15625 C 517.64536 474.10762 519.37042 467.75206 520.25 452.78125 C 521.25059 435.75079 521.32676 435.18672 522.71875 429 C 526.55731 411.9394 533.1513 396.3486 545.1875 375.90625 C 552.04099 364.26629 555.60453 358.2418 557.46875 355.1875 C 560.14395 350.80458 564.41731 342.61059 565.9375 338.96875 C 570.25693 328.62038 570.79714 327.17487 572.375 320.875 C 576.8491 303.01125 576.46036 286.26096 571.1875 268.75 C 567.78399 257.44714 564.8796 250.80806 550.71875 221.75 C 541.6181 203.07555 542.05814 204.0719 538.375 194.375 C 533.57442 181.73612 531.07274 173.05245 529.34375 163.09375 C 528.65387 159.11999 528.488 156.13693 528.25 143.75 C 527.9828 129.84362 527.92941 128.8657 526.96875 124.53125 C 525.16971 116.41389 523.96998 113.60341 521.28125 111.125 C 519.12593 109.1383 516.88253 108.43047 510.9375 107.90625 C 508.74645 107.71305 507.0318 107.62143 505.65625 107.65625 z M 154.15625 434.84375 C 142.4194 446.9859 128.13826 461.62452 119.4375 470.375 C 99.588867 490.33706 97.683343 492.69567 96.65625 498.59375 C 95.656413 504.33533 96.757022 509.09683 99.9375 512.8125 C 104.44802 518.08209 111.62429 520.51422 124.28125 521.0625 C 144.85001 521.95355 147.90188 522.37308 160.0625 525.84375 C 175.00749 530.10904 191.92363 538.17419 212.9375 551.03125 C 214.82137 552.18386 217.40031 553.70555 218.65625 554.40625 C 219.91211 555.10701 222.98819 556.88191 225.5 558.375 C 243.00193 568.77901 257.3234 573.68905 273.84375 574.9375 C 276.98073 575.17456 279.61143 575.44976 279.71875 575.5625 C 280.08359 575.94562 295.11711 575.30374 298.75 574.75 C 310.44221 572.96784 320.44126 570.01756 329.96875 565.5 C 332.16659 564.45787 337.12762 562.10438 341 560.28125 C 344.8723 558.45814 351.63557 555.21882 356.03125 553.0625 C 365.06301 548.63181 375.16573 543.87036 377.15625 543.125 C 377.88889 542.85068 379.77392 542.09316 381.34375 541.4375 C 392.11535 536.9388 400.84983 534.32096 413.3125 531.8125 C 422.83606 529.89566 422.56949 529.89355 436.1875 529.96875 C 448.11377 530.03463 448.7799 530.01019 453.6875 529.0625 C 459.10708 528.01589 465.39206 526.17931 466.96875 525.1875 C 469.1534 523.81322 470.84825 521.04361 471.46875 517.84375 C 471.69193 516.69251 471.98752 513.62174 472.125 511 C 472.32377 507.20936 472.26237 505.95155 471.8125 504.875 C 471.2758 503.59041 463.66429 494.52346 458.25 488.71875 C 455.28549 485.54053 447.28175 476.57302 436.3125 464.1875 C 431.95606 459.26857 425.30577 451.90928 421.53125 447.84375 C 420.22313 446.43473 418.83284 444.92315 417.46875 443.4375 C 412.16321 447.87964 406.6313 452.0317 400.875 455.90625 C 403.65906 458.95723 405.98556 461.439 408.03125 463.59375 C 409.8274 465.48566 414.49714 470.63561 418.4375 475.03125 C 422.37787 479.42689 427.09476 484.55366 428.90625 486.4375 C 430.71774 488.32135 433.22554 491.06733 434.46875 492.53125 C 435.71203 493.9952 438.114 496.65707 439.8125 498.4375 C 443.89742 502.7195 447.95221 507.6222 447.71875 508 C 447.17124 508.88582 443.71867 509.11564 430.1875 509.09375 C 415.89017 509.07061 415.74759 509.06439 409.28125 510.1875 C 398.87015 511.99576 386.90659 515.47543 377.71875 519.375 C 375.83488 520.17455 364.63891 525.61921 352.8125 531.46875 C 323.77267 545.83237 324.97477 545.29853 312.375 549.46875 C 304.97794 551.91699 300.01548 553.14572 294 554.03125 C 290.41195 554.55942 287.23638 554.75884 282.40625 554.71875 C 275.23894 554.65927 275.41027 554.66916 269.5 553.78125 C 261.72486 552.61319 246.12628 546.95827 237.5 542.1875 C 234.07832 540.29512 222.1528 533.41232 221.6875 533.0625 C 220.90988 532.4779 199.64231 520.1211 194.6875 517.375 C 187.39783 513.33481 176.68311 508.71474 167.96875 505.84375 C 158.70442 502.79167 154.16056 502.19523 131.25 501.0625 C 126.29647 500.81755 122.04263 500.47405 121.78125 500.3125 C 121.43049 500.09572 121.56404 499.68787 122.34375 498.75 C 123.68317 497.13879 134.4895 485.89036 148.8125 471.1875 C 152.47556 467.42734 160.34721 459.29246 166.3125 453.125 C 167.78892 451.59853 168.9106 450.45082 170.5 448.8125 C 164.80526 444.44857 159.33916 439.78868 154.15625 434.84375 z "
Index: images/svg/amenity/amenity_firestation3.svg
===================================================================
--- images/svg/amenity/amenity_firestation3.svg	(revision 15861)
+++ images/svg/amenity/amenity_firestation3.svg	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -6,7 +6,6 @@
    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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
@@ -161,14 +160,6 @@
       </g>
     </g>
   </g>
-  <image
-     y="573.99469"
-     x="-1801.1931"
-     id="image3356"
-     height="190"
-     width="239"
-     sodipodi:absref="U:\svn.openstreetmap.org\applications\share\map-icons\svg-twotone\pastedpic_10102008_233747.png"
-     xlink:href="pastedpic_10102008_233747.png" />
   <path
      style="fill:#ffffff;stroke:#ffffff;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="M 287.4375,10.875 C 261.58172,10.946243 240.15321,27.260518 218.46875,39.28125 C 193.59987,52.297275 165.1794,57.898336 137.1875,56.3125 C 128.75724,56.634319 116.0449,56.653975 113.46875,66.71875 C 111.19742,77.136357 121.71486,83.470827 126.90392,90.828305 C 138.96278,104.9448 151.19351,118.75002 163.90625,132.21875 C 165.83057,129.5264 173.84037,127.72783 168.91527,124.36271 C 154.74259,107.46083 138.67234,91.921031 126.15625,73.75 C 125.05986,66.138377 134.24974,64.497262 139.93735,65.142239 C 161.60774,64.975833 184.39689,66.247739 204.03125,55.5625 C 232.97391,42.382339 259.65252,19.88777 292.96875,19.59375 C 324.95314,20.213361 351.24724,40.996848 378.5,55.15625 C 397.81535,66.079881 419.32499,73.990753 441.75,73.21875 C 449.08852,73.797683 458.35234,72.129408 463.6875,78.15625 C 466.71468,85.671238 457.7218,89.579157 454.02329,94.632964 C 441.6379,107.04057 429.19973,119.39212 416.75,131.71875 C 419.897,133.04425 423.06309,139.46979 425.86138,136.68952 C 442.82987,119.19338 461.30509,103.12373 476.6875,84.21875 C 479.10178,77.561909 476.10759,68.160959 467.96736,67.757464 C 449.02818,63.467005 429.03443,65.693688 410.3125,59.8125 C 374.7297,50.312722 347.43489,21.302596 311.5625,12.75 C 303.70164,11.072459 295.53769,10.724217 287.4375,10.875 z M 76.28125,101.90625 C 68.407575,101.7916 66.355706,111.16015 66.422802,117.3066 C 64.589082,135.81771 65.17839,155.13351 57.406807,172.37676 C 44.322621,208.86797 14.203953,238.5827 10.251833,278.27702 C 7.5648906,305.79594 21.371651,330.79416 33.940273,354.26034 C 48.100801,380.81005 60.309359,410.15876 57.4375,440.90625 C 57.038195,449.4556 57.125147,461.8093 66.25,465.59375 C 74.250126,467.77793 79.660245,459.64983 85.875,456.25 C 101.72575,444.51676 116.37269,431.52731 130.96875,418.3125 C 127.99636,415.86283 125.91057,407.35952 122.06471,413.19544 C 106.23229,426.23398 91.389989,440.67138 74.625,452.40625 C 67.254568,453.47015 65.679499,444.33702 66.5625,438.90625 C 67.083559,420.44021 66.747178,401.36878 58.09375,384.6875 C 44.268572,352.62319 20.411296,323.33684 18.875,287.125 C 18.793855,253.88027 40.101893,226.28219 55.34375,198.5 C 66.348664,179.41959 74.622574,158.26004 73.875,135.9375 C 74.527468,129.39462 72.452491,120.03207 78.96875,116.0625 C 86.814032,113.90112 90.627769,123.21777 96.09375,126.9375 C 108.35957,138.9399 119.98188,151.43505 132.5625,163.15625 C 135.40393,159.51143 141.27084,155.87038 134.87328,152.57957 C 117.64825,135.29962 101.46095,116.92922 82.125,102 C 80.182349,101.82761 78.228884,101.86444 76.28125,101.90625 z M 505.125,113.8125 C 497.38438,117.57051 492.81689,125.53708 485.71916,130.27792 C 473.5792,141.50205 461.17645,152.4357 449.25,163.875 C 452.10086,165.81612 454.085,174.15789 457.43079,169.54979 C 473.33516,155.61565 488.04557,139.90767 505.21875,127.4375 C 512.44594,125.79254 514.58161,134.78879 513.53125,140.125 C 513.07859,159.72827 514.01504,179.98017 523.24321,197.71896 C 536.97064,230.41375 559.59872,261.05117 560.84375,297.65625 C 559.96771,329.53409 539.02664,355.58335 524.1875,382.28125 C 513.45718,400.34541 505.52368,420.73189 506.375,442.125 C 505.64344,448.99061 507.5227,458.67631 500.8125,462.9375 C 493.16023,465.44798 488.67432,456.5064 483.51125,452.70851 C 472.03148,441.7607 460.54813,430.81666 449.0625,419.875 C 447.75703,422.89457 440.80824,426.02227 445.53125,428.625 C 463.45128,445.18629 479.65722,463.79332 499.21875,478.125 C 507.33374,479.49062 513.1395,471.30955 512.96875,463.875 C 515.53552,446.60711 514.217,428.44605 521.15625,412 C 532.10695,378.26473 558.35002,351.57236 567.21875,317.09375 C 572.82779,292.65731 566.96461,266.91456 555.28125,245.125 C 539.82314,212.62068 520.47739,179.21961 522.21875,141.875 C 521.78472,132.77885 522.93978,121.65989 515.9375,114.8125 C 512.55391,113.42856 508.68196,113.92032 505.125,113.8125 z M 149.375,448.40625 C 134.18968,465.61398 115.511,479.63504 102.625,498.71875 C 100.08194,507.02079 108.21821,514.63128 116.29832,514.1053 C 133.64971,516.37379 151.86541,515.05257 168.34375,522.0625 C 200.46594,532.45429 226.47687,556.9663 259.00406,566.48162 C 287.066,573.85509 317.13701,567.6697 341.78789,553.16351 C 372.38308,538.25714 404.57343,521.74495 439.65586,524.00322 C 448.1063,523.5783 458.22237,524.24589 464.8125,518.46875 C 467.94154,512.32058 466.12909,504.75518 460.58768,500.62096 C 446.55806,483.95882 431.23603,468.08767 416.96875,451.5625 C 415.52251,454.00289 406.66186,456.2199 411.5,458.46875 C 425.01656,474.12077 440.67892,488.60938 453,505.5 C 455.72555,512.42354 446.89814,515.99698 441.34375,515.09375 C 417.6677,513.40448 393.81363,517.47555 372.625,528.375 C 342.43741,542.46314 312.151,562.73181 277.3125,560.6875 C 242.30242,558.31093 215.02603,533.67581 184.65625,518.96875 C 168.3292,510.69941 150.23261,506.86606 132,507.0625 C 126.20296,507.05455 116.10962,507.49006 115.875,499.53125 C 117.05298,492.32845 124.91187,488.9873 128.76132,483.30859 C 139.70842,471.9923 150.61074,460.64137 161.5625,449.34375 C 158.06913,447.54081 154.64779,440.22346 151.6214,446.09009 C 150.8726,446.86214 150.1238,447.6342 149.375,448.40625 z"
Index: images/svg/amenity/amenity_police.svg
===================================================================
--- images/svg/amenity/amenity_police.svg	(revision 15861)
+++ images/svg/amenity/amenity_police.svg	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -6,7 +6,6 @@
    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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
@@ -140,14 +139,6 @@
       </g>
     </g>
   </g>
-  <image
-     y="573.99469"
-     x="-1801.1931"
-     id="image3356"
-     height="190"
-     width="239"
-     sodipodi:absref="U:\svn.openstreetmap.org\applications\share\map-icons\svg-twotone\pastedpic_10102008_233747.png"
-     xlink:href="pastedpic_10102008_233747.png" />
   <path
      style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      d="M 154.33108,234.5254 C 155.91879,246.92618 166.20942,256.11628 176.96544,254.73917 L 187.29911,253.41609 C 198.05519,252.03898 205.6985,240.55273 204.11081,228.15191 L 198.69076,185.81874 C 197.10305,173.41796 186.81246,164.22775 176.05634,165.60501 L 165.72272,166.92806 C 154.96664,168.30517 147.32331,179.79143 148.91101,192.19222 L 154.33108,234.5254 z M 174.41182,231.46264 C 168.88882,226.53034 165.01343,196.26176 169.11569,190.0971 C 173.21784,183.93241 173.08702,183.94914 178.61002,188.8815 C 184.133,193.8138 188.00839,224.08238 183.90614,230.24705 C 179.80398,236.41175 179.93481,236.39499 174.41182,231.46264 z"
Index: images/svg/amenity/amenity_police2.svg
===================================================================
--- images/svg/amenity/amenity_police2.svg	(revision 15861)
+++ images/svg/amenity/amenity_police2.svg	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -6,7 +6,6 @@
    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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
@@ -140,14 +139,6 @@
       </g>
     </g>
   </g>
-  <image
-     y="573.99469"
-     x="-1801.1931"
-     id="image3356"
-     height="190"
-     width="239"
-     sodipodi:absref="U:\svn.openstreetmap.org\applications\share\map-icons\svg-twotone\pastedpic_10102008_233747.png"
-     xlink:href="pastedpic_10102008_233747.png" />
   <path
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      d="M 170.35553,221.90624 C 171.56683,231.36709 179.41779,238.37843 187.62381,237.3278 L 195.50761,236.31839 C 203.71367,235.26776 209.54493,226.50463 208.33364,217.04376 L 204.19856,184.7468 C 202.98726,175.28595 195.13633,168.27453 186.93023,169.32527 L 179.04647,170.33466 C 170.84041,171.38528 165.00914,180.14842 166.22043,189.60927 L 170.35553,221.90624 z M 185.67559,219.56959 C 181.46197,215.80662 178.50534,192.71402 181.63505,188.01086 C 184.76468,183.30767 184.66487,183.32043 188.8785,187.08345 C 193.09211,190.84641 196.04873,213.93902 192.91903,218.64219 C 189.7894,223.34538 189.88921,223.33259 185.67559,219.56959 z"
Index: images/svg/north_arrows/north-arrow_13_checkerboard_earth.svg
===================================================================
--- images/svg/north_arrows/north-arrow_13_checkerboard_earth.svg	(revision 15861)
+++ images/svg/north_arrows/north-arrow_13_checkerboard_earth.svg	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 450 500">
 	<title>North Arrow, Triangular Arrows and Checkboard Earth</title>
 	<metadata>
@@ -24,7 +24,7 @@
 		</rdf:RDF>
 	</metadata>
 	<g transform="matrix(0.8259067,0,0,0.743329,49.011271,33.101891)">
-		<path fill="character_n" d="M329.83,76.088h11.36l14.82,21.78v-21.78h11.47v39.372h-11.47l-14.74-21.62v21.62h-11.44v-39.372z" transform="translate(-151.93179,-75.1349)"/>
+		<path id="character_n" fill="black" d="M329.83,76.088h11.36l14.82,21.78v-21.78h11.47v39.372h-11.47l-14.74-21.62v21.62h-11.44v-39.372z" transform="translate(-151.93179,-75.1349)"/>
 		<path id="big_arrow" d="M123.51,315.33l73.01-243.97,72.11,243.97-73.02,243.98-72.1-243.98z" stroke="black" stroke-width="18.78" fill="none"/>
 		<path id="center_ellipse" d="M495,441.29a62.5,32.5,0,1,1,-125,0,62.5,32.5,0,1,1,125,0z" transform="matrix(1.334562,0,0,1.792097,-382.27499,-474.3921)" stroke="black" stroke-width="8.14" fill="none"/>
 		<path id="inside_lower_arrow" d="M193.95,389.16l3.7,134.81-41.67-142.03c12.29,1.7,9.14,4.99,37.97,7.22z" stroke="black" stroke-width="1.66" fill="black"/>