From d4a3cd53d210677bda7f065dc2f75f2f38a705cf Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Tue, 9 Apr 2024 11:04:42 +0700
Subject: [PATCH] [symbology] Fix a bunch of SVGs missing opacity parameters
 and previewing badly on dark themes

---
 images/svg/gpsicons/anchor.svg             |  2 +-
 images/svg/gpsicons/bank.svg               |  2 +-
 images/svg/gpsicons/boat.svg               |  4 +-
 images/svg/gpsicons/camera.svg             |  4 +-
 images/svg/gpsicons/car.svg                |  6 +-
 images/svg/gpsicons/city_building.svg      |  2 +-
 images/svg/gpsicons/city_large.svg         |  2 +-
 images/svg/gpsicons/city_medium.svg        |  2 +-
 images/svg/gpsicons/city_small.svg         |  2 +-
 images/svg/gpsicons/conveneince.svg        |  2 +-
 images/svg/gpsicons/couple.svg             |  8 +--
 images/svg/gpsicons/cross.svg              |  4 +-
 images/svg/gpsicons/deer.svg               |  4 +-
 images/svg/gpsicons/dollar.svg             |  2 +-
 images/svg/gpsicons/fish.svg               |  3 +-
 images/svg/gpsicons/flag.svg               |  4 +-
 images/svg/gpsicons/food.svg               |  4 +-
 images/svg/gpsicons/gas.svg                |  2 +-
 images/svg/gpsicons/golf.svg               |  4 +-
 images/svg/gpsicons/h.svg                  |  4 +-
 images/svg/gpsicons/house.svg              | 10 ++--
 images/svg/gpsicons/parachute.svg          |  4 +-
 images/svg/gpsicons/parking.svg            |  4 +-
 images/svg/gpsicons/phone.svg              |  6 +-
 images/svg/gpsicons/plane.svg              |  2 +-
 images/svg/gpsicons/point.svg              |  2 +-
 images/svg/gpsicons/question.svg           |  6 +-
 images/svg/gpsicons/shipwreck.svg          |  4 +-
 images/svg/gpsicons/skier.svg              |  4 +-
 images/svg/gpsicons/skull.svg              |  4 +-
 images/svg/gpsicons/swimmer.svg            |  6 +-
 images/svg/gpsicons/table.svg              |  2 +-
 images/svg/gpsicons/teepee.svg             |  4 +-
 images/svg/gpsicons/tree.svg               |  2 +-
 images/svg/gpsicons/walker.svg             |  2 +-
 images/svg/gpsicons/waypoint.svg           |  2 +-
 images/svg/sport/sport_soccer.svg          | 66 +---------------------
 images/svg/wind_roses/WindRose_01.svg      |  2 +-
 images/svg/wind_roses/WindRose_02.svg      |  2 +-
 tests/src/python/test_selective_masking.py |  2 +
 40 files changed, 72 insertions(+), 131 deletions(-)

diff --git a/images/svg/gpsicons/anchor.svg b/images/svg/gpsicons/anchor.svg
index cd060dc39cf..cd3bb05276c 100644
--- a/images/svg/gpsicons/anchor.svg
+++ b/images/svg/gpsicons/anchor.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m493.03 419.592l-.399.328c-10.239 8.396-15.304 13.916-19.001 17.947-8.217 8.959-10.426 11.365-49.361 24.254-44.644 8.766-76.78 14.518-118.552 15.818v-267.155h134.419v-34.252h-134.42v-12.362c17.839-7.012 30.586-25.576 30.586-47.383 0-27.82-20.748-50.373-46.35-50.373-25.598 0-46.351 22.553-46.351 50.373 0 21.809 12.753 40.375 30.593 47.383v12.361h-134.418v34.252h134.419v267.492c-55.312-.137-78.865-5.439-122.192-18.162-24.612-8.355-36.679-20.352-48.349-31.953-6.879-6.838-13.377-13.297-22.004-18.365l-.463-.271-19.052 31.051.315.307c3.749 3.621 7.27 7.096 10.674 10.457 41.966 41.434 63.03 62.23 215.902 62.23 2.179.01 4.352.014 6.479.014.009 0 .011 0 .021 0 148.477 0 171.416-20.861 209.407-55.42 3.967-3.607 8.068-7.338 12.506-11.221l.422-.369z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m493.03 419.592l-.399.328c-10.239 8.396-15.304 13.916-19.001 17.947-8.217 8.959-10.426 11.365-49.361 24.254-44.644 8.766-76.78 14.518-118.552 15.818v-267.155h134.419v-34.252h-134.42v-12.362c17.839-7.012 30.586-25.576 30.586-47.383 0-27.82-20.748-50.373-46.35-50.373-25.598 0-46.351 22.553-46.351 50.373 0 21.809 12.753 40.375 30.593 47.383v12.361h-134.418v34.252h134.419v267.492c-55.312-.137-78.865-5.439-122.192-18.162-24.612-8.355-36.679-20.352-48.349-31.953-6.879-6.838-13.377-13.297-22.004-18.365l-.463-.271-19.052 31.051.315.307c3.749 3.621 7.27 7.096 10.674 10.457 41.966 41.434 63.03 62.23 215.902 62.23 2.179.01 4.352.014 6.479.014.009 0 .011 0 .021 0 148.477 0 171.416-20.861 209.407-55.42 3.967-3.607 8.068-7.338 12.506-11.221l.422-.369z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/bank.svg b/images/svg/gpsicons/bank.svg
index 35a1949cd74..cd4aa8a34ea 100644
--- a/images/svg/gpsicons/bank.svg
+++ b/images/svg/gpsicons/bank.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m182.057 63.58c-21.412-18.028-54.73-30.601-99.955-37.714l-4.08-.691v-123.414c14.383.854 29.148 2.933 44.303 6.249 20.409 4.466 42.123 11.25 65.135 20.347v-48.881c-22.814-6.285-45.125-10.998-66.938-14.142-14.339-2.067-28.504-3.44-42.5-4.148v-29.225h-52.885v30.06c-34.487 3.262-62.626 12.222-84.409 26.882-27.814 18.859-41.721 44.662-41.721 77.416 0 28.285 10.106 50.368 30.316 66.246 19.858 15.604 51.803 27.132 95.814 34.588v136.536c-17.109-1.105-34.44-3.809-51.992-8.111-23.612-5.788-47.723-14.391-72.338-25.803v51.61c25.615 7.774 50.328 13.647 74.14 17.619 17.475 2.887 34.199 4.709 50.19 5.494v28.883h52.885v-29.783c39.14-3.186 70.016-11.994 92.628-26.43 29.215-18.532 43.822-45.742 43.822-81.63 0-30.108-10.805-54.09-32.415-71.958zm-204.409-64.013c-11.807-8.438-17.708-20.843-17.708-37.22 0-19.518 8.903-34.57 26.713-45.158 10.347-6.081 23.184-10.406 38.484-12.994v111.864c-22.29-4.541-38.12-10.039-47.489-16.492zm145.274 187.822c-11.833 7.077-26.805 11.926-44.9 14.551v-125.868c23.786 5.006 41.37 11.836 52.707 20.511 13.605 10.255 20.41 24.48 20.41 42.674 0 20.842-9.402 36.885-28.217 48.132z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m182.057 63.58c-21.412-18.028-54.73-30.601-99.955-37.714l-4.08-.691v-123.414c14.383.854 29.148 2.933 44.303 6.249 20.409 4.466 42.123 11.25 65.135 20.347v-48.881c-22.814-6.285-45.125-10.998-66.938-14.142-14.339-2.067-28.504-3.44-42.5-4.148v-29.225h-52.885v30.06c-34.487 3.262-62.626 12.222-84.409 26.882-27.814 18.859-41.721 44.662-41.721 77.416 0 28.285 10.106 50.368 30.316 66.246 19.858 15.604 51.803 27.132 95.814 34.588v136.536c-17.109-1.105-34.44-3.809-51.992-8.111-23.612-5.788-47.723-14.391-72.338-25.803v51.61c25.615 7.774 50.328 13.647 74.14 17.619 17.475 2.887 34.199 4.709 50.19 5.494v28.883h52.885v-29.783c39.14-3.186 70.016-11.994 92.628-26.43 29.215-18.532 43.822-45.742 43.822-81.63 0-30.108-10.805-54.09-32.415-71.958zm-204.409-64.013c-11.807-8.438-17.708-20.843-17.708-37.22 0-19.518 8.903-34.57 26.713-45.158 10.347-6.081 23.184-10.406 38.484-12.994v111.864c-22.29-4.541-38.12-10.039-47.489-16.492zm145.274 187.822c-11.833 7.077-26.805 11.926-44.9 14.551v-125.868c23.786 5.006 41.37 11.836 52.707 20.511 13.605 10.255 20.41 24.48 20.41 42.674 0 20.842-9.402 36.885-28.217 48.132z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/boat.svg b/images/svg/gpsicons/boat.svg
index 8b2f74beee2..266314cdbb5 100644
--- a/images/svg/gpsicons/boat.svg
+++ b/images/svg/gpsicons/boat.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m483.295 384.897v-138.343l-438.057 1.798c0 0 35.76 131.157 165.389 134.749 272.668 5.389 272.668 5.389 272.668 1.796z" fill="param(fill) #000" opacity=".25"/>
-<path d="m542.895 216.01h-56.621v16.455l-459.444 1.885 4.827 17.705c.395 1.445 9.959 35.813 36.438 70.817 35.566 47.017 84.719 72.709 142.143 74.3l.111.003c149.483 2.954 217.709 4.303 248.182 4.303.003 0 .004 0 .006 0 12.717 0 19.548-.225 23.573-.776 4.646-.636 7.875-2.249 10.127-4.221v33.333h10.43v-107.8h40.229v-106.004zm-73.677 157.234c-2.724.049-6.213.08-10.683.08-.001 0-.004 0-.005 0-30.191 0-98.315-1.347-247.569-4.296-48.933-1.37-89.252-22.362-119.844-62.394-12.384-16.204-20.667-32.481-25.742-44.288l403.843-1.657z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m483.295 384.897v-138.343l-438.057 1.798c0 0 35.76 131.157 165.389 134.749 272.668 5.389 272.668 5.389 272.668 1.796z" fill="param(fill)" opacity=".25"/>
+<path d="m542.895 216.01h-56.621v16.455l-459.444 1.885 4.827 17.705c.395 1.445 9.959 35.813 36.438 70.817 35.566 47.017 84.719 72.709 142.143 74.3l.111.003c149.483 2.954 217.709 4.303 248.182 4.303.003 0 .004 0 .006 0 12.717 0 19.548-.225 23.573-.776 4.646-.636 7.875-2.249 10.127-4.221v33.333h10.43v-107.8h40.229v-106.004zm-73.677 157.234c-2.724.049-6.213.08-10.683.08-.001 0-.004 0-.005 0-30.191 0-98.315-1.347-247.569-4.296-48.933-1.37-89.252-22.362-119.844-62.394-12.384-16.204-20.667-32.481-25.742-44.288l403.843-1.657z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/camera.svg b/images/svg/gpsicons/camera.svg
index 301c1bd32ba..52170ab9092 100644
--- a/images/svg/gpsicons/camera.svg
+++ b/images/svg/gpsicons/camera.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m125.788-42.707v-62.611h-154.476v62.611h-58.462v-22.383h-48.975v22.383h-37.724v257.159h460.021v-257.159zm-77.238 69.148c40.267 0 73.026 32.759 73.026 73.026s-32.76 73.026-73.026 73.026-73.026-32.76-73.026-73.026 32.76-73.026 73.026-73.026zm-45.478-39.096v-65.911h90.958v65.911z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m48.55 148.282c26.865 0 48.722-21.854 48.722-48.717s-21.856-48.716-48.722-48.716c-26.864 0-48.719 21.854-48.719 48.716s21.856 48.717 48.719 48.717z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m125.788-42.707v-62.611h-154.476v62.611h-58.462v-22.383h-48.975v22.383h-37.724v257.159h460.021v-257.159zm-77.238 69.148c40.267 0 73.026 32.759 73.026 73.026s-32.76 73.026-73.026 73.026-73.026-32.76-73.026-73.026 32.76-73.026 73.026-73.026zm-45.478-39.096v-65.911h90.958v65.911z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m48.55 148.282c26.865 0 48.722-21.854 48.722-48.717s-21.856-48.716-48.722-48.716c-26.864 0-48.719 21.854-48.719 48.716s21.856 48.717 48.719 48.717z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/car.svg b/images/svg/gpsicons/car.svg
index c25260e5c9c..e14e06115c9 100644
--- a/images/svg/gpsicons/car.svg
+++ b/images/svg/gpsicons/car.svg
@@ -1,5 +1,5 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m-52.948 77.361c18.521 0 33.535 17.592 33.535 39.287 0 21.7-15.014 39.291-33.535 39.291s-33.535-17.591-33.535-39.291c0-21.695 15.014-39.287 33.535-39.287z" fill="param(fill) #000" opacity=".25"/>
-<path d="m174.743 83.567c18.521 0 33.533 17.587 33.533 39.287 0 21.699-15.012 39.286-33.533 39.286-18.525 0-33.537-17.587-33.537-39.286 0-21.7 15.011-39.287 33.537-39.287z" fill="param(fill) #000" opacity=".25"/>
-<path d="m276.772 79.953c-3.227-21.376-12.249-52.848-36.905-81.389-42.07-48.698-114.335-73.394-214.783-73.403-24.51-1.094-38.472 21.657-51.959 43.616-12.026 19.582-23.386 38.077-40.927 38.081-.286.05-.567-.004-.857-.015-37.074-1.237-64.551 8.693-81.562 29.435-27.262 33.241-17.96 81.801-17.551 83.853l.356 1.788h64.375c2.277 30.08 23.829 53.665 50.093 53.665s47.817-23.584 50.094-53.665h127.313c-.005.313-.021.621-.021.935 0 32.547 22.521 58.932 50.304 58.932 27.784 0 50.305-26.385 50.305-58.932 0-.313-.016-.622-.021-.935h52.563l.279-1.9c.1-.679 2.402-16.895-1.096-40.066zm-329.72 75.986c-18.521 0-33.535-17.591-33.535-39.291 0-21.695 15.014-39.287 33.535-39.287s33.535 17.592 33.535 39.287c0 21.7-15.014 39.291-33.535 39.291zm161.408-155.523c-7.389-.266-15.765-.568-25.123-.812l-.068-.002-.069.002c-78.42 2.828-104.87 3.722-113.745 4.005 3.324-4.622 6.391-8.9 9.231-12.862 34.786-48.521 34.786-48.521 53.216-48.73l.22-.002c3.76-.046 7.461-.07 10.999-.07 77.666 0 88.172 11.252 97.44 21.179.867.929 1.762 1.887 2.695 2.827 8.406 15.485 14.134 26.771 11.595 31.039-2.148 3.612-11.792 4.099-20.943 4.099-6.798-.001-15.028-.297-25.448-.673zm66.283 161.724c-18.525 0-33.537-17.587-33.537-39.286 0-21.7 15.012-39.287 33.537-39.287 18.521 0 33.533 17.587 33.533 39.287 0 21.699-15.012 39.286-33.533 39.286z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m-52.948 77.361c18.521 0 33.535 17.592 33.535 39.287 0 21.7-15.014 39.291-33.535 39.291s-33.535-17.591-33.535-39.291c0-21.695 15.014-39.287 33.535-39.287z" fill="param(fill)" opacity=".25"/>
+<path d="m174.743 83.567c18.521 0 33.533 17.587 33.533 39.287 0 21.699-15.012 39.286-33.533 39.286-18.525 0-33.537-17.587-33.537-39.286 0-21.7 15.011-39.287 33.537-39.287z" fill="param(fill)" opacity=".25"/>
+<path d="m276.772 79.953c-3.227-21.376-12.249-52.848-36.905-81.389-42.07-48.698-114.335-73.394-214.783-73.403-24.51-1.094-38.472 21.657-51.959 43.616-12.026 19.582-23.386 38.077-40.927 38.081-.286.05-.567-.004-.857-.015-37.074-1.237-64.551 8.693-81.562 29.435-27.262 33.241-17.96 81.801-17.551 83.853l.356 1.788h64.375c2.277 30.08 23.829 53.665 50.093 53.665s47.817-23.584 50.094-53.665h127.313c-.005.313-.021.621-.021.935 0 32.547 22.521 58.932 50.304 58.932 27.784 0 50.305-26.385 50.305-58.932 0-.313-.016-.622-.021-.935h52.563l.279-1.9c.1-.679 2.402-16.895-1.096-40.066zm-329.72 75.986c-18.521 0-33.535-17.591-33.535-39.291 0-21.695 15.014-39.287 33.535-39.287s33.535 17.592 33.535 39.287c0 21.7-15.014 39.291-33.535 39.291zm161.408-155.523c-7.389-.266-15.765-.568-25.123-.812l-.068-.002-.069.002c-78.42 2.828-104.87 3.722-113.745 4.005 3.324-4.622 6.391-8.9 9.231-12.862 34.786-48.521 34.786-48.521 53.216-48.73l.22-.002c3.76-.046 7.461-.07 10.999-.07 77.666 0 88.172 11.252 97.44 21.179.867.929 1.762 1.887 2.695 2.827 8.406 15.485 14.134 26.771 11.595 31.039-2.148 3.612-11.792 4.099-20.943 4.099-6.798-.001-15.028-.297-25.448-.673zm66.283 161.724c-18.525 0-33.537-17.587-33.537-39.286 0-21.7 15.012-39.287 33.537-39.287 18.521 0 33.533 17.587 33.533 39.287 0 21.699-15.012 39.286-33.533 39.286z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/city_building.svg b/images/svg/gpsicons/city_building.svg
index e910580d9b4..af9bff3769c 100644
--- a/images/svg/gpsicons/city_building.svg
+++ b/images/svg/gpsicons/city_building.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m517.815 486.516v-393.036h-455.634v393.036m193.743 0v-102.408h63.414v102.408m-131.814-41.28h-63.411v-64.173h63.411zm0-113.999h-63.411v-64.174h63.411zm0-113.996h-63.411v-64.174h63.411zm130.126 113.996h-63.411v-64.174h63.411zm0-113.996h-63.411v-64.174h63.411zm130.025 227.995h-63.41v-64.173h63.41zm.106-113.999h-63.416v-64.174h63.416zm0-113.996h-63.416v-64.174h63.416z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m517.815 486.516v-393.036h-455.634v393.036m193.743 0v-102.408h63.414v102.408m-131.814-41.28h-63.411v-64.173h63.411zm0-113.999h-63.411v-64.174h63.411zm0-113.996h-63.411v-64.174h63.411zm130.126 113.996h-63.411v-64.174h63.411zm0-113.996h-63.411v-64.174h63.411zm130.025 227.995h-63.41v-64.173h63.41zm.106-113.999h-63.416v-64.174h63.416zm0-113.996h-63.416v-64.174h63.416z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/city_large.svg b/images/svg/gpsicons/city_large.svg
index 26ed6b23afd..38052cee6cf 100644
--- a/images/svg/gpsicons/city_large.svg
+++ b/images/svg/gpsicons/city_large.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<ellipse cx="54.43" cy="54.838" fill="param(fill) #000" rx="216.926" ry="214.884" stroke="param(outline) #FFF" stroke-width="param(outline-width) 0"/>
+<ellipse cx="54.43" cy="54.838" rx="216.926" ry="214.884" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/city_medium.svg b/images/svg/gpsicons/city_medium.svg
index 7a9662145ea..5781ab9e848 100644
--- a/images/svg/gpsicons/city_medium.svg
+++ b/images/svg/gpsicons/city_medium.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m290.001 138.466c-84.485 0-152.977 67.842-152.977 151.532 0 83.687 68.491 151.532 152.977 151.532 84.482 0 152.97-67.846 152.97-151.532 0-83.69-68.487-151.532-152.97-151.532z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m290.001 138.466c-84.485 0-152.977 67.842-152.977 151.532 0 83.687 68.491 151.532 152.977 151.532 84.482 0 152.97-67.846 152.97-151.532 0-83.69-68.487-151.532-152.97-151.532z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/city_small.svg b/images/svg/gpsicons/city_small.svg
index 6db6d367bf0..7707ba10ac6 100644
--- a/images/svg/gpsicons/city_small.svg
+++ b/images/svg/gpsicons/city_small.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 109.133 109.133" height="109.133" viewBox="0 0 109.133 109.133" width="109.133" xmlns="http://www.w3.org/2000/svg">
-<circle cx="54.567" cy="54.567" fill="param(fill) #000" r="15.772"/>
+<circle cx="54.567" cy="54.567" r="15.772" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/conveneince.svg b/images/svg/gpsicons/conveneince.svg
index 609b2d7f42a..a43c23daa1d 100644
--- a/images/svg/gpsicons/conveneince.svg
+++ b/images/svg/gpsicons/conveneince.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m477.815 444.775c-.019-.675-.039-1.276-.04-1.801-.146-51.954-48.144-81.382-73.157-93.192l-1.641-149.421-70.884-59.687v-98.52h-229.99v495.687h229.99v-1.234c.382.001.772.008 1.152.008 60.248 0 100.881-11.489 124.093-35.058 21.464-21.794 20.747-47.213 20.477-56.782zm-183.597-112.277l-73.668 73.669-75.506-75.509 73.666-73.663zm-149.169-134.769v-107.383h144.089v107.383zm281.172 273.183c-8.251 8.378-31.402 22.154-94.128 22.023v-295.166l27.433 23.1 1.577 143.734.114 15.452 14.651 4.97c.582.2 58.128 21.106 58.232 58.067.002.843.026 1.819.058 2.913.195 6.912.463 16.378-7.937 24.907z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m477.815 444.775c-.019-.675-.039-1.276-.04-1.801-.146-51.954-48.144-81.382-73.157-93.192l-1.641-149.421-70.884-59.687v-98.52h-229.99v495.687h229.99v-1.234c.382.001.772.008 1.152.008 60.248 0 100.881-11.489 124.093-35.058 21.464-21.794 20.747-47.213 20.477-56.782zm-183.597-112.277l-73.668 73.669-75.506-75.509 73.666-73.663zm-149.169-134.769v-107.383h144.089v107.383zm281.172 273.183c-8.251 8.378-31.402 22.154-94.128 22.023v-295.166l27.433 23.1 1.577 143.734.114 15.452 14.651 4.97c.582.2 58.128 21.106 58.232 58.067.002.843.026 1.819.058 2.913.195 6.912.463 16.378-7.937 24.907z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/couple.svg b/images/svg/gpsicons/couple.svg
index e9bbe22cea9..8bf0cf5a466 100644
--- a/images/svg/gpsicons/couple.svg
+++ b/images/svg/gpsicons/couple.svg
@@ -1,6 +1,6 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m161.272 129.737c23.107 0 41.906-18.799 41.906-41.904 0-23.109-18.799-41.91-41.906-41.91-23.108 0-41.908 18.8-41.908 41.91 0 23.105 18.8 41.904 41.908 41.904z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m238.204 133.672c-.969 0-1.916.119-2.84.332-1.269-.215-2.57-.332-3.9-.332h-15.678-109.03-15.678c-1.329 0-2.631.117-3.899.332-.923-.213-1.87-.332-2.838-.332-9.127 0-16.525 9.898-16.525 22.109v1.158 2.35 122.582c0 12.205 7.398 22.104 16.525 22.104 9.123 0 16.522-9.898 16.522-22.104v-99.318h5.894v160.613 20.697 155.299c0 9.59 7.776 17.367 17.369 17.367h16.293c9.593 0 17.369-7.777 17.369-17.367v-155.298h6.969v155.299c0 9.59 7.777 17.367 17.367 17.367h16.295c9.59 0 17.367-7.777 17.367-17.367v-155.299-20.697-160.614h5.893v99.318c0 12.205 7.399 22.104 16.525 22.104 9.127 0 16.523-9.898 16.523-22.104v-122.581-2.35-1.158c0-12.211-7.396-22.11-16.523-22.11z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m400.347 127.282c23.108 0 41.909-18.799 41.909-41.906 0-23.109-18.801-41.909-41.909-41.909-23.105 0-41.903 18.8-41.903 41.909 0 23.107 18.798 41.906 41.903 41.906z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m510.856 272.973l-34.084-119.129c-3.232-11.313-11.419-18.186-18.44-15.621-1.484-.297-3.019-.455-4.59-.455h-107.652c-3.459 0-6.738.762-9.689 2.115-5.878.822-11.715 7.313-14.262 16.688l-32.381 119.076c-3.203 11.781-.006 23.645 7.143 26.502 7.151 2.859 15.543-4.375 18.749-16.156l27.08-99.594c1.098.16 2.219.246 3.36.246h7.302l-47.139 182.32c-.667 2.58-.103 5.322 1.529 7.43 1.631 2.107 4.146 3.34 6.811 3.34h31.084v139.428c0 9.59 7.771 17.367 17.361 17.367h16.298c9.59 0 17.367-7.777 17.367-17.367v-139.428h7.293v139.428c0 9.59 7.771 17.367 17.361 17.367h16.298c9.59 0 17.367-7.777 17.367-17.367v-139.428h31.079c2.665 0 5.18-1.232 6.811-3.34 1.632-2.107 2.196-4.85 1.529-7.43l-47.135-182.32h6.435c1.186 0 2.351-.09 3.488-.262l27.874 97.42c3.301 11.531 11.739 18.465 18.854 15.471 7.112-2.994 10.206-14.77 6.899-26.301z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m161.272 129.737c23.107 0 41.906-18.799 41.906-41.904 0-23.109-18.799-41.91-41.906-41.91-23.108 0-41.908 18.8-41.908 41.91 0 23.105 18.8 41.904 41.908 41.904z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m238.204 133.672c-.969 0-1.916.119-2.84.332-1.269-.215-2.57-.332-3.9-.332h-15.678-109.03-15.678c-1.329 0-2.631.117-3.899.332-.923-.213-1.87-.332-2.838-.332-9.127 0-16.525 9.898-16.525 22.109v1.158 2.35 122.582c0 12.205 7.398 22.104 16.525 22.104 9.123 0 16.522-9.898 16.522-22.104v-99.318h5.894v160.613 20.697 155.299c0 9.59 7.776 17.367 17.369 17.367h16.293c9.593 0 17.369-7.777 17.369-17.367v-155.298h6.969v155.299c0 9.59 7.777 17.367 17.367 17.367h16.295c9.59 0 17.367-7.777 17.367-17.367v-155.299-20.697-160.614h5.893v99.318c0 12.205 7.399 22.104 16.525 22.104 9.127 0 16.523-9.898 16.523-22.104v-122.581-2.35-1.158c0-12.211-7.396-22.11-16.523-22.11z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m400.347 127.282c23.108 0 41.909-18.799 41.909-41.906 0-23.109-18.801-41.909-41.909-41.909-23.105 0-41.903 18.8-41.903 41.909 0 23.107 18.798 41.906 41.903 41.906z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m510.856 272.973l-34.084-119.129c-3.232-11.313-11.419-18.186-18.44-15.621-1.484-.297-3.019-.455-4.59-.455h-107.652c-3.459 0-6.738.762-9.689 2.115-5.878.822-11.715 7.313-14.262 16.688l-32.381 119.076c-3.203 11.781-.006 23.645 7.143 26.502 7.151 2.859 15.543-4.375 18.749-16.156l27.08-99.594c1.098.16 2.219.246 3.36.246h7.302l-47.139 182.32c-.667 2.58-.103 5.322 1.529 7.43 1.631 2.107 4.146 3.34 6.811 3.34h31.084v139.428c0 9.59 7.771 17.367 17.361 17.367h16.298c9.59 0 17.367-7.777 17.367-17.367v-139.428h7.293v139.428c0 9.59 7.771 17.367 17.361 17.367h16.298c9.59 0 17.367-7.777 17.367-17.367v-139.428h31.079c2.665 0 5.18-1.232 6.811-3.34 1.632-2.107 2.196-4.85 1.529-7.43l-47.135-182.32h6.435c1.186 0 2.351-.09 3.488-.262l27.874 97.42c3.301 11.531 11.739 18.465 18.854 15.471 7.112-2.994 10.206-14.77 6.899-26.301z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/cross.svg b/images/svg/gpsicons/cross.svg
index e4fa4060046..21011fc32f1 100644
--- a/images/svg/gpsicons/cross.svg
+++ b/images/svg/gpsicons/cross.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m26.929 29.26v521.476h526.138v-521.476zm497.493 492.831h-468.847v-464.185h468.848v464.185z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m214.31 486.524h151.377v-118.358h114.478v-156.334h-114.478v-118.359h-151.377v118.359h-114.48v156.334h114.48z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m26.929 29.26v521.476h526.138v-521.476zm497.493 492.831h-468.847v-464.185h468.848v464.185z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m214.31 486.524h151.377v-118.358h114.478v-156.334h-114.478v-118.359h-151.377v118.359h-114.48v156.334h114.48z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/deer.svg b/images/svg/gpsicons/deer.svg
index 9e7c35708fa..f7f337a54cc 100644
--- a/images/svg/gpsicons/deer.svg
+++ b/images/svg/gpsicons/deer.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m132.746 290.713c-.054-.542-.1-1.083-.134-1.623.206 3.533.203 3.185.134 1.623z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m535.653 523.704c-4.89-7.799-11.77-14.093-18.49-17.542-3.059-1.497-5.964-2.998-9.018-4.499-2.752-1.497-5.811-2.398-9.018-2.994l-1.683-.302c-1.223-.451-2.445-1.353-3.059-2.398-1.069-1.65-1.985-3.296-2.901-5.1-.92-2.101-2.296-4.192-3.518-5.996-1.679-2.398-3.055-4.648-4.431-7.195-3.979-7.493-7.493-15.293-10.245-23.232-2.751-7.8-4.731-16.046-6.107-24.138-.158-1.502-.465-2.85-.767-4.347-.307-2.101-1.223-3.899-2.445-5.698-.915-1.199-2.292-2.102-3.36-2.399-4.588-1.05-9.324-2.249-14.373-3.3-3.82-.897-7.79-2.097-11.611-3.746-1.375-.447-2.752-1.349-3.979-2.25-3.514-2.548-5.806-6.146-6.414-9.594-1.837-9.144-3.975-18.139-6.573-27.435-.921-3.449-1.989-6.591-3.207-9.892-.614-1.348-1.228-2.696-2.144-3.896l-2.143-3.598c2.604.446 5.197-.307 7.033-2.249 1.836-1.953 2.752-4.352 2.752-6.898 0-1.199-.154-2.398-.609-3.449-2.752-7.642-7.642-14.242-14.065-19.188-7.642-5.997-16.199-10.794-25.37-14.54-7.949-3.301-16.204-5.848-24.455-7.498-4.736-1.048-9.626-1.947-14.674-2.847-10.85-2.099-22.006-3.149-32.706-3.449-13.907-.448-27.971-1.799-42.031-3.897-8.711-1.499-17.117-4.046-24.913-8.095-14.825-7.347-27.053-18.889-35.306-33.131-2.141-3.749-3.974-7.795-4.893-11.844-3.362-13.492-6.419-26.983-9.476-41.525-1.375-6.596-3.209-13.191-5.35-19.787-.916-2.398-1.987-4.798-3.21-7.196l-1.069-2.099c4.279-1.199 8.711-1.949 13.144-2.099 2.599 0 5.046-.45 7.644-.899 1.069-.3 2.139-.75 3.057-1.351l1.987-1.199 2.292-1.348 2.293-1.351 1.681-.748c-.307-.899-.918-1.801-1.529-2.55-2.902-2.849-6.57-5.248-10.544-6.744-6.42-2.55-13.299-4.049-20.33-4.648h-1.833c-2.445-5.097-6.42-9.294-11.31-12.144l-1.987-1.049c0-.45 0-.898 0-1.35 0-6.297 1.223-12.441 3.668-18.289 1.833-4.049 3.82-7.946 6.114-11.844 1.374-2.099 2.445-4.497 3.515-6.896 2.294-6.747 3.516-13.792 3.516-20.838 0-5.997-.765-11.842-2.598-17.541-.308-1.199-.918-2.096-1.987-2.696-1.071-.6-2.294-1.051-3.363-1.502-1.069-.448-2.141-.448-3.363-.448-1.068.151-1.986.899-2.291 1.95-.611 1.048-1.069 2.398-1.683 3.746-.305.899-.458 1.95-.305 2.998.458 3.598.918 7.047 1.376 10.194 0 1.05 0 1.949 0 2.998 0 7.646-2.905 14.99-7.948 20.689l-.916 1.199c-4.435-2.25-8.713-4.648-12.841-7.498l-6.112-3.896c-.611-.6-1.529-.901-2.445-.901-2.141 0-4.128 1.501-4.433 3.598-.307 1.502 0 2.998 1.069 4.197 4.739 6.147 10.547 11.396 17.271 15.593l1.376.748-.611 3.749-1.222 7.345-1.987 8.996-.458 1.048h-5.962c-4.738.301-9.476 1.2-13.756 2.85-5.959 2.248-11.768 5.098-17.425 8.396-4.278 2.698-9.018 4.646-12.073 5.545-3.975 1.051-7.948 1.95-12.074 3.149-3.821.899-7.642 2.247-8.864 2.847-2.294 1.051-4.738 2.102-7.795 3.449-1.683.749-3.517 1.349-5.35 2.099-1.681.449-3.21 1.799-4.128 3.298-.763 1.351-.916 2.998-.151 4.349.765 1.799 2.291 2.998 4.125 3.897 1.987.899 3.517 2.398 4.433 4.347.765 1.35 1.683 2.698 2.752 3.748 1.528 1.349 3.362 2.548 5.35 3.447 4.278 1.949 8.711 3.598 13.297 4.648 3.517.899 7.184 1.348 10.851 1.348h3.21c6.573 7.498 14.675 13.494 23.844 17.54l2.447 1.051c1.681 6.596 2.444 13.191 2.444 19.938 0 2.099 0 4.047-.153 5.996-.458 4.498-.61 8.994-.765 13.792 0 5.396-.457 10.793-1.068 16.341-.918 7.645-1.072 15.29-.307 30.133.05 1.027.1 2.065.134 2.822.184 1.864.498 3.748 1.088 5.721 2.447 9.745 5.657 19.186 9.171 28.185l1.529 4.044c-8.713-2.547-18.035-4.192-27.359-4.494l-7.795-.303h-6.112-7.338-6.112l-8.253-.297-5.196-.298-9.629-.302c-1.225 0-2.599.152-3.67.45-2.599.6-5.044 1.646-7.184 3.147-.763.45-1.527.748-2.292.896-1.223.303-2.292.604-3.363 1.051-1.987 1.051-3.515 2.398-4.736 4.202-1.529 2.547-2.141 5.694-1.529 8.692.304 2.547 1.222 5.243 2.444 7.642 1.529 2.854 2.906 5.55 4.586 8.246 3.21 5.55 6.727 10.793 10.547 16.194 4.279 5.699 8.406 11.389 12.99 16.938 5.503 6.749 11.311 13.341 20.939 23.083 3.363 3.598 6.725 7.047 7.949 8.246 2.291 2.398 4.89 4.5 7.642 6.299 3.514 2.25 7.184 4.197 11.005 5.996 2.902 1.353 5.959 2.398 8.864 3.295 1.681.604 3.514.754 5.501.604 2.294-.148 4.432-.302 6.572-.45 1.834 0 3.517-.154 5.197-.303.458-.148 1.069-.297 1.376-.446 1.529-.753 3.056-1.649 4.432-2.398.765-.45 1.223-1.348 1.223-2.101 0-.6-.153-1.199-.611-1.646-.458-.604-1.069-1.353-1.376-1.952-1.376-3.147-3.667-5.699-6.266-7.795-7.795-5.844-16.506-10.492-25.677-14.09-2.294-.901-4.739-1.501-7.185-1.803l-3.209-.596-.153-.455-12.688-23.226-12.38-23.539-2.141-3.746c3.67.753 7.184 1.646 13.145 3.301 3.975 1.199 7.795 2.398 11.616 3.448l5.197 1.646 5.808 1.799 4.128 1.354 4.125 1.199 8.406 2.244c9.782 2.85 20.022 3.9 30.109 3.449 3.21-.302 6.269-1.051 9.018-2.398l2.294-.896c7.488 3.295 15.13 6.591 22.926 9.44 4.585 1.799 9.475 3.146 16.506 5.099 6.726 1.646 13.451 3.147 18.495 4.5 4.278 1.046 8.711 1.496 12.992 1.794 7.182.302 14.519.901 21.549 1.501 18.953 1.8 37.598 6.447 55.024 13.644 6.266 2.547 11.922 6.145 16.813 10.793 9.934 9.144 20.02 17.989 30.414 25.933 6.419 5.1 13.754 8.994 21.554 11.542 5.196 1.804 10.695 3.003 16.199 3.751 3.36.6 6.874.451 10.394 0 2.747-.6 5.499-.897 7.488-1.353 1.683-.149 3.059-.595 4.583-1.349.307-.148.613-.148 1.069-.148.767 0 1.533.446 2.143 1.348 7.943 12.598 17.119 24.441 32.25 40.929 4.43 4.644 8.711 9.44 12.531 13.643 12.992 14.093 31.334 21.884 50.592 21.438 1.984 0 3.975-1.05 4.891-2.85.307-.748.46-1.501.46-2.096-.001-.905-.309-1.807-.615-2.402z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m132.746 290.713c-.054-.542-.1-1.083-.134-1.623.206 3.533.203 3.185.134 1.623z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m535.653 523.704c-4.89-7.799-11.77-14.093-18.49-17.542-3.059-1.497-5.964-2.998-9.018-4.499-2.752-1.497-5.811-2.398-9.018-2.994l-1.683-.302c-1.223-.451-2.445-1.353-3.059-2.398-1.069-1.65-1.985-3.296-2.901-5.1-.92-2.101-2.296-4.192-3.518-5.996-1.679-2.398-3.055-4.648-4.431-7.195-3.979-7.493-7.493-15.293-10.245-23.232-2.751-7.8-4.731-16.046-6.107-24.138-.158-1.502-.465-2.85-.767-4.347-.307-2.101-1.223-3.899-2.445-5.698-.915-1.199-2.292-2.102-3.36-2.399-4.588-1.05-9.324-2.249-14.373-3.3-3.82-.897-7.79-2.097-11.611-3.746-1.375-.447-2.752-1.349-3.979-2.25-3.514-2.548-5.806-6.146-6.414-9.594-1.837-9.144-3.975-18.139-6.573-27.435-.921-3.449-1.989-6.591-3.207-9.892-.614-1.348-1.228-2.696-2.144-3.896l-2.143-3.598c2.604.446 5.197-.307 7.033-2.249 1.836-1.953 2.752-4.352 2.752-6.898 0-1.199-.154-2.398-.609-3.449-2.752-7.642-7.642-14.242-14.065-19.188-7.642-5.997-16.199-10.794-25.37-14.54-7.949-3.301-16.204-5.848-24.455-7.498-4.736-1.048-9.626-1.947-14.674-2.847-10.85-2.099-22.006-3.149-32.706-3.449-13.907-.448-27.971-1.799-42.031-3.897-8.711-1.499-17.117-4.046-24.913-8.095-14.825-7.347-27.053-18.889-35.306-33.131-2.141-3.749-3.974-7.795-4.893-11.844-3.362-13.492-6.419-26.983-9.476-41.525-1.375-6.596-3.209-13.191-5.35-19.787-.916-2.398-1.987-4.798-3.21-7.196l-1.069-2.099c4.279-1.199 8.711-1.949 13.144-2.099 2.599 0 5.046-.45 7.644-.899 1.069-.3 2.139-.75 3.057-1.351l1.987-1.199 2.292-1.348 2.293-1.351 1.681-.748c-.307-.899-.918-1.801-1.529-2.55-2.902-2.849-6.57-5.248-10.544-6.744-6.42-2.55-13.299-4.049-20.33-4.648h-1.833c-2.445-5.097-6.42-9.294-11.31-12.144l-1.987-1.049c0-.45 0-.898 0-1.35 0-6.297 1.223-12.441 3.668-18.289 1.833-4.049 3.82-7.946 6.114-11.844 1.374-2.099 2.445-4.497 3.515-6.896 2.294-6.747 3.516-13.792 3.516-20.838 0-5.997-.765-11.842-2.598-17.541-.308-1.199-.918-2.096-1.987-2.696-1.071-.6-2.294-1.051-3.363-1.502-1.069-.448-2.141-.448-3.363-.448-1.068.151-1.986.899-2.291 1.95-.611 1.048-1.069 2.398-1.683 3.746-.305.899-.458 1.95-.305 2.998.458 3.598.918 7.047 1.376 10.194 0 1.05 0 1.949 0 2.998 0 7.646-2.905 14.99-7.948 20.689l-.916 1.199c-4.435-2.25-8.713-4.648-12.841-7.498l-6.112-3.896c-.611-.6-1.529-.901-2.445-.901-2.141 0-4.128 1.501-4.433 3.598-.307 1.502 0 2.998 1.069 4.197 4.739 6.147 10.547 11.396 17.271 15.593l1.376.748-.611 3.749-1.222 7.345-1.987 8.996-.458 1.048h-5.962c-4.738.301-9.476 1.2-13.756 2.85-5.959 2.248-11.768 5.098-17.425 8.396-4.278 2.698-9.018 4.646-12.073 5.545-3.975 1.051-7.948 1.95-12.074 3.149-3.821.899-7.642 2.247-8.864 2.847-2.294 1.051-4.738 2.102-7.795 3.449-1.683.749-3.517 1.349-5.35 2.099-1.681.449-3.21 1.799-4.128 3.298-.763 1.351-.916 2.998-.151 4.349.765 1.799 2.291 2.998 4.125 3.897 1.987.899 3.517 2.398 4.433 4.347.765 1.35 1.683 2.698 2.752 3.748 1.528 1.349 3.362 2.548 5.35 3.447 4.278 1.949 8.711 3.598 13.297 4.648 3.517.899 7.184 1.348 10.851 1.348h3.21c6.573 7.498 14.675 13.494 23.844 17.54l2.447 1.051c1.681 6.596 2.444 13.191 2.444 19.938 0 2.099 0 4.047-.153 5.996-.458 4.498-.61 8.994-.765 13.792 0 5.396-.457 10.793-1.068 16.341-.918 7.645-1.072 15.29-.307 30.133.05 1.027.1 2.065.134 2.822.184 1.864.498 3.748 1.088 5.721 2.447 9.745 5.657 19.186 9.171 28.185l1.529 4.044c-8.713-2.547-18.035-4.192-27.359-4.494l-7.795-.303h-6.112-7.338-6.112l-8.253-.297-5.196-.298-9.629-.302c-1.225 0-2.599.152-3.67.45-2.599.6-5.044 1.646-7.184 3.147-.763.45-1.527.748-2.292.896-1.223.303-2.292.604-3.363 1.051-1.987 1.051-3.515 2.398-4.736 4.202-1.529 2.547-2.141 5.694-1.529 8.692.304 2.547 1.222 5.243 2.444 7.642 1.529 2.854 2.906 5.55 4.586 8.246 3.21 5.55 6.727 10.793 10.547 16.194 4.279 5.699 8.406 11.389 12.99 16.938 5.503 6.749 11.311 13.341 20.939 23.083 3.363 3.598 6.725 7.047 7.949 8.246 2.291 2.398 4.89 4.5 7.642 6.299 3.514 2.25 7.184 4.197 11.005 5.996 2.902 1.353 5.959 2.398 8.864 3.295 1.681.604 3.514.754 5.501.604 2.294-.148 4.432-.302 6.572-.45 1.834 0 3.517-.154 5.197-.303.458-.148 1.069-.297 1.376-.446 1.529-.753 3.056-1.649 4.432-2.398.765-.45 1.223-1.348 1.223-2.101 0-.6-.153-1.199-.611-1.646-.458-.604-1.069-1.353-1.376-1.952-1.376-3.147-3.667-5.699-6.266-7.795-7.795-5.844-16.506-10.492-25.677-14.09-2.294-.901-4.739-1.501-7.185-1.803l-3.209-.596-.153-.455-12.688-23.226-12.38-23.539-2.141-3.746c3.67.753 7.184 1.646 13.145 3.301 3.975 1.199 7.795 2.398 11.616 3.448l5.197 1.646 5.808 1.799 4.128 1.354 4.125 1.199 8.406 2.244c9.782 2.85 20.022 3.9 30.109 3.449 3.21-.302 6.269-1.051 9.018-2.398l2.294-.896c7.488 3.295 15.13 6.591 22.926 9.44 4.585 1.799 9.475 3.146 16.506 5.099 6.726 1.646 13.451 3.147 18.495 4.5 4.278 1.046 8.711 1.496 12.992 1.794 7.182.302 14.519.901 21.549 1.501 18.953 1.8 37.598 6.447 55.024 13.644 6.266 2.547 11.922 6.145 16.813 10.793 9.934 9.144 20.02 17.989 30.414 25.933 6.419 5.1 13.754 8.994 21.554 11.542 5.196 1.804 10.695 3.003 16.199 3.751 3.36.6 6.874.451 10.394 0 2.747-.6 5.499-.897 7.488-1.353 1.683-.149 3.059-.595 4.583-1.349.307-.148.613-.148 1.069-.148.767 0 1.533.446 2.143 1.348 7.943 12.598 17.119 24.441 32.25 40.929 4.43 4.644 8.711 9.44 12.531 13.643 12.992 14.093 31.334 21.884 50.592 21.438 1.984 0 3.975-1.05 4.891-2.85.307-.748.46-1.501.46-2.096-.001-.905-.309-1.807-.615-2.402z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/dollar.svg b/images/svg/gpsicons/dollar.svg
index 89d523ec3da..870aa946fed 100644
--- a/images/svg/gpsicons/dollar.svg
+++ b/images/svg/gpsicons/dollar.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m242.743 74.804c-8.929-31.852-70.883-49.511-104.2-59.008-8.628-2.46-15.443-4.402-18.604-5.807-3.264-1.451-8.953-2.817-16.074-4.077v-71.658c22.621 2.583 94.586 20.534 95.367 20.729l2.141.535 28.355-68.061-2.782-.785c-.688-.194-69.212-19.432-114.647-24.701-2.714-.635-5.545-1.183-8.434-1.668v-40.601h-98.404v40.978c-54.789 5.083-104.099 23.996-132.813 51.111-7.655 5.472-13.519 17.862-16.102 34.044-2.97 18.609-.864 37.178 5.121 45.157l.088.11c36.791 43.8 50.697 51.338 143.706 75.546v111.314c-24.457-4.524-113.79-25.35-114.764-25.577l-1.854-.433-35.181 61.099.883 1.323c.906 1.357 2.791 4.184 29.1 12.247 13.851 4.245 28.999 8.246 35.768 9.94 8.552 2.136 48.006 6.096 86.049 8.967v43.902h98.403v-42.829c31.264-4.13 67.268-13.617 91.935-27.879 67.293-34.549 68.388-96.954 46.943-143.918zm-138.879 9.989c5.471 1.365 10.814 2.355 16.021 3.317 20.964 3.87 37.547 6.93 43.932 31.769-3.332 34.655-26.771 46.965-59.953 58.9zm-98.403-87.574c-24.134-1.735-47.976-13.644-49.433-32.575-1.125-16.869 15.505-28.788 49.433-35.451z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m242.743 74.804c-8.929-31.852-70.883-49.511-104.2-59.008-8.628-2.46-15.443-4.402-18.604-5.807-3.264-1.451-8.953-2.817-16.074-4.077v-71.658c22.621 2.583 94.586 20.534 95.367 20.729l2.141.535 28.355-68.061-2.782-.785c-.688-.194-69.212-19.432-114.647-24.701-2.714-.635-5.545-1.183-8.434-1.668v-40.601h-98.404v40.978c-54.789 5.083-104.099 23.996-132.813 51.111-7.655 5.472-13.519 17.862-16.102 34.044-2.97 18.609-.864 37.178 5.121 45.157l.088.11c36.791 43.8 50.697 51.338 143.706 75.546v111.314c-24.457-4.524-113.79-25.35-114.764-25.577l-1.854-.433-35.181 61.099.883 1.323c.906 1.357 2.791 4.184 29.1 12.247 13.851 4.245 28.999 8.246 35.768 9.94 8.552 2.136 48.006 6.096 86.049 8.967v43.902h98.403v-42.829c31.264-4.13 67.268-13.617 91.935-27.879 67.293-34.549 68.388-96.954 46.943-143.918zm-138.879 9.989c5.471 1.365 10.814 2.355 16.021 3.317 20.964 3.87 37.547 6.93 43.932 31.769-3.332 34.655-26.771 46.965-59.953 58.9zm-98.403-87.574c-24.134-1.735-47.976-13.644-49.433-32.575-1.125-16.869 15.505-28.788 49.433-35.451z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/fish.svg b/images/svg/gpsicons/fish.svg
index 8de6bf47e56..e23707d0273 100644
--- a/images/svg/gpsicons/fish.svg
+++ b/images/svg/gpsicons/fish.svg
@@ -1,4 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m48.741 308.752c0-1.601 80.855 110.199 193.197 110.199s170.559-52.08 187.207-63.763l76.11 52.553v-210.268l-77.471 57.262c-17.322-11.545-46.426-71.053-185.847-66.35-125.935 3.204-191.767 123.57-193.196 120.367z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m170.499 275.637c.003 9.807-7.941 17.761-17.748 17.764-9.807.005-17.758-7.942-17.763-17.748 0-.006 0-.01 0-.016-.005-9.804 7.941-17.758 17.748-17.76 9.806-.006 17.758 7.941 17.763 17.748 0 .005 0 .007 0 .012z" fill="param(fill) #000"/>
+<path d="m48.741 308.752c0-1.601 80.855 110.199 193.197 110.199s170.559-52.08 187.207-63.763l76.11 52.553v-210.268l-77.471 57.262c-17.322-11.545-46.426-71.053-185.847-66.35-125.935 3.204-191.767 123.57-193.196 120.367z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/flag.svg b/images/svg/gpsicons/flag.svg
index c05b9a3e592..f906b75438b 100644
--- a/images/svg/gpsicons/flag.svg
+++ b/images/svg/gpsicons/flag.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m231.846 472.572v-440.766h-22.18v440.557c-34.016 2.649-59.419 18.767-59.419 38.871 0 22.021 30.456 39.271 69.337 39.271 38.877 0 69.332-17.25 69.332-39.271.001-19.639-24.242-35.47-57.07-38.662z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m235.243 29.492l-1.52 178.136 196.026 2.701z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m231.846 472.572v-440.766h-22.18v440.557c-34.016 2.649-59.419 18.767-59.419 38.871 0 22.021 30.456 39.271 69.337 39.271 38.877 0 69.332-17.25 69.332-39.271.001-19.639-24.242-35.47-57.07-38.662z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m235.243 29.492l-1.52 178.136 196.026 2.701z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/food.svg b/images/svg/gpsicons/food.svg
index 2c91f3a239a..5097a592888 100644
--- a/images/svg/gpsicons/food.svg
+++ b/images/svg/gpsicons/food.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m232.579 71.326c-2.586 10.068-4.073 23.513-5.511 36.514-2.61 23.602-5.569 50.353-14.917 50.643-12.017 0-16.714-36.309-20.144-62.82-1.155-8.929-2.246-17.362-3.519-24.171l-2.488.464-2.411-.771c-3.806 11.907-5.843 26.804-7.813 41.209-3.098 22.658-6.302 46.088-15.848 46.089-9.426-.291-12.385-27.041-14.995-50.642-1.438-13.002-2.925-26.446-5.512-36.516l-4.93.12c-.736 3.581-18.03 88.099-18.03 123.57 0 18.31 11.618 37.836 22.854 56.719 11.262 18.926 22.907 38.496 22.907 56.631 0 16.751-.59 30.486-1.214 45.029-.766 17.836-1.633 38.051-1.633 68.315 0 29.445 2.313 58.973 6.349 81.011 5.094 27.817 12.174 41.34 21.646 41.34 9.351 0 16.634-13.677 21.646-40.649 4.036-21.716 6.351-50.997 6.351-80.337 0-30.312-1.705-50.969-3.21-69.194-1.224-14.817-2.38-28.813-2.38-45.515 0-18.135 11.646-37.705 22.907-56.631 11.235-18.883 22.854-38.409 22.854-56.719 0-35.472-17.294-119.989-18.03-123.57z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m443.7 386.017c-.354-13.346-.386-26.931-.416-40.069-.063-27.208-.127-55.34-3.063-83.077-1.092-69.589-2.185-139.179-3.271-208.765l-.042-2.7-2.692.217c-2.192.177-4.399.278-6.737.386-12.732.584-27.163 1.247-39.458 15.364-13.557 15.566-22.399 45.661-27.031 92.004l-.019.189.01.189c2.515 50.214 8.313 89.633 28.335 118.523-2.772 28.047-1.429 58.166-.128 87.305.432 9.683.84 18.829 1.104 27.859.147 41.13 2.9 78.9 7.75 106.354 5.658 32.032 13.415 47.604 23.713 47.606.001 0 .002 0 .003 0 .465 0 .938-.035 1.407-.103 2.863 0 5.474-1.2 7.758-3.567 15.73-16.301 15.091-92.86 12.777-157.715z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m232.579 71.326c-2.586 10.068-4.073 23.513-5.511 36.514-2.61 23.602-5.569 50.353-14.917 50.643-12.017 0-16.714-36.309-20.144-62.82-1.155-8.929-2.246-17.362-3.519-24.171l-2.488.464-2.411-.771c-3.806 11.907-5.843 26.804-7.813 41.209-3.098 22.658-6.302 46.088-15.848 46.089-9.426-.291-12.385-27.041-14.995-50.642-1.438-13.002-2.925-26.446-5.512-36.516l-4.93.12c-.736 3.581-18.03 88.099-18.03 123.57 0 18.31 11.618 37.836 22.854 56.719 11.262 18.926 22.907 38.496 22.907 56.631 0 16.751-.59 30.486-1.214 45.029-.766 17.836-1.633 38.051-1.633 68.315 0 29.445 2.313 58.973 6.349 81.011 5.094 27.817 12.174 41.34 21.646 41.34 9.351 0 16.634-13.677 21.646-40.649 4.036-21.716 6.351-50.997 6.351-80.337 0-30.312-1.705-50.969-3.21-69.194-1.224-14.817-2.38-28.813-2.38-45.515 0-18.135 11.646-37.705 22.907-56.631 11.235-18.883 22.854-38.409 22.854-56.719 0-35.472-17.294-119.989-18.03-123.57z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m443.7 386.017c-.354-13.346-.386-26.931-.416-40.069-.063-27.208-.127-55.34-3.063-83.077-1.092-69.589-2.185-139.179-3.271-208.765l-.042-2.7-2.692.217c-2.192.177-4.399.278-6.737.386-12.732.584-27.163 1.247-39.458 15.364-13.557 15.566-22.399 45.661-27.031 92.004l-.019.189.01.189c2.515 50.214 8.313 89.633 28.335 118.523-2.772 28.047-1.429 58.166-.128 87.305.432 9.683.84 18.829 1.104 27.859.147 41.13 2.9 78.9 7.75 106.354 5.658 32.032 13.415 47.604 23.713 47.606.001 0 .002 0 .003 0 .465 0 .938-.035 1.407-.103 2.863 0 5.474-1.2 7.758-3.567 15.73-16.301 15.091-92.86 12.777-157.715z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/gas.svg b/images/svg/gpsicons/gas.svg
index 28a9044fd36..7219a2ff9ae 100644
--- a/images/svg/gpsicons/gas.svg
+++ b/images/svg/gpsicons/gas.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m474.745 442.244c-.019-.663-.038-1.254-.039-1.77-.145-51.109-47.358-80.054-71.962-91.67l-1.613-146.978-69.726-58.711v-96.91h-226.23v487.584h226.23v-1.215c.376.001.762.008 1.136.008 59.265 0 99.231-11.302 122.063-34.484 21.112-21.437 20.406-46.441 20.141-55.854zm-185.593-348.634v105.627h-141.735v-105.627zm134.843 374.345c-8.114 8.24-30.886 21.834-92.59 21.665v-290.342l26.983 22.721 1.72 156.604 14.412 4.888c.571.194 57.122 20.399 57.225 57.102.003.829.026 1.789.057 2.864.192 6.797.454 16.108-7.807 24.498z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m474.745 442.244c-.019-.663-.038-1.254-.039-1.77-.145-51.109-47.358-80.054-71.962-91.67l-1.613-146.978-69.726-58.711v-96.91h-226.23v487.584h226.23v-1.215c.376.001.762.008 1.136.008 59.265 0 99.231-11.302 122.063-34.484 21.112-21.437 20.406-46.441 20.141-55.854zm-185.593-348.634v105.627h-141.735v-105.627zm134.843 374.345c-8.114 8.24-30.886 21.834-92.59 21.665v-290.342l26.983 22.721 1.72 156.604 14.412 4.888c.571.194 57.122 20.399 57.225 57.102.003.829.026 1.789.057 2.864.192 6.797.454 16.108-7.807 24.498z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/golf.svg b/images/svg/gpsicons/golf.svg
index 64b5d98d5a6..d23fa93aac7 100644
--- a/images/svg/gpsicons/golf.svg
+++ b/images/svg/gpsicons/golf.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m452.462 354.12c-41.711-17.62-96.268-27.667-154.382-28.521v-287.275h-20.46v287.352c-56.504 1.275-109.403 11.259-150.086 28.444-47.759 20.174-74.061 48.591-74.061 80.018 0 31.426 26.302 59.844 74.061 80.018 43.641 18.435 101.338 28.588 162.464 28.588s118.824-10.153 162.465-28.588c47.759-20.174 74.062-48.592 74.062-80.018-.001-31.428-26.304-59.845-74.063-80.018zm-162.464 158.529c-121.653 0-206.432-41.377-206.432-78.512 0-35.861 79.068-75.675 194.054-78.363v89.535h20.461v-89.615c117.307 1.783 198.35 42.138 198.35 78.443-.001 37.135-84.779 78.512-206.433 78.512z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m299.49 37.254v134.089l168.947-67.046z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m452.462 354.12c-41.711-17.62-96.268-27.667-154.382-28.521v-287.275h-20.46v287.352c-56.504 1.275-109.403 11.259-150.086 28.444-47.759 20.174-74.061 48.591-74.061 80.018 0 31.426 26.302 59.844 74.061 80.018 43.641 18.435 101.338 28.588 162.464 28.588s118.824-10.153 162.465-28.588c47.759-20.174 74.062-48.592 74.062-80.018-.001-31.428-26.304-59.845-74.063-80.018zm-162.464 158.529c-121.653 0-206.432-41.377-206.432-78.512 0-35.861 79.068-75.675 194.054-78.363v89.535h20.461v-89.615c117.307 1.783 198.35 42.138 198.35 78.443-.001 37.135-84.779 78.512-206.433 78.512z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m299.49 37.254v134.089l168.947-67.046z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/h.svg b/images/svg/gpsicons/h.svg
index d8dc0966a95..0da427f26a7 100644
--- a/images/svg/gpsicons/h.svg
+++ b/images/svg/gpsicons/h.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m288.496 44.248l-274.358 208.834v282.667h548.645l3.075-282.652zm239.293 456.124h-478.274v-229.759l239.096-181.994 241.678 181.979z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m134.097 349.789l-36.041-2.882-.501-34.988h-31.895v178.828h34.91v-75.419h351.089l.995 75.654h34.873v-145.938h-31.86l-.995 36.538-314.574-1.697z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m288.496 44.248l-274.358 208.834v282.667h548.645l3.075-282.652zm239.293 456.124h-478.274v-229.759l239.096-181.994 241.678 181.979z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m134.097 349.789l-36.041-2.882-.501-34.988h-31.895v178.828h34.91v-75.419h351.089l.995 75.654h34.873v-145.938h-31.86l-.995 36.538-314.574-1.697z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/house.svg b/images/svg/gpsicons/house.svg
index bf45168bb7a..ffe5aafb439 100644
--- a/images/svg/gpsicons/house.svg
+++ b/images/svg/gpsicons/house.svg
@@ -1,7 +1,7 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m157.748 273.439h316.255v234.997h-316.255z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m75.067 288.395l481.617 2.136-140.56-160.228h-206.7z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m327.993 329.424h115.758v179.012h-115.758z" fill="param(fill) #000" stroke="param(outline) #FFF" stroke-width="4.5136"/>
-<path d="m197.158 330.34h88.37v81.756h-88.37z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m311.279 87.369h90.859v44.026h-90.859z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m157.748 273.439h316.255v234.997h-316.255z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m75.067 288.395l481.617 2.136-140.56-160.228h-206.7z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m327.993 329.424h115.758v179.012h-115.758z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m197.158 330.34h88.37v81.756h-88.37z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m311.279 87.369h90.859v44.026h-90.859z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/parachute.svg b/images/svg/gpsicons/parachute.svg
index 8a6a7eaf6b7..ca71b6728c6 100644
--- a/images/svg/gpsicons/parachute.svg
+++ b/images/svg/gpsicons/parachute.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m486.968 249.016c.256.463-394.516.303-393.939 0 0-106.551 88.186-192.93 196.97-192.93 108.781 0 196.969 86.379 196.969 192.93z" fill="param(fill) #000" opacity=".25"/>
-<path d="m502.655 259.913l-3.586-3.336c.065-.104.135-.196.198-.305l1.98-3.358v-3.897c0-114.255-94.766-207.208-211.249-207.208-116.482 0-211.249 92.954-211.249 207.208v1.736l.415 1.685c.262 1.062.778 2.588 1.738 4.162l-3.562 3.313 146.401 157.35v121.314h136.695v-125.811zm-284.325 3.637l37.389 144.136h-2.63l.97-.902-133.38-143.354c12.123.027 27.656.053 45.471.074 15.804.018 33.504.034 52.18.046zm67.692 144.136l-37.385-144.118c23.515.012 47.758.018 71.124.018 4.977 0 9.872 0 14.69-.001l-37.381 144.102h-11.048zm150.15-144.168c8.62-.013 16.385-.027 23.104-.045l-131.023 140.824 36.504-140.72c27.871-.01 52.104-.03 71.415-.059zm-146.173-193.152c95.873 0 174.733 72.583 182.124 164.511-24.382.095-78.661.15-152.361.15-90.996 0-178.356-.083-211.884-.189 7.416-91.903 86.266-164.472 182.121-164.472zm41.107 438.879h-78.031v-72.227h78.031z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m486.968 249.016c.256.463-394.516.303-393.939 0 0-106.551 88.186-192.93 196.97-192.93 108.781 0 196.969 86.379 196.969 192.93z" fill="param(fill)" opacity=".25"/>
+<path d="m502.655 259.913l-3.586-3.336c.065-.104.135-.196.198-.305l1.98-3.358v-3.897c0-114.255-94.766-207.208-211.249-207.208-116.482 0-211.249 92.954-211.249 207.208v1.736l.415 1.685c.262 1.062.778 2.588 1.738 4.162l-3.562 3.313 146.401 157.35v121.314h136.695v-125.811zm-284.325 3.637l37.389 144.136h-2.63l.97-.902-133.38-143.354c12.123.027 27.656.053 45.471.074 15.804.018 33.504.034 52.18.046zm67.692 144.136l-37.385-144.118c23.515.012 47.758.018 71.124.018 4.977 0 9.872 0 14.69-.001l-37.381 144.102h-11.048zm150.15-144.168c8.62-.013 16.385-.027 23.104-.045l-131.023 140.824 36.504-140.72c27.871-.01 52.104-.03 71.415-.059zm-146.173-193.152c95.873 0 174.733 72.583 182.124 164.511-24.382.095-78.661.15-152.361.15-90.996 0-178.356-.083-211.884-.189 7.416-91.903 86.266-164.472 182.121-164.472zm41.107 438.879h-78.031v-72.227h78.031z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/parking.svg b/images/svg/gpsicons/parking.svg
index 1c310ba22f0..08b5c4a0f8e 100644
--- a/images/svg/gpsicons/parking.svg
+++ b/images/svg/gpsicons/parking.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m19.55 20.073v539.85h540.896v-539.85zm518.649 517.602h-496.4v-495.354h496.4z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m224.65 327.951h60.325c39.736 0 69.742-8.945 90.008-26.835 20.426-17.891 30.639-44.331 30.639-79.322 0-34.674-10.213-60.958-30.639-78.849-20.266-18.051-50.271-27.074-90.008-27.074h-108.3v354.582h47.975zm0-172.657h60.325c22.321 0 39.58 5.778 51.77 17.336 12.194 11.559 18.289 27.945 18.289 49.163 0 21.375-6.095 37.84-18.289 49.397-12.189 11.559-29.448 17.337-51.77 17.337h-60.325z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m19.55 20.073v539.85h540.896v-539.85zm518.649 517.602h-496.4v-495.354h496.4z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m224.65 327.951h60.325c39.736 0 69.742-8.945 90.008-26.835 20.426-17.891 30.639-44.331 30.639-79.322 0-34.674-10.213-60.958-30.639-78.849-20.266-18.051-50.271-27.074-90.008-27.074h-108.3v354.582h47.975zm0-172.657h60.325c22.321 0 39.58 5.778 51.77 17.336 12.194 11.559 18.289 27.945 18.289 49.163 0 21.375-6.095 37.84-18.289 49.397-12.189 11.559-29.448 17.337-51.77 17.337h-60.325z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/phone.svg b/images/svg/gpsicons/phone.svg
index 02dcae01f87..39994e64716 100644
--- a/images/svg/gpsicons/phone.svg
+++ b/images/svg/gpsicons/phone.svg
@@ -1,5 +1,5 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m528.901 139.101c-9.126-13.34-33.822-24.771-71.419-33.056-41.506-9.146-96.509-14.283-163.39-15.264-9.728-.48-19.745-.725-29.772-.725-46.731 0-94.885 5.201-135.591 14.646-39.076 9.066-66.344 21.104-74.853 33.04-21.535 26.169-28.923 98.123-6.516 141.842l.997 1.945 104.128-29.979-1.158-2.755c-5.914-14.064-19.028-53.017-8.836-64.208 9.413-10.331 90.746-18.499 143.178-21.473 1.898.021 33.947.398 66.807 2.785 60.462 4.392 71.054 11.636 72.802 14.546 8.046 13.396-2.723 54.929-7.551 69.801l-.856 2.637 116.726 32.434.832-2.326c17.675-49.449 15.319-111.278-5.528-143.89z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m387.214 252.36v-69.49h-33.401v60.773c-26.414-5.868-50.742-8.885-67.604-8.885-16.301 0-35.65 2.414-55.558 6.744v-58.632h-33.398v67.592c-2.308.74-4.606 1.498-6.888 2.283-27.701 9.536-66.307 26.789-92.922 54.842-43.634 46.597-36.703 133.859-34.426 162.534.276 3.473.536 6.753.463 7.452.087-.826 1.028-2.021 2.504-2.021v5.311c378.671 0 434.566 1.8 442.791 2.31l2.844 6.768 1.604-8.775c.053-.287 5.265-29.165 5.784-63.893.701-46.921-7.023-81.655-22.96-103.238-20.302-27.502-64.387-48.296-108.833-61.675zm-97.068 184.718c-65.296 0-118.418-31.104-118.418-69.338 0-38.23 53.122-69.334 118.418-69.334 65.295 0 118.416 31.104 118.416 69.334 0 38.233-53.121 69.338-118.416 69.338z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m337.238 335.598c-12.666-7.618-29.449-11.813-47.26-11.813s-34.594 4.195-47.26 11.813c-13.087 7.872-20.294 18.481-20.294 29.875s7.207 22.001 20.295 29.87c12.664 7.615 29.447 11.809 47.259 11.809s34.595-4.193 47.259-11.809c13.088-7.869 20.295-18.477 20.295-29.87s-7.207-22.003-20.294-29.875z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m528.901 139.101c-9.126-13.34-33.822-24.771-71.419-33.056-41.506-9.146-96.509-14.283-163.39-15.264-9.728-.48-19.745-.725-29.772-.725-46.731 0-94.885 5.201-135.591 14.646-39.076 9.066-66.344 21.104-74.853 33.04-21.535 26.169-28.923 98.123-6.516 141.842l.997 1.945 104.128-29.979-1.158-2.755c-5.914-14.064-19.028-53.017-8.836-64.208 9.413-10.331 90.746-18.499 143.178-21.473 1.898.021 33.947.398 66.807 2.785 60.462 4.392 71.054 11.636 72.802 14.546 8.046 13.396-2.723 54.929-7.551 69.801l-.856 2.637 116.726 32.434.832-2.326c17.675-49.449 15.319-111.278-5.528-143.89z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m387.214 252.36v-69.49h-33.401v60.773c-26.414-5.868-50.742-8.885-67.604-8.885-16.301 0-35.65 2.414-55.558 6.744v-58.632h-33.398v67.592c-2.308.74-4.606 1.498-6.888 2.283-27.701 9.536-66.307 26.789-92.922 54.842-43.634 46.597-36.703 133.859-34.426 162.534.276 3.473.536 6.753.463 7.452.087-.826 1.028-2.021 2.504-2.021v5.311c378.671 0 434.566 1.8 442.791 2.31l2.844 6.768 1.604-8.775c.053-.287 5.265-29.165 5.784-63.893.701-46.921-7.023-81.655-22.96-103.238-20.302-27.502-64.387-48.296-108.833-61.675zm-97.068 184.718c-65.296 0-118.418-31.104-118.418-69.338 0-38.23 53.122-69.334 118.418-69.334 65.295 0 118.416 31.104 118.416 69.334 0 38.233-53.121 69.338-118.416 69.338z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m337.238 335.598c-12.666-7.618-29.449-11.813-47.26-11.813s-34.594 4.195-47.26 11.813c-13.087 7.872-20.294 18.481-20.294 29.875s7.207 22.001 20.295 29.87c12.664 7.615 29.447 11.809 47.259 11.809s34.595-4.193 47.259-11.809c13.088-7.869 20.295-18.477 20.295-29.87s-7.207-22.003-20.294-29.875z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/plane.svg b/images/svg/gpsicons/plane.svg
index 828294f3e52..24e54283aa9 100644
--- a/images/svg/gpsicons/plane.svg
+++ b/images/svg/gpsicons/plane.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m548.001 366.048l-92.479-58.519v-14.999c0-14.438-10.072-26.144-22.484-26.144-8.735 0-16.299 5.79-20.024 14.243l-100.531-63.612v-147.495c0-14.439-10.062-26.148-22.484-26.148-12.418 0-22.485 11.709-22.485 26.148v147.496l-101.74 64.379c-3.597-8.869-11.354-15.01-20.349-15.01-12.418 0-22.484 11.705-22.484 26.144v15.97l-90.944 57.548c-6.506 4.117-9.509 12.037-7.365 19.433s8.915 12.484 16.615 12.484h226.268v67.148l-90.849 57.49c-2.858 1.808-4.178 5.287-3.236 8.535.941 3.249 3.917 5.484 7.299 5.484h218.546c3.381 0 6.357-2.235 7.299-5.484.941-3.248-.378-6.728-3.236-8.535l-90.853-57.49v-67.148h226.269c7.699 0 14.472-5.089 16.615-12.484s-.862-15.316-7.368-19.434z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m548.001 366.048l-92.479-58.519v-14.999c0-14.438-10.072-26.144-22.484-26.144-8.735 0-16.299 5.79-20.024 14.243l-100.531-63.612v-147.495c0-14.439-10.062-26.148-22.484-26.148-12.418 0-22.485 11.709-22.485 26.148v147.496l-101.74 64.379c-3.597-8.869-11.354-15.01-20.349-15.01-12.418 0-22.484 11.705-22.484 26.144v15.97l-90.944 57.548c-6.506 4.117-9.509 12.037-7.365 19.433s8.915 12.484 16.615 12.484h226.268v67.148l-90.849 57.49c-2.858 1.808-4.178 5.287-3.236 8.535.941 3.249 3.917 5.484 7.299 5.484h218.546c3.381 0 6.357-2.235 7.299-5.484.941-3.248-.378-6.728-3.236-8.535l-90.853-57.49v-67.148h226.269c7.699 0 14.472-5.089 16.615-12.484s-.862-15.316-7.368-19.434z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/point.svg b/images/svg/gpsicons/point.svg
index e156ec8232b..4d4118b7a98 100644
--- a/images/svg/gpsicons/point.svg
+++ b/images/svg/gpsicons/point.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m289.999 201.668c-48.705 0-88.329 39.625-88.329 88.33s39.624 88.329 88.329 88.329 88.329-39.624 88.329-88.329-39.624-88.33-88.329-88.33z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m289.999 201.668c-48.705 0-88.329 39.625-88.329 88.33s39.624 88.329 88.329 88.329 88.329-39.624 88.329-88.329-39.624-88.33-88.329-88.33z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/question.svg b/images/svg/gpsicons/question.svg
index 9d7c0d9ed26..32e15a3afdb 100644
--- a/images/svg/gpsicons/question.svg
+++ b/images/svg/gpsicons/question.svg
@@ -1,5 +1,5 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m-176.61-176.61v462.354h462.354v-462.354zm435 435h-407.647v-407.647h407.647z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m39.196 160.123c-11.713 0-20.863 4.245-27.451 12.741-5.857 6.877-8.784 13.95-8.784 21.23s2.562 14.354 7.687 21.231c7.32 8.49 16.835 12.74 28.549 12.74 12.445 0 21.958-4.25 28.549-12.74 5.859-6.474 8.786-13.548 8.786-21.231s-2.927-14.762-8.786-21.23c-7.324-8.496-16.839-12.741-28.55-12.741z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m56.763-61.906c35.14 0 52.707 11.93 52.707 35.792 0 11.728-4.757 22.242-14.274 31.544-4.396 4.449-16.104 13.346-35.14 26.692-33.671 23.457-50.509 55.611-50.509 96.455v4.245h61.496c2.195-21.433 10.61-39.629 25.251-54.593 5.859-6.07 19.031-15.775 39.53-29.122 17.572-11.324 29.281-21.433 35.135-30.332 6.591-11.324 9.889-27.5 9.889-48.53 0-25.075-9.522-45.497-28.554-61.27-21.958-18.604-54.536-27.904-97.726-27.904-56.366 0-98.458 13.547-126.277 40.642l34.042 43.679c27.817-18.197 59.293-27.298 94.43-27.298z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m-176.61-176.61v462.354h462.354v-462.354zm435 435h-407.647v-407.647h407.647z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m39.196 160.123c-11.713 0-20.863 4.245-27.451 12.741-5.857 6.877-8.784 13.95-8.784 21.23s2.562 14.354 7.687 21.231c7.32 8.49 16.835 12.74 28.549 12.74 12.445 0 21.958-4.25 28.549-12.74 5.859-6.474 8.786-13.548 8.786-21.231s-2.927-14.762-8.786-21.23c-7.324-8.496-16.839-12.741-28.55-12.741z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m56.763-61.906c35.14 0 52.707 11.93 52.707 35.792 0 11.728-4.757 22.242-14.274 31.544-4.396 4.449-16.104 13.346-35.14 26.692-33.671 23.457-50.509 55.611-50.509 96.455v4.245h61.496c2.195-21.433 10.61-39.629 25.251-54.593 5.859-6.07 19.031-15.775 39.53-29.122 17.572-11.324 29.281-21.433 35.135-30.332 6.591-11.324 9.889-27.5 9.889-48.53 0-25.075-9.522-45.497-28.554-61.27-21.958-18.604-54.536-27.904-97.726-27.904-56.366 0-98.458 13.547-126.277 40.642l34.042 43.679c27.817-18.197 59.293-27.298 94.43-27.298z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/shipwreck.svg b/images/svg/gpsicons/shipwreck.svg
index 3afdedb121c..b62684f9d1d 100644
--- a/images/svg/gpsicons/shipwreck.svg
+++ b/images/svg/gpsicons/shipwreck.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m200.219 415.273l189.988-179.146c0 0 39.525 102.376 11.1 139.92-1.923 2.542-45.411 40.047-45.411 40.047z" fill="param(fill) #000" opacity=".25"/>
-<path d="m484.083 383.822l-50.021.337c11.641-23.316 12.918-55.805 3.945-98.751-6.787-32.485-17.251-59.759-17.693-60.904l-17.301-44.811-124.717 117.6-111.748-124.894-55.283 49.471 113.04 126.334-39.917 37.638-88.91.6.436 64.545 388.605-2.619zm-109.257-85.213c7.024 33.62 4.365 50.992 1.491 56.732-5.027 4.605-18.508 16.411-32.363 28.416l-62.916-.332 93.143-87.827c.219.998.434 2.001.645 3.011z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m200.219 415.273l189.988-179.146c0 0 39.525 102.376 11.1 139.92-1.923 2.542-45.411 40.047-45.411 40.047z" fill="param(fill)" opacity=".25"/>
+<path d="m484.083 383.822l-50.021.337c11.641-23.316 12.918-55.805 3.945-98.751-6.787-32.485-17.251-59.759-17.693-60.904l-17.301-44.811-124.717 117.6-111.748-124.894-55.283 49.471 113.04 126.334-39.917 37.638-88.91.6.436 64.545 388.605-2.619zm-109.257-85.213c7.024 33.62 4.365 50.992 1.491 56.732-5.027 4.605-18.508 16.411-32.363 28.416l-62.916-.332 93.143-87.827c.219.998.434 2.001.645 3.011z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/skier.svg b/images/svg/gpsicons/skier.svg
index 9ff1bb92a67..482a1925846 100644
--- a/images/svg/gpsicons/skier.svg
+++ b/images/svg/gpsicons/skier.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m272.738 188.268l-50.579 37.794h-139.195l-75.481-224.39 170.512-1.391v-25.896l-249.285-1.433 78.75 253.11h-203.944l4.048 20.337 2.027.007c.667.003 67.587.223 147.219.223.017 0 .005 0 .021 0 273.485 0 277.928-2.416 279.59-3.326 7.721-4.229 65.217-47.296 67.66-49.128l5.509-4.128z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<ellipse cx="-34.998" cy="-86.774" fill="param(fill) #000" rx="45.167" ry="48.242" stroke="param(outline) #FFF" stroke-width="param(outline-width) 0"/>
+<path d="m272.738 188.268l-50.579 37.794h-139.195l-75.481-224.39 170.512-1.391v-25.896l-249.285-1.433 78.75 253.11h-203.944l4.048 20.337 2.027.007c.667.003 67.587.223 147.219.223.017 0 .005 0 .021 0 273.485 0 277.928-2.416 279.59-3.326 7.721-4.229 65.217-47.296 67.66-49.128l5.509-4.128z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<ellipse cx="-34.998" cy="-86.774" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/skull.svg b/images/svg/gpsicons/skull.svg
index dff3c2b521e..0020e86cd23 100644
--- a/images/svg/gpsicons/skull.svg
+++ b/images/svg/gpsicons/skull.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m271.478 213.915c-7.806 1.643-13.659 4.762-20.979 2.961-4.306-2.423-16.14-14.813-109.26-91.667 4.608-3.242 13.871-9.661 15.224-10.997 5.893-5.843 16.064-9.581 22.268-15.449 24.027-22.729 17.648-62.884 17.648-93.532 0-4.225-2.755-18.431-5.849-21.566-7.455-7.57-14.861-14.786-23.111-21.381 74.664-61.943 79.088-67.779 83.08-70.021 7.319-1.805 13.173 1.316 20.979 2.958 7.481 1.641 25.69-6.077 27.318-13.799 1.461-2.299-1.952-15.44-11.711-23.16-13.168-1.97-14.629 6.406-26.335 0-8.617-7.393-8.46-20.204-16.104-28.089-4.55-4.764-19.351-7.555-24.388-1.972-6.67 5.258 2.765 20.863 1.466 30.061 0 0-6.469 22.827-81.006 86.257-7.1-3.831-15.209-6.884-30.575-10.457-7.718-2.425-92.238-3.168-109.921 0-15.909 3.7-24.041 6.841-31.325 10.866-74.99-63.739-81.486-86.666-81.486-86.666-1.301-9.198 8.131-24.803 1.463-30.061-5.039-5.583-19.837-2.792-24.389 1.972-7.644 7.885-7.479 20.696-16.099 28.089-11.707 6.406-13.17-1.97-26.34 0-9.756 7.72-13.172 20.86-11.709 23.16 1.628 7.722 19.839 15.44 27.318 13.799 7.804-1.643 13.66-4.764 20.976-2.958 3.95 2.218 10.905 10.08 83.7 70.519-8.002 6.46-15.228 13.502-22.499 20.883-3.091 3.135-5.846 17.341-5.846 21.566 0 30.648-6.377 70.803 17.648 93.532 6.202 5.868 16.372 9.606 22.27 15.449 1.289 1.274 9.775 7.175 14.555 10.529-93.641 77.276-105.511 89.707-109.828 92.135-7.316 1.801-13.172-1.318-20.976-2.961-7.479-1.643-25.69 6.08-27.318 13.802-1.463 2.297 1.953 15.435 11.709 23.157 13.17 1.968 14.633-6.404 26.34 0 8.62 7.393 8.455 20.206 16.099 28.086 4.552 4.767 19.35 7.556 24.389 1.978 6.667-5.263-2.764-20.865-1.463-30.063 0 0 7.168-25.301 93.398-96.653.423 4.21.703 8.916 1.071 14.423.571 8.543 4.673 22.95 8.822 30.417 2.009 3.62 6.792 8.647 6.665 11.155-.26 5.105 11.353 13.389 15.022 15.996 13.619 9.696 25.541 11.828 42.794 11.852 17.257-.023 29.178-2.155 42.797-11.852 3.669-2.607 15.277-10.891 15.021-15.996-.128-2.508 4.653-7.535 6.66-11.155 4.151-7.467 8.254-21.874 8.824-30.417.341-5.101.608-9.511.98-13.479 85.161 70.638 92.259 95.71 92.259 95.71 1.299 9.198-8.136 24.801-1.466 30.063 5.037 5.578 19.838 2.789 24.388-1.978 7.644-7.88 7.486-20.693 16.104-28.086 11.706-6.404 13.167 1.968 26.335 0 9.759-7.723 13.172-20.86 11.711-23.157-1.628-7.723-19.837-15.446-27.318-13.803zm-242.97-170.287c-4.655 11.834-22.771 19.773-37.072 17.742-31.879-4.537-47.436-24.695-42.926-37.451 5.243-14.84 16.035-39.423 31.219-39.423 33.169-1.971 64.288 19.716 48.779 59.132zm52.118 0c-15.508-39.416 15.613-61.103 48.78-59.132 15.184 0 25.976 24.583 31.219 39.421 4.516 12.759-11.047 32.916-42.926 37.453-14.298 2.031-32.419-5.91-37.073-17.742z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m55.462 238.065c-.095 0-.185-.002-.279-.002s-.184.002-.279.002z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m271.478 213.915c-7.806 1.643-13.659 4.762-20.979 2.961-4.306-2.423-16.14-14.813-109.26-91.667 4.608-3.242 13.871-9.661 15.224-10.997 5.893-5.843 16.064-9.581 22.268-15.449 24.027-22.729 17.648-62.884 17.648-93.532 0-4.225-2.755-18.431-5.849-21.566-7.455-7.57-14.861-14.786-23.111-21.381 74.664-61.943 79.088-67.779 83.08-70.021 7.319-1.805 13.173 1.316 20.979 2.958 7.481 1.641 25.69-6.077 27.318-13.799 1.461-2.299-1.952-15.44-11.711-23.16-13.168-1.97-14.629 6.406-26.335 0-8.617-7.393-8.46-20.204-16.104-28.089-4.55-4.764-19.351-7.555-24.388-1.972-6.67 5.258 2.765 20.863 1.466 30.061 0 0-6.469 22.827-81.006 86.257-7.1-3.831-15.209-6.884-30.575-10.457-7.718-2.425-92.238-3.168-109.921 0-15.909 3.7-24.041 6.841-31.325 10.866-74.99-63.739-81.486-86.666-81.486-86.666-1.301-9.198 8.131-24.803 1.463-30.061-5.039-5.583-19.837-2.792-24.389 1.972-7.644 7.885-7.479 20.696-16.099 28.089-11.707 6.406-13.17-1.97-26.34 0-9.756 7.72-13.172 20.86-11.709 23.16 1.628 7.722 19.839 15.44 27.318 13.799 7.804-1.643 13.66-4.764 20.976-2.958 3.95 2.218 10.905 10.08 83.7 70.519-8.002 6.46-15.228 13.502-22.499 20.883-3.091 3.135-5.846 17.341-5.846 21.566 0 30.648-6.377 70.803 17.648 93.532 6.202 5.868 16.372 9.606 22.27 15.449 1.289 1.274 9.775 7.175 14.555 10.529-93.641 77.276-105.511 89.707-109.828 92.135-7.316 1.801-13.172-1.318-20.976-2.961-7.479-1.643-25.69 6.08-27.318 13.802-1.463 2.297 1.953 15.435 11.709 23.157 13.17 1.968 14.633-6.404 26.34 0 8.62 7.393 8.455 20.206 16.099 28.086 4.552 4.767 19.35 7.556 24.389 1.978 6.667-5.263-2.764-20.865-1.463-30.063 0 0 7.168-25.301 93.398-96.653.423 4.21.703 8.916 1.071 14.423.571 8.543 4.673 22.95 8.822 30.417 2.009 3.62 6.792 8.647 6.665 11.155-.26 5.105 11.353 13.389 15.022 15.996 13.619 9.696 25.541 11.828 42.794 11.852 17.257-.023 29.178-2.155 42.797-11.852 3.669-2.607 15.277-10.891 15.021-15.996-.128-2.508 4.653-7.535 6.66-11.155 4.151-7.467 8.254-21.874 8.824-30.417.341-5.101.608-9.511.98-13.479 85.161 70.638 92.259 95.71 92.259 95.71 1.299 9.198-8.136 24.801-1.466 30.063 5.037 5.578 19.838 2.789 24.388-1.978 7.644-7.88 7.486-20.693 16.104-28.086 11.706-6.404 13.167 1.968 26.335 0 9.759-7.723 13.172-20.86 11.711-23.157-1.628-7.723-19.837-15.446-27.318-13.803zm-242.97-170.287c-4.655 11.834-22.771 19.773-37.072 17.742-31.879-4.537-47.436-24.695-42.926-37.451 5.243-14.84 16.035-39.423 31.219-39.423 33.169-1.971 64.288 19.716 48.779 59.132zm52.118 0c-15.508-39.416 15.613-61.103 48.78-59.132 15.184 0 25.976 24.583 31.219 39.421 4.516 12.759-11.047 32.916-42.926 37.453-14.298 2.031-32.419-5.91-37.073-17.742z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m55.462 238.065c-.095 0-.185-.002-.279-.002s-.184.002-.279.002z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/swimmer.svg b/images/svg/gpsicons/swimmer.svg
index 331935bd7d0..a78d23b88bb 100644
--- a/images/svg/gpsicons/swimmer.svg
+++ b/images/svg/gpsicons/swimmer.svg
@@ -1,5 +1,5 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m24.821 395.411h530.354c0 0-22.014-71.586-48.723-70.197-28.096 1.458-30.599 43.988-52.263 43.988-23.088 0-26.943-43.988-54.96-43.988s-26.764 44.317-50.605 43.988c-23.786-.33-32.161-45.297-56.617-43.988-25.837 1.383-26.471 44.313-48.949 43.988-22.541-.33-33.883-43.918-58.271-43.988-24.355-.075-23.027 45.371-47.294 43.988-24.318-1.389-32.404-43.988-59.929-43.988-28.908-.001-52.743 75.08-52.743 70.197z" fill="param(fill) #000" opacity=".25"/>
-<path d="m179.191 286.292c37.86-11.531 51.489-19.769 68.149-24.71 16.657 3.293 30.289 11.531 30.289 11.531s-8.347 15.882-70.875 64.575c11.796 12.931 21.699 31.3 36.304 31.514 22.479.324 23.112-42.605 48.949-43.988 18.545-.992 27.844 24.619 41.627 37.205 9.062-9.833 8.958-10.936 24.255-26.707 6.563 3.845 5.554 10.986 12.115 14.832.067.229.131.434.197.651 5.621-9.957 11.017-21.035 21.392-24.714-1.975-3.905-4.12-7.977-6.441-12.185-16.655-21.415-7.571-19.77-25.744-34.595 16.66-3.845 33.32 2.195 48.462-19.769 12.62-31.85 8.58-42.285-10.603-64.249-20.19-15.376-28.271-14.277-60.572-1.647-24.232 31.3-13.635 32.948-16.661 52.718 0 0-6.063 0-18.179-4.942-12.112-4.941-16.654-14.827-43.915-14.827-27.26 0-37.86 11.531-80.265 26.358-42.402 14.825-51.489 36.242-51.489 36.242l16.658 13.18c0 0 19.689-4.939 36.347-16.473z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
-<path d="m24.821 395.411h530.354c0 0-22.014-71.586-48.723-70.197-28.096 1.458-30.599 43.988-52.263 43.988-23.088 0-26.943-43.988-54.96-43.988s-26.764 44.317-50.605 43.988c-23.786-.33-32.161-45.297-56.617-43.988-25.837 1.383-26.471 44.313-48.949 43.988-22.541-.33-33.883-43.918-58.271-43.988-24.355-.075-23.027 45.371-47.294 43.988-24.318-1.389-32.404-43.988-59.929-43.988-28.908-.001-52.743 75.08-52.743 70.197z" fill="none" stroke="param(outline) #FFF" stroke-width="param(outline-width) 0"/>
+<path d="m24.821 395.411h530.354c0 0-22.014-71.586-48.723-70.197-28.096 1.458-30.599 43.988-52.263 43.988-23.088 0-26.943-43.988-54.96-43.988s-26.764 44.317-50.605 43.988c-23.786-.33-32.161-45.297-56.617-43.988-25.837 1.383-26.471 44.313-48.949 43.988-22.541-.33-33.883-43.918-58.271-43.988-24.355-.075-23.027 45.371-47.294 43.988-24.318-1.389-32.404-43.988-59.929-43.988-28.908-.001-52.743 75.08-52.743 70.197z" fill="param(fill)" opacity=".25"/>
+<path d="m179.191 286.292c37.86-11.531 51.489-19.769 68.149-24.71 16.657 3.293 30.289 11.531 30.289 11.531s-8.347 15.882-70.875 64.575c11.796 12.931 21.699 31.3 36.304 31.514 22.479.324 23.112-42.605 48.949-43.988 18.545-.992 27.844 24.619 41.627 37.205 9.062-9.833 8.958-10.936 24.255-26.707 6.563 3.845 5.554 10.986 12.115 14.832.067.229.131.434.197.651 5.621-9.957 11.017-21.035 21.392-24.714-1.975-3.905-4.12-7.977-6.441-12.185-16.655-21.415-7.571-19.77-25.744-34.595 16.66-3.845 33.32 2.195 48.462-19.769 12.62-31.85 8.58-42.285-10.603-64.249-20.19-15.376-28.271-14.277-60.572-1.647-24.232 31.3-13.635 32.948-16.661 52.718 0 0-6.063 0-18.179-4.942-12.112-4.941-16.654-14.827-43.915-14.827-27.26 0-37.86 11.531-80.265 26.358-42.402 14.825-51.489 36.242-51.489 36.242l16.658 13.18c0 0 19.689-4.939 36.347-16.473z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
+<path d="m24.821 395.411h530.354c0 0-22.014-71.586-48.723-70.197-28.096 1.458-30.599 43.988-52.263 43.988-23.088 0-26.943-43.988-54.96-43.988s-26.764 44.317-50.605 43.988c-23.786-.33-32.161-45.297-56.617-43.988-25.837 1.383-26.471 44.313-48.949 43.988-22.541-.33-33.883-43.918-58.271-43.988-24.355-.075-23.027 45.371-47.294 43.988-24.318-1.389-32.404-43.988-59.929-43.988-28.908-.001-52.743 75.08-52.743 70.197z" fill="none" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/table.svg b/images/svg/gpsicons/table.svg
index c11c754883d..d6f0bfc9c79 100644
--- a/images/svg/gpsicons/table.svg
+++ b/images/svg/gpsicons/table.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new -235.433 -235.433 579.997 579.997" height="579.997" viewBox="-235.433 -235.433 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m310.202 29.101h-100.152v25.606h-35.652l-33.456-106.708h87.254v-31.235h-346.558v31.235h96.864l-33.881 106.708h-40.428v-25.606h-100.146v29.04h49.486v29.612h80.595l-34.653 109.136 44.12-.011 35.725-109.125h160.814l35.724 109.125 43.118.011-34.218-109.137h84.379v-29.612h41.064v-29.039zm-320.065 25.606l34.934-106.708h69.313l34.933 106.708z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m310.202 29.101h-100.152v25.606h-35.652l-33.456-106.708h87.254v-31.235h-346.558v31.235h96.864l-33.881 106.708h-40.428v-25.606h-100.146v29.04h49.486v29.612h80.595l-34.653 109.136 44.12-.011 35.725-109.125h160.814l35.724 109.125 43.118.011-34.218-109.137h84.379v-29.612h41.064v-29.039zm-320.065 25.606l34.934-106.708h69.313l34.933 106.708z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/teepee.svg b/images/svg/gpsicons/teepee.svg
index 25cd2e4d938..34dc1e258a4 100644
--- a/images/svg/gpsicons/teepee.svg
+++ b/images/svg/gpsicons/teepee.svg
@@ -1,4 +1,4 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m284.318 317.942l-92.215 200.935h195.956z" fill="param(fill) #000" opacity=".25"/>
-<path d="m307.871 114.845l31.587-58.106-23.434-15.471-23.711 44.841-21.637-45.007-21.062 15.644 24.788 55.801-213.653 403.406-1.55 2.924h132.904l92.215-200.935 103.741 200.935h132.732z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m284.318 317.942l-92.215 200.935h195.956z" fill="param(fill)" opacity=".25"/>
+<path d="m307.871 114.845l31.587-58.106-23.434-15.471-23.711 44.841-21.637-45.007-21.062 15.644 24.788 55.801-213.653 403.406-1.55 2.924h132.904l92.215-200.935 103.741 200.935h132.732z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/tree.svg b/images/svg/gpsicons/tree.svg
index a14f18916b4..659651be9af 100644
--- a/images/svg/gpsicons/tree.svg
+++ b/images/svg/gpsicons/tree.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m422.766 349.508h54.446l-81.578-117.573h41.603l-147.419-212.718-147.238 212.899h41.421l-81.397 117.574h54.446l-85.557 123.724h163.337v87.366h110.157v-87.547h163.517z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m422.766 349.508h54.446l-81.578-117.573h41.603l-147.419-212.718-147.238 212.899h41.421l-81.397 117.574h54.446l-85.557 123.724h163.337v87.366h110.157v-87.547h163.517z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/walker.svg b/images/svg/gpsicons/walker.svg
index b42d62c38c0..8672e748548 100644
--- a/images/svg/gpsicons/walker.svg
+++ b/images/svg/gpsicons/walker.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m402.9 318.249l62.95-20.439-64.764-199.452-70.397 22.857 7.519 23.154c-5.28-4.731-11.488-10.002-19.134-17.161l-8.139 2.335c10.291-9.652 16.694-23.146 16.694-38.09 0-29.34-24.645-53.123-55.041-53.123-30.397 0-55.039 23.783-55.039 53.123 0 25.845 19.124 47.369 44.457 52.132l-11.376 3.265c-24.238 33.205-39.924 77.633-64.163 95.404-19.012 12.158-27.364 8.887-52.08 11.225l-.111-44.896h-19.82l-.309 330.42 19.498.465.631-241.096c38.498-.934 52.191-3.271 76.431-7.012 23.29-7.484 36.598-21.98 55.609-35.076l9.816 67.461c0 0-94.783 214.506-83.961 215.939 25.754 3.42 58.128 1.375 58.128 1.375s67.089-172.41 89.607-172.094c21.149.316 58.031 170.621 58.031 170.621h56.104l-47.825-206.811c-1.166-5.108-2.269-9.941-3.316-14.526z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m402.9 318.249l62.95-20.439-64.764-199.452-70.397 22.857 7.519 23.154c-5.28-4.731-11.488-10.002-19.134-17.161l-8.139 2.335c10.291-9.652 16.694-23.146 16.694-38.09 0-29.34-24.645-53.123-55.041-53.123-30.397 0-55.039 23.783-55.039 53.123 0 25.845 19.124 47.369 44.457 52.132l-11.376 3.265c-24.238 33.205-39.924 77.633-64.163 95.404-19.012 12.158-27.364 8.887-52.08 11.225l-.111-44.896h-19.82l-.309 330.42 19.498.465.631-241.096c38.498-.934 52.191-3.271 76.431-7.012 23.29-7.484 36.598-21.98 55.609-35.076l9.816 67.461c0 0-94.783 214.506-83.961 215.939 25.754 3.42 58.128 1.375 58.128 1.375s67.089-172.41 89.607-172.094c21.149.316 58.031 170.621 58.031 170.621h56.104l-47.825-206.811c-1.166-5.108-2.269-9.941-3.316-14.526z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/gpsicons/waypoint.svg b/images/svg/gpsicons/waypoint.svg
index 0186fb59a18..aa2be832ca6 100644
--- a/images/svg/gpsicons/waypoint.svg
+++ b/images/svg/gpsicons/waypoint.svg
@@ -1,3 +1,3 @@
 <svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
-<path d="m122.431 124.665h335.134v330.667h-335.134z" fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0"/>
+<path d="m122.431 124.665h335.134v330.667h-335.134z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/sport/sport_soccer.svg b/images/svg/sport/sport_soccer.svg
index ccbbb6e436b..eb331b24dcd 100644
--- a/images/svg/sport/sport_soccer.svg
+++ b/images/svg/sport/sport_soccer.svg
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="svg2" 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape" sodipodi:docbase="s:\Data\FacilityIcons" sodipodi:docname="socker.svg" inkscape:version="0.46" sodipodi:version="0.32"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="580px" height="580px"
-	 viewBox="0 0 580 580" enable-background="new 0 0 580 580" xml:space="preserve">
-<sodipodi:namedview  showgrid="false" inkscape:cy="55.113521" inkscape:cx="-138.99905" inkscape:zoom="0.46083856" pagecolor="#ffffff" bordercolor="#666666" guidetolerance="10.0" objecttolerance="10.0" gridtolerance="10.0" borderopacity="1.0" id="base" inkscape:current-layer="svg2" inkscape:window-y="13" inkscape:window-x="11" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-width="1048" inkscape:window-height="947">
-	</sodipodi:namedview>
-<defs>
-	
-	
-		<inkscape:perspective  inkscape:vp_z="580 : 290 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 290 : 1" sodipodi:type="inkscape:persp3d" id="perspective2441" inkscape:persp3d-origin="290 : 193.33333 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="60 : 30 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 30 : 1" sodipodi:type="inkscape:persp3d" id="perspective3452" inkscape:persp3d-origin="30 : 20 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 526.18109 : 1" sodipodi:type="inkscape:persp3d" id="perspective4471" inkscape:persp3d-origin="372.04724 : 350.78739 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="12 : 6 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 6 : 1" sodipodi:type="inkscape:persp3d" id="perspective4668" inkscape:persp3d-origin="6 : 4 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="32 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 16 : 1" sodipodi:type="inkscape:persp3d" id="perspective4904" inkscape:persp3d-origin="16 : 10.666667 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="32 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 16 : 1" sodipodi:type="inkscape:persp3d" id="perspective5233" inkscape:persp3d-origin="16 : 10.666667 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="500 : 250 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 250 : 1" sodipodi:type="inkscape:persp3d" id="perspective5412" inkscape:persp3d-origin="250 : 166.66667 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="405.71429 : 204.28572 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 204.28572 : 1" sodipodi:type="inkscape:persp3d" id="perspective5571" inkscape:persp3d-origin="202.85715 : 136.19048 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="128 : 64 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 64 : 1" sodipodi:type="inkscape:persp3d" id="perspective6552" inkscape:persp3d-origin="64 : 42.666667 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="477 : 171.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 171.5 : 1" sodipodi:type="inkscape:persp3d" id="perspective8761" inkscape:persp3d-origin="238.5 : 114.33333 : 1">
-		</inkscape:perspective>
-	
-		<inkscape:perspective  inkscape:vp_z="105.66 : 50.309502 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 50.309502 : 1" sodipodi:type="inkscape:persp3d" id="perspective10479" inkscape:persp3d-origin="52.830002 : 33.539668 : 1">
-		</inkscape:perspective>
-</defs>
-<g id="layer3" transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)" inkscape:label="Layout" display="none">
-	<rect id="rect4134" x="1" y="1" display="inline" fill="none" stroke="#757575" stroke-width="0.1" width="10" height="10"/>
-	<rect id="rect4136" x="2" y="2" display="inline" fill="none" stroke="#757575" stroke-width="0.1" width="8" height="8"/>
-</g>
-<path fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0" d="M291.688,37.219c-148.497,0-269.03,114.776-269.03,256.188
-	c0,141.406,120.529,256.156,269.03,256.156c148.503,0,269.031-114.75,269.031-256.156
-	C560.719,151.995,440.185,37.219,291.688,37.219z M345.219,108.563L411.25,83.25l72.25,59.25l-20.344,74.094l-66.031,9.875
-	l-61.781-61.781L345.219,108.563z M190.093,78.313L271.5,58.5l56.125,46.406l-14.844,59.219l-62.344,28.969l-78.875-20.906
-	l-11.719-48.219L190.093,78.313z M118.406,119.031c3.851-4.951,7.878-9.743,13.563-13.594c5.684-4.401,11.365-7.886,19.25-11.187
-	c-2.567,10.086-5.147,20.195-7.531,30.281l-36.313,9.344C110.309,128.557,114.005,123.616,118.406,119.031z M70.719,399.407
-	c-5.868,2.379-11.382-3.855-17.25-16.688c-6.418-13.938-15.035-42.001-17.969-62.906c-2.75-21.094-2.57-41.623,1.281-62.344
-	l38.344,12.281l20.344,85.094L70.719,399.407z M95.468,259.845l67.313-68.376l72.781,20.344l18.531,78.844l-75.906,58.688
-	l-66.031-1.844L95.468,259.845z M353.501,531.812c-15.221,2.212-30.647,3.853-46.969,4.22c-16.871,0.367-34.835-0.016-51.156-1.845
-	c-17.421-2.566-33.567-7.159-47.688-11.75c-14.12-4.945-24.933-10.434-34.469-17.219l-1.281-24.75l48.781-37.062l109.313,19.28
-	l31.344,48.031L353.501,531.812z M332.219,449.656l-103.063-21.625l-33.938-67.875l73.532-54.281l82.719,21.656l26.406,62.156
-	L332.219,449.656z M394,377.031l-23.469-53.719l39.438-75.938l62.345-11.186l37.03,62.375l-51.155,84.531L394,377.031z
-	 M522.374,396.656c-6.229,12.465-11.93,21.287-18.531,27.155l-29.688-34.499l51.875-87.656l18.001-9.906
-	c0.184,21.271-1.484,39.246-4.97,57.406C534.844,367.123,528.604,383.453,522.374,396.656z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="580px" height="580px" enable-background="new 0 0 580 580" version="1.1" viewBox="0 0 580 580" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<path d="m291.69 37.219c-148.5 0-269.03 114.78-269.03 256.19 0 141.41 120.53 256.16 269.03 256.16 148.5 0 269.03-114.75 269.03-256.16 0-141.41-120.53-256.19-269.03-256.19zm53.531 71.344 66.031-25.313 72.25 59.25-20.344 74.094-66.031 9.875-61.781-61.781 9.875-56.125zm-155.13-30.25 81.407-19.813 56.125 46.406-14.844 59.219-62.344 28.969-78.875-20.906-11.719-48.219 30.25-45.656zm-71.687 40.718c3.851-4.951 7.878-9.743 13.563-13.594 5.684-4.401 11.365-7.886 19.25-11.187-2.567 10.086-5.147 20.195-7.531 30.281l-36.313 9.344c2.934-5.318 6.63-10.259 11.031-14.844zm-47.687 280.38c-5.868 2.379-11.382-3.855-17.25-16.688-6.418-13.938-15.035-42.001-17.969-62.906-2.75-21.094-2.57-41.623 1.281-62.344l38.344 12.281 20.344 85.094-24.75 44.563zm24.749-139.56 67.313-68.376 72.781 20.344 18.531 78.844-75.906 58.688-66.031-1.844-16.688-87.656zm258.03 271.97c-15.221 2.212-30.647 3.853-46.969 4.22-16.871 0.367-34.835-0.016-51.156-1.845-17.421-2.566-33.567-7.159-47.688-11.75-14.12-4.945-24.933-10.434-34.469-17.219l-1.281-24.75 48.781-37.062 109.31 19.28 31.344 48.031-7.875 21.095zm-21.282-82.156-103.06-21.625-33.938-67.875 73.532-54.281 82.719 21.656 26.406 62.156-45.656 59.969zm61.781-72.625-23.469-53.719 39.438-75.938 62.345-11.186 37.03 62.375-51.155 84.531-64.189-6.063zm128.37 19.625c-6.229 12.465-11.93 21.287-18.531 27.155l-29.688-34.499 51.875-87.656 18.001-9.906c0.184 21.271-1.484 39.246-4.97 57.406-4.217 17.967-10.457 34.297-16.687 47.5z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
 </svg>
diff --git a/images/svg/wind_roses/WindRose_01.svg b/images/svg/wind_roses/WindRose_01.svg
index 2b614aabafd..b1611d02341 100644
--- a/images/svg/wind_roses/WindRose_01.svg
+++ b/images/svg/wind_roses/WindRose_01.svg
@@ -4,7 +4,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="580px" height="580px" viewBox="0 0 580 580" enable-background="new 0 0 580 580" xml:space="preserve">
 <title>clean</title>
-<polygon fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0" points="344.854,317.758 426.08,304.489 562.047,282.276 
+<polygon fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)" points="344.854,317.758 426.08,304.489 562.047,282.276 
 	425.904,263.329 343.362,251.842 370.658,220.716 439.728,141.951 358.554,203.564 325.2,228.88 313.376,154.033 291.878,17.951 
 	272.216,153.994 260.197,237.154 222.635,207.626 140.278,142.881 206.158,220.632 234.192,253.718 154.391,264.888 17.952,283.989 
 	153.627,306.041 233.75,319.063 215.632,339.725 146.561,418.488 227.737,356.876 259.832,332.517 272.352,425.511 290.734,562.049 
diff --git a/images/svg/wind_roses/WindRose_02.svg b/images/svg/wind_roses/WindRose_02.svg
index 722a77f3443..8a307f8c3c7 100644
--- a/images/svg/wind_roses/WindRose_02.svg
+++ b/images/svg/wind_roses/WindRose_02.svg
@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="580px" height="580px" viewBox="0 0 580 580" enable-background="new 0 0 580 580" xml:space="preserve">
-<polygon fill="param(fill) #000" fill-opacity="255" stroke="param(outline) #FFF" stroke-opacity="255" stroke-width="param(outline-width) 0" points="308.892,271.471 292.133,32.915 287.867,32.915 
+<polygon fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)" points="308.892,271.471 292.133,32.915 287.867,32.915 
 	271.116,271.471 27.118,287.865 27.118,292.131 271.116,308.52 287.867,547.085 292.133,547.085 308.892,308.52 552.882,292.131 
 	552.882,287.865 "/>
 </svg>
diff --git a/tests/src/python/test_selective_masking.py b/tests/src/python/test_selective_masking.py
index b847b37ad36..0531dca8cc5 100644
--- a/tests/src/python/test_selective_masking.py
+++ b/tests/src/python/test_selective_masking.py
@@ -1326,6 +1326,8 @@ class TestSelectiveMasking(QgisTestCase):
 
         sl = QgsSvgMarkerSymbolLayer(svgPath, 5)
         sl.setFillColor(QColor("blue"))
+        sl.setStrokeColor(QColor("white"))
+        sl.setStrokeWidth(0)
 
         p = QgsMarkerSymbol()
         p.changeSymbolLayer(0, sl)