diff --git a/icons/ambulance.svg b/icons/ambulance.svg
index 7e08bedb20..c192da79ce 100644
--- a/icons/ambulance.svg
+++ b/icons/ambulance.svg
@@ -11,9 +11,10 @@
 >
   <path d="M10 10H6" />
   <path d="M14 18V6a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v11a1 1 0 0 0 1 1h2" />
-  <path d="M19 18h2a1 1 0 0 0 1-1v-3.28a1 1 0 0 0-.684-.948l-1.923-.641a1 1 0 0 1-.578-.502l-1.539-3.076A1 1 0 0 0 16.382 8H14" />
+  <path
+    d="M19 18h2a1 1 0 0 0 1-1v-3.28a1 1 0 0 0-.684-.948l-1.923-.641a1 1 0 0 1-.578-.502l-1.539-3.076A1 1 0 0 0 16.382 8H14" />
   <path d="M8 8v4" />
   <path d="M9 18h6" />
   <circle cx="17" cy="18" r="2" />
   <circle cx="7" cy="18" r="2" />
-</svg>
+</svg>
\ No newline at end of file
diff --git a/icons/brain-cog.svg b/icons/brain-cog.svg
index f46a29d0b5..079ffac6d0 100644
--- a/icons/brain-cog.svg
+++ b/icons/brain-cog.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M12 5a3 3 0 1 0-5.997.142 4 4 0 0 0-2.526 5.77 4 4 0 0 0 .556 6.588 4 4 0 0 0 7.636 2.106 3 3 0 0 0 .164-.546c.028-.13.306-.13.335 0a3 3 0 0 0 .163.546 4 4 0 0 0 7.636-2.106 4 4 0 0 0 .556-6.588 4 4 0 0 0-2.526-5.77A3 3 0 1 0 12 5" />
+  <path d="M12 5a3 3 0 1 0-5.997.142 4 4 0 0 0-2.526 5.77 4 4 0 0 0 .556 6.588 4 4 0 0 0 7.636 2.106 3.2 3.2 0 0 0 .164-.546c.028-.13.306-.13.335 0a3.2 3.2 0 0 0 .163.546 4 4 0 0 0 7.636-2.106 4 4 0 0 0 .556-6.588 4 4 0 0 0-2.526-5.77A3 3 0 1 0 12 5" />
   <path d="M17.599 6.5a3 3 0 0 0 .399-1.375" />
   <path d="M6.003 5.125A3 3 0 0 0 6.401 6.5" />
   <path d="M3.477 10.896a4 4 0 0 1 .585-.396" />
diff --git a/icons/captions.svg b/icons/captions.svg
index b97781e966..fdf03617b2 100644
--- a/icons/captions.svg
+++ b/icons/captions.svg
@@ -10,5 +10,5 @@
   stroke-linejoin="round"
 >
   <rect width="18" height="14" x="3" y="5" rx="2" ry="2" />
-  <path d="M7 15h4m4 0h2M7 11h2m4 0h4" />
-</svg>
+  <path d="M7 15h4M15 15h2M7 11h2M13 11h4" />
+</svg>
\ No newline at end of file
diff --git a/icons/circle-fading-plus.svg b/icons/circle-fading-plus.svg
index 5c9ef7499b..16be9dcff5 100644
--- a/icons/circle-fading-plus.svg
+++ b/icons/circle-fading-plus.svg
@@ -16,4 +16,4 @@
   <path d="M2.83 16a10 10 0 0 0 2.43 3.4" />
   <path d="M4.636 5.235a10 10 0 0 1 .891-.857" />
   <path d="M8.644 21.42a10 10 0 0 0 7.631-.38" />
-</svg>
+</svg>
\ No newline at end of file
diff --git a/icons/guitar.svg b/icons/guitar.svg
index d2f86707f0..129613cd4a 100644
--- a/icons/guitar.svg
+++ b/icons/guitar.svg
@@ -11,7 +11,7 @@
 >
   <path d="m20 7 1.7-1.7a1 1 0 0 0 0-1.4l-1.6-1.6a1 1 0 0 0-1.4 0L17 4v3Z" />
   <path d="m17 7-5.1 5.1" />
-  <circle cx="11.5" cy="12.5" r=".5" />
+  <circle cx="11.5" cy="12.5" r=".5" fill="currentColor" />
   <path d="M6 12a2 2 0 0 0 1.8-1.2l.4-.9C8.7 8.8 9.8 8 11 8c2.8 0 5 2.2 5 5 0 1.2-.8 2.3-1.9 2.8l-.9.4A2 2 0 0 0 12 18a4 4 0 0 1-4 4c-3.3 0-6-2.7-6-6a4 4 0 0 1 4-4" />
   <path d="m6 16 2 2" />
 </svg>
diff --git a/icons/headset.svg b/icons/headset.svg
index bf0db141e0..72cd078061 100644
--- a/icons/headset.svg
+++ b/icons/headset.svg
@@ -9,6 +9,6 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M3 11h3a2 2 0 0 1 2 2v3a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2zm0 0a9 9 0 1 1 18 0m0 0v5a2 2 0 0 1-2 2h-1a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2z" />
+  <path d="M3 11h3a2 2 0 0 1 2 2v3a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-5Zm0 0a9 9 0 1 1 18 0m0 0v5a2 2 0 0 1-2 2h-1a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2h3Z" />
   <path d="M21 16v2a4 4 0 0 1-4 4h-5" />
 </svg>
diff --git a/icons/hop-off.svg b/icons/hop-off.svg
index 53ed5fe9d0..d2db146bb7 100644
--- a/icons/hop-off.svg
+++ b/icons/hop-off.svg
@@ -12,7 +12,7 @@
   <path d="M10.82 16.12c1.69.6 3.91.79 5.18.85.28.01.53-.09.7-.27" />
   <path d="M11.14 20.57c.52.24 2.44 1.12 4.08 1.37.46.06.86-.25.9-.71.12-1.52-.3-3.43-.5-4.28" />
   <path d="M16.13 21.05c1.65.63 3.68.84 4.87.91a.9.9 0 0 0 .7-.26" />
-  <path d="M17.99 5.52a20.8 20.8 0 0 1 3.15 4.5.8.8 0 0 1-.68 1.13c-1.17.1-2.5.02-3.9-.25" />
+  <path d="M17.99 5.52a20.83 20.83 0 0 1 3.15 4.5.8.8 0 0 1-.68 1.13c-1.17.1-2.5.02-3.9-.25" />
   <path d="M20.57 11.14c.24.52 1.12 2.44 1.37 4.08.04.3-.08.59-.31.75" />
   <path d="M4.93 4.93a10 10 0 0 0-.67 13.4c.35.43.96.4 1.17-.12.69-1.71 1.07-5.07 1.07-6.71 1.34.45 3.1.9 4.88.62a.85.85 0 0 0 .48-.24" />
   <path d="M5.52 17.99c1.05.95 2.91 2.42 4.5 3.15a.8.8 0 0 0 1.13-.68c.2-2.34-.33-5.3-1.57-8.28" />
diff --git a/icons/hop.svg b/icons/hop.svg
index cc7e7af085..eae2af0fcb 100644
--- a/icons/hop.svg
+++ b/icons/hop.svg
@@ -11,10 +11,10 @@
 >
   <path d="M10.82 16.12c1.69.6 3.91.79 5.18.85.55.03 1-.42.97-.97-.06-1.27-.26-3.5-.85-5.18" />
   <path d="M11.5 6.5c1.64 0 5-.38 6.71-1.07.52-.2.55-.82.12-1.17A10 10 0 0 0 4.26 18.33c.35.43.96.4 1.17-.12.69-1.71 1.07-5.07 1.07-6.71 1.34.45 3.1.9 4.88.62a.88.88 0 0 0 .73-.74c.3-2.14-.15-3.5-.61-4.88" />
-  <path d="M15.62 16.95c.2.85.62 2.76.5 4.28a.77.77 0 0 1-.9.7 16.6 16.6 0 0 1-4.08-1.36" />
-  <path d="M16.13 21.05c1.65.63 3.68.84 4.87.91a.9.9 0 0 0 .96-.96 17.7 17.7 0 0 0-.9-4.87" />
-  <path d="M16.94 15.62c.86.2 2.77.62 4.29.5a.77.77 0 0 0 .7-.9 16.6 16.6 0 0 0-1.36-4.08" />
-  <path d="M17.99 5.52a20.8 20.8 0 0 1 3.15 4.5.8.8 0 0 1-.68 1.13c-2.33.2-5.3-.32-8.27-1.57" />
+  <path d="M15.62 16.95c.2.85.62 2.76.5 4.28a.77.77 0 0 1-.9.7 16.64 16.64 0 0 1-4.08-1.36" />
+  <path d="M16.13 21.05c1.65.63 3.68.84 4.87.91a.9.9 0 0 0 .96-.96 17.68 17.68 0 0 0-.9-4.87" />
+  <path d="M16.94 15.62c.86.2 2.77.62 4.29.5a.77.77 0 0 0 .7-.9 16.64 16.64 0 0 0-1.36-4.08" />
+  <path d="M17.99 5.52a20.82 20.82 0 0 1 3.15 4.5.8.8 0 0 1-.68 1.13c-2.33.2-5.3-.32-8.27-1.57" />
   <path d="M4.93 4.93 3 3a.7.7 0 0 1 0-1" />
-  <path d="M9.58 12.18c1.24 2.98 1.77 5.95 1.57 8.28a.8.8 0 0 1-1.13.68 20.8 20.8 0 0 1-4.5-3.15" />
+  <path d="M9.58 12.18c1.24 2.98 1.77 5.95 1.57 8.28a.8.8 0 0 1-1.13.68 20.82 20.82 0 0 1-4.5-3.15" />
 </svg>
diff --git a/icons/key-round.svg b/icons/key-round.svg
index 5749f92e1d..16819eaf65 100644
--- a/icons/key-round.svg
+++ b/icons/key-round.svg
@@ -10,5 +10,5 @@
   stroke-linejoin="round"
 >
   <path d="M2 18v3c0 .6.4 1 1 1h4v-3h3v-3h2l1.4-1.4a6.5 6.5 0 1 0-4-4Z" />
-  <circle cx="16.5" cy="7.5" r=".5" />
+  <circle cx="16.5" cy="7.5" r=".5" fill="currentColor" />
 </svg>
diff --git a/icons/package-open.svg b/icons/package-open.svg
index 7d2ef26f2c..645f567236 100644
--- a/icons/package-open.svg
+++ b/icons/package-open.svg
@@ -10,7 +10,7 @@
   stroke-linejoin="round"
 >
   <path d="M12 22v-9" />
-  <path d="M15.17 2.21a1.67 1.67 0 0 1 1.63 0L21 4.57a1.93 1.93 0 0 1 0 3.36L8.82 14.79a1.66 1.66 0 0 1-1.64 0L3 12.43a1.93 1.93 0 0 1 0-3.36z" />
+  <path d="M15.17 2.21a1.67 1.67 0 0 1 1.63 0L21 4.57a1.93 1.93 0 0 1 0 3.36L8.82 14.79a1.655 1.655 0 0 1-1.64 0L3 12.43a1.93 1.93 0 0 1 0-3.36z" />
   <path d="M20 13v3.87a2.06 2.06 0 0 1-1.11 1.83l-6 3.08a1.93 1.93 0 0 1-1.78 0l-6-3.08A2.06 2.06 0 0 1 4 16.87V13" />
-  <path d="M21 12.43a1.93 1.93 0 0 0 0-3.36L8.83 2.2a1.64 1.64 0 0 0-1.63 0L3 4.57a1.93 1.93 0 0 0 0 3.36l12.18 6.86a1.64 1.64 0 0 0 1.63 0z" />
+  <path d="M21 12.43a1.93 1.93 0 0 0 0-3.36L8.83 2.2a1.64 1.64 0 0 0-1.63 0L3 4.57a1.93 1.93 0 0 0 0 3.36l12.18 6.86a1.636 1.636 0 0 0 1.63 0z" />
 </svg>
diff --git a/icons/palette.svg b/icons/palette.svg
index c59676d44a..74ae304021 100644
--- a/icons/palette.svg
+++ b/icons/palette.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <circle cx="13.5" cy="6.5" r=".5" />
-  <circle cx="17.5" cy="10.5" r=".5" />
-  <circle cx="8.5" cy="7.5" r=".5" />
-  <circle cx="6.5" cy="12.5" r=".5" />
-  <path d="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10c.926 0 1.648-.746 1.648-1.688 0-.437-.18-.835-.437-1.125-.29-.289-.438-.652-.438-1.125a1.64 1.64 0 0 1 1.668-1.668h1.996c3.051 0 5.555-2.503 5.555-5.554C21.965 6.012 17.461 2 12 2" />
+  <circle cx="13.5" cy="6.5" r=".5" fill="currentColor" />
+  <circle cx="17.5" cy="10.5" r=".5" fill="currentColor" />
+  <circle cx="8.5" cy="7.5" r=".5" fill="currentColor" />
+  <circle cx="6.5" cy="12.5" r=".5" fill="currentColor" />
+  <path d="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10c.926 0 1.648-.746 1.648-1.688 0-.437-.18-.835-.437-1.125-.29-.289-.438-.652-.438-1.125a1.64 1.64 0 0 1 1.668-1.668h1.996c3.051 0 5.555-2.503 5.555-5.554C21.965 6.012 17.461 2 12 2z" />
 </svg>
diff --git a/icons/pickaxe.svg b/icons/pickaxe.svg
index e51f247487..fd134ab991 100644
--- a/icons/pickaxe.svg
+++ b/icons/pickaxe.svg
@@ -12,5 +12,5 @@
   <path d="M14.531 12.469 6.619 20.38a1 1 0 1 1-3-3l7.912-7.912" />
   <path d="M15.686 4.314A12.5 12.5 0 0 0 5.461 2.958 1 1 0 0 0 5.58 4.71a22 22 0 0 1 6.318 3.393" />
   <path d="M17.7 3.7a1 1 0 0 0-1.4 0l-4.6 4.6a1 1 0 0 0 0 1.4l2.6 2.6a1 1 0 0 0 1.4 0l4.6-4.6a1 1 0 0 0 0-1.4z" />
-  <path d="M19.686 8.314a12.5 12.5 0 0 1 1.356 10.225 1 1 0 0 1-1.751-.119 22 22 0 0 0-3.393-6.319" />
+  <path d="M19.686 8.314a12.501 12.501 0 0 1 1.356 10.225 1 1 0 0 1-1.751-.119 22 22 0 0 0-3.393-6.319" />
 </svg>
diff --git a/icons/scatter-chart.svg b/icons/scatter-chart.svg
index f0e46ba641..4beec1f156 100644
--- a/icons/scatter-chart.svg
+++ b/icons/scatter-chart.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <circle cx="7.5" cy="7.5" r=".5" />
-  <circle cx="18.5" cy="5.5" r=".5" />
-  <circle cx="11.5" cy="11.5" r=".5" />
-  <circle cx="7.5" cy="16.5" r=".5" />
-  <circle cx="17.5" cy="14.5" r=".5" />
+  <circle cx="7.5" cy="7.5" r=".5" fill="currentColor" />
+  <circle cx="18.5" cy="5.5" r=".5" fill="currentColor" />
+  <circle cx="11.5" cy="11.5" r=".5" fill="currentColor" />
+  <circle cx="7.5" cy="16.5" r=".5" fill="currentColor" />
+  <circle cx="17.5" cy="14.5" r=".5" fill="currentColor" />
   <path d="M3 3v18h18" />
 </svg>
diff --git a/icons/shield-off.svg b/icons/shield-off.svg
index 040698e046..d7cc4443d5 100644
--- a/icons/shield-off.svg
+++ b/icons/shield-off.svg
@@ -11,5 +11,5 @@
 >
   <path d="m2 2 20 20" />
   <path d="M5 5a1 1 0 0 0-1 1v7c0 5 3.5 7.5 7.67 8.94a1 1 0 0 0 .67.01c2.35-.82 4.48-1.97 5.9-3.71" />
-  <path d="M9.309 3.652A12.3 12.3 0 0 0 11.24 2.28a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1v7a10 10 0 0 1-.08 1.264" />
+  <path d="M9.309 3.652A12.252 12.252 0 0 0 11.24 2.28a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1v7a9.784 9.784 0 0 1-.08 1.264" />
 </svg>
diff --git a/icons/square-radical.svg b/icons/square-radical.svg
index d26d00d2dc..70bd53f615 100644
--- a/icons/square-radical.svg
+++ b/icons/square-radical.svg
@@ -10,5 +10,5 @@
   stroke-linejoin="round"
 >
   <path d="M7 12h2l2 5 2-10h4" />
-  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <rect x="3" y="3" width="18" height="18" rx="2" />
 </svg>
diff --git a/icons/tag.svg b/icons/tag.svg
index 127b9c24bf..7a073e9f35 100644
--- a/icons/tag.svg
+++ b/icons/tag.svg
@@ -10,5 +10,5 @@
   stroke-linejoin="round"
 >
   <path d="M12.586 2.586A2 2 0 0 0 11.172 2H4a2 2 0 0 0-2 2v7.172a2 2 0 0 0 .586 1.414l8.704 8.704a2.426 2.426 0 0 0 3.42 0l6.58-6.58a2.426 2.426 0 0 0 0-3.42z" />
-  <circle cx="7.5" cy="7.5" r=".5" />
+  <circle cx="7.5" cy="7.5" r=".5" fill="currentColor" />
 </svg>
diff --git a/icons/tags.svg b/icons/tags.svg
index 61a2bee805..afe87a8596 100644
--- a/icons/tags.svg
+++ b/icons/tags.svg
@@ -11,5 +11,5 @@
 >
   <path d="m15 5 6.3 6.3a2.4 2.4 0 0 1 0 3.4L17 19" />
   <path d="M9.586 5.586A2 2 0 0 0 8.172 5H3a1 1 0 0 0-1 1v5.172a2 2 0 0 0 .586 1.414L8.29 18.29a2.426 2.426 0 0 0 3.42 0l3.58-3.58a2.426 2.426 0 0 0 0-3.42z" />
-  <circle cx="6.5" cy="9.5" r=".5" />
+  <circle cx="6.5" cy="9.5" r=".5" fill="currentColor" />
 </svg>
diff --git a/icons/truck.svg b/icons/truck.svg
index 57e03d6c94..cef64e21b1 100644
--- a/icons/truck.svg
+++ b/icons/truck.svg
@@ -14,4 +14,4 @@
   <path d="M19 18h2a1 1 0 0 0 1-1v-3.65a1 1 0 0 0-.22-.624l-3.48-4.35A1 1 0 0 0 17.52 8H14" />
   <circle cx="17" cy="18" r="2" />
   <circle cx="7" cy="18" r="2" />
-</svg>
+</svg>
\ No newline at end of file
diff --git a/icons/vault.svg b/icons/vault.svg
index 95e51027a5..0cb6662f58 100644
--- a/icons/vault.svg
+++ b/icons/vault.svg
@@ -10,13 +10,13 @@
   stroke-linejoin="round"
 >
   <rect width="18" height="18" x="3" y="3" rx="2" />
-  <circle cx="7.5" cy="7.5" r=".5" />
+  <circle cx="7.5" cy="7.5" r=".5" fill="currentColor" />
   <path d="m7.9 7.9 2.7 2.7" />
-  <circle cx="16.5" cy="7.5" r=".5" />
+  <circle cx="16.5" cy="7.5" r=".5" fill="currentColor" />
   <path d="m13.4 10.6 2.7-2.7" />
-  <circle cx="7.5" cy="16.5" r=".5" />
+  <circle cx="7.5" cy="16.5" r=".5" fill="currentColor" />
   <path d="m7.9 16.1 2.7-2.7" />
-  <circle cx="16.5" cy="16.5" r=".5" />
+  <circle cx="16.5" cy="16.5" r=".5" fill="currentColor" />
   <path d="m13.4 13.4 2.7 2.7" />
   <circle cx="12" cy="12" r="2" />
 </svg>