From 024b2c727f0fbdab14d31c084cd4a5344f6b4135 Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Sun, 9 Nov 2025 19:10:31 +0000
Subject: [PATCH 1/6] Changed icons

New dual colour icons and a numeric menu item icon.
---
 HISTORY.md                             |  1 +
 manifest.xml                           |  4 ++++
 resources-icons-18-w/drawables.xml     |  1 +
 resources-icons-18-w/error.svg         | 10 +++++++++-
 resources-icons-18-w/group_type.svg    | 19 ++++++++++++-------
 resources-icons-18-w/info_type.svg     | 10 +++++++++-
 resources-icons-18-w/numeric_type.svg  | 13 +++++++++++++
 resources-icons-18-w/tap_type.svg      | 11 ++++++++++-
 resources-icons-18/drawables.xml       |  1 +
 resources-icons-18/error.svg           | 10 +++++++++-
 resources-icons-18/group_type.svg      | 19 ++++++++++++-------
 resources-icons-18/info_type.svg       | 10 +++++++++-
 resources-icons-18/numeric_type.svg    | 13 +++++++++++++
 resources-icons-18/tap_type.svg        | 11 ++++++++++-
 resources-icons-21-w/drawables.xml     |  1 +
 resources-icons-21-w/error.svg         | 10 +++++++++-
 resources-icons-21-w/group_type.svg    | 19 ++++++++++++-------
 resources-icons-21-w/info_type.svg     | 10 +++++++++-
 resources-icons-21-w/numeric_type.svg  | 13 +++++++++++++
 resources-icons-21-w/tap_type.svg      | 11 ++++++++++-
 resources-icons-21/drawables.xml       |  1 +
 resources-icons-21/error.svg           | 10 +++++++++-
 resources-icons-21/group_type.svg      | 19 ++++++++++++-------
 resources-icons-21/info_type.svg       | 10 +++++++++-
 resources-icons-21/numeric_type.svg    | 13 +++++++++++++
 resources-icons-21/tap_type.svg        | 11 ++++++++++-
 resources-icons-24/drawables.xml       |  1 +
 resources-icons-24/error.svg           | 10 +++++++++-
 resources-icons-24/group_type.svg      | 19 ++++++++++++-------
 resources-icons-24/info_type.svg       | 10 +++++++++-
 resources-icons-24/numeric_type.svg    | 13 +++++++++++++
 resources-icons-24/tap_type.svg        | 11 ++++++++++-
 resources-icons-26/drawables.xml       |  1 +
 resources-icons-26/error.svg           | 10 +++++++++-
 resources-icons-26/group_type.svg      | 19 ++++++++++++-------
 resources-icons-26/info_type.svg       | 10 +++++++++-
 resources-icons-26/numeric_type.svg    | 13 +++++++++++++
 resources-icons-26/tap_type.svg        | 11 ++++++++++-
 resources-icons-28/drawables.xml       |  1 +
 resources-icons-28/error.svg           | 10 +++++++++-
 resources-icons-28/group_type.svg      | 19 ++++++++++++-------
 resources-icons-28/info_type.svg       | 10 +++++++++-
 resources-icons-28/numeric_type.svg    | 13 +++++++++++++
 resources-icons-28/tap_type.svg        | 11 ++++++++++-
 resources-icons-30/drawables.xml       |  1 +
 resources-icons-30/error.svg           | 10 +++++++++-
 resources-icons-30/group_type.svg      | 19 ++++++++++++-------
 resources-icons-30/info_type.svg       | 10 +++++++++-
 resources-icons-30/numeric_type.svg    | 13 +++++++++++++
 resources-icons-30/tap_type.svg        | 11 ++++++++++-
 resources-icons-32/drawables.xml       |  1 +
 resources-icons-32/error.svg           | 10 +++++++++-
 resources-icons-32/group_type.svg      | 19 ++++++++++++-------
 resources-icons-32/info_type.svg       | 10 +++++++++-
 resources-icons-32/numeric_type.svg    | 13 +++++++++++++
 resources-icons-32/tap_type.svg        | 11 ++++++++++-
 resources-icons-34/drawables.xml       |  1 +
 resources-icons-34/error.svg           | 10 +++++++++-
 resources-icons-34/group_type.svg      | 19 ++++++++++++-------
 resources-icons-34/info_type.svg       | 10 +++++++++-
 resources-icons-34/numeric_type.svg    | 13 +++++++++++++
 resources-icons-34/tap_type.svg        | 11 ++++++++++-
 resources-icons-38/drawables.xml       |  1 +
 resources-icons-38/error.svg           | 10 +++++++++-
 resources-icons-38/group_type.svg      | 19 ++++++++++++-------
 resources-icons-38/info_type.svg       | 10 +++++++++-
 resources-icons-38/numeric_type.svg    | 13 +++++++++++++
 resources-icons-38/tap_type.svg        | 11 ++++++++++-
 resources-icons-42/drawables.xml       |  1 +
 resources-icons-42/error.svg           | 10 +++++++++-
 resources-icons-42/group_type.svg      | 19 ++++++++++++-------
 resources-icons-42/info_type.svg       | 10 +++++++++-
 resources-icons-42/numeric_type.svg    | 13 +++++++++++++
 resources-icons-42/tap_type.svg        | 11 ++++++++++-
 resources-icons-46/drawables.xml       |  1 +
 resources-icons-46/error.svg           | 10 +++++++++-
 resources-icons-46/group_type.svg      | 19 ++++++++++++-------
 resources-icons-46/info_type.svg       | 10 +++++++++-
 resources-icons-46/numeric_type.svg    | 13 +++++++++++++
 resources-icons-46/tap_type.svg        | 11 ++++++++++-
 resources-icons-48/drawables.xml       |  1 +
 resources-icons-48/error.svg           | 10 +++++++++-
 resources-icons-48/group_type.svg      | 17 +++++++++++------
 resources-icons-48/info_type.svg       | 10 +++++++++-
 resources-icons-48/numeric_type.svg    | 13 +++++++++++++
 resources-icons-48/tap_type.svg        | 11 ++++++++++-
 resources-icons-53/drawables.xml       |  1 +
 resources-icons-53/error.svg           | 10 +++++++++-
 resources-icons-53/group_type.svg      | 19 ++++++++++++-------
 resources-icons-53/info_type.svg       | 10 +++++++++-
 resources-icons-53/numeric_type.svg    | 13 +++++++++++++
 resources-icons-53/tap_type.svg        | 11 ++++++++++-
 resources-icons-55/drawables.xml       |  1 +
 resources-icons-55/error.svg           | 10 +++++++++-
 resources-icons-55/group_type.svg      | 17 +++++++++++------
 resources-icons-55/info_type.svg       | 10 +++++++++-
 resources-icons-55/numeric_type.svg    | 13 +++++++++++++
 resources-icons-55/tap_type.svg        | 11 ++++++++++-
 source/HomeAssistantMenuItemFactory.mc |  9 ++++++++-
 99 files changed, 875 insertions(+), 159 deletions(-)
 create mode 100644 resources-icons-18-w/numeric_type.svg
 create mode 100644 resources-icons-18/numeric_type.svg
 create mode 100644 resources-icons-21-w/numeric_type.svg
 create mode 100644 resources-icons-21/numeric_type.svg
 create mode 100644 resources-icons-24/numeric_type.svg
 create mode 100644 resources-icons-26/numeric_type.svg
 create mode 100644 resources-icons-28/numeric_type.svg
 create mode 100644 resources-icons-30/numeric_type.svg
 create mode 100644 resources-icons-32/numeric_type.svg
 create mode 100644 resources-icons-34/numeric_type.svg
 create mode 100644 resources-icons-38/numeric_type.svg
 create mode 100644 resources-icons-42/numeric_type.svg
 create mode 100644 resources-icons-46/numeric_type.svg
 create mode 100644 resources-icons-48/numeric_type.svg
 create mode 100644 resources-icons-53/numeric_type.svg
 create mode 100644 resources-icons-55/numeric_type.svg

diff --git a/HISTORY.md b/HISTORY.md
index c68ab78..a031fda 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -53,3 +53,4 @@
 |   3.5   | Added support for Edge 550, 850 & MTB, Fenix 8 Pro 47mm, GPSMAP H1, Instinct Crossover AMOLED, Venu 4 41mm & 45mm, & Venu X1 devices which also required an SDK update to 8.3.0. The simulation of the Edge 850 device was off, as it failed to update the display and text was the wrong colour, but the buttons menu items operated HA correctly. The assumption is the simulation model is buggy until someone [reports](https://github.com/house-of-abbey/GarminHomeAssistant/issues) otherwise. |
 |   3.6   | Added `numeric` menu item type thanks to [@thmichel](https://github.com/thmichel). This allows you to select a numeric value to set for an entity. Confirmations can now display a user supplied message. [Schema update](README.md#old-deprecated-formats) to keep pace with HomeAssistant and correct a previous decision. Schema changes for consistency. |
 |   3.7   | Bug fix for `numeric` menu items not working over Wi-Fi & LTE. |
+|   3.8   | Added icon for `numeric` menu items and revised icons in general. |
diff --git a/manifest.xml b/manifest.xml
index c6fe151..b8eac2c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -33,6 +33,7 @@
       "Monkey C: Edit Products" - Lets you add or remove any product
     -->
         <iq:products>
+<!--
             <iq:product id="approachs50"/>
             <iq:product id="approachs7042mm"/>
             <iq:product id="approachs7047mm"/>
@@ -148,7 +149,9 @@
             <iq:product id="marqgolfer"/>
             <iq:product id="montana7xx"/>
             <iq:product id="venu"/>
+-->
             <iq:product id="venu2"/>
+<!--
             <iq:product id="venu2plus"/>
             <iq:product id="venu2s"/>
             <iq:product id="venu3"/>
@@ -168,6 +171,7 @@
             <iq:product id="vivoactive4s"/>
             <iq:product id="vivoactive5"/>
             <iq:product id="vivoactive6"/>
+-->
         </iq:products>
         <!--
       Use "Monkey C: Edit Permissions" from the Visual Studio Code command
diff --git a/resources-icons-18-w/drawables.xml b/resources-icons-18-w/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-18-w/drawables.xml
+++ b/resources-icons-18-w/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-18-w/error.svg b/resources-icons-18-w/error.svg
index a457398..993ee83 100644
--- a/resources-icons-18-w/error.svg
+++ b/resources-icons-18-w/error.svg
@@ -1 +1,9 @@
-<svg height="18" viewBox="0 0 48 48" width="18" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="white" stroke="white"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #ffffff; }
+    .colour2 { fill: #ffffff; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-18-w/group_type.svg b/resources-icons-18-w/group_type.svg
index 8a67a91..75fce08 100644
--- a/resources-icons-18-w/group_type.svg
+++ b/resources-icons-18-w/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="18" viewBox="0 0 200 500" width="18" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="white" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="white" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="white" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #ffffff; }
+    .colour2 { fill: #ffffff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-18-w/info_type.svg b/resources-icons-18-w/info_type.svg
index 65a4cc6..ef55d32 100644
--- a/resources-icons-18-w/info_type.svg
+++ b/resources-icons-18-w/info_type.svg
@@ -1 +1,9 @@
-<svg height="18" viewBox="0 -960 960 960" width="18" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="white" stroke="white"/></svg>
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #ffffff; }
+    .colour2 { fill: #ffffff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-18-w/numeric_type.svg b/resources-icons-18-w/numeric_type.svg
new file mode 100644
index 0000000..89d3bbf
--- /dev/null
+++ b/resources-icons-18-w/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #ffffff; }
+    .colour2 { fill: #ffffff; } 
+    rect.colour2 { stroke: #ffffff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-18-w/tap_type.svg b/resources-icons-18-w/tap_type.svg
index 6d52a9a..eeb3640 100644
--- a/resources-icons-18-w/tap_type.svg
+++ b/resources-icons-18-w/tap_type.svg
@@ -1 +1,10 @@
-<svg height="18" viewBox="0 -960 960 960" width="18" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="white" stroke="white"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #ffffff; }
+    .colour2 { fill: #ffffff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-18/drawables.xml b/resources-icons-18/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-18/drawables.xml
+++ b/resources-icons-18/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-18/error.svg b/resources-icons-18/error.svg
index 5776799..a2553b7 100644
--- a/resources-icons-18/error.svg
+++ b/resources-icons-18/error.svg
@@ -1 +1,9 @@
-<svg height="18" viewBox="0 0 48 48" width="18" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-18/group_type.svg b/resources-icons-18/group_type.svg
index b0301c3..4e0f15c 100644
--- a/resources-icons-18/group_type.svg
+++ b/resources-icons-18/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="18" viewBox="0 0 200 500" width="18" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-18/info_type.svg b/resources-icons-18/info_type.svg
index 3d05232..9407998 100644
--- a/resources-icons-18/info_type.svg
+++ b/resources-icons-18/info_type.svg
@@ -1 +1,9 @@
-<svg height="18" viewBox="0 -960 960 960" width="18" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-18/numeric_type.svg b/resources-icons-18/numeric_type.svg
new file mode 100644
index 0000000..a870ccd
--- /dev/null
+++ b/resources-icons-18/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-18/tap_type.svg b/resources-icons-18/tap_type.svg
index f1a52ab..4a368f3 100644
--- a/resources-icons-18/tap_type.svg
+++ b/resources-icons-18/tap_type.svg
@@ -1 +1,10 @@
-<svg height="18" viewBox="0 -960 960 960" width="18" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-21-w/drawables.xml b/resources-icons-21-w/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-21-w/drawables.xml
+++ b/resources-icons-21-w/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-21-w/error.svg b/resources-icons-21-w/error.svg
index 2b21d69..0b7bb19 100644
--- a/resources-icons-21-w/error.svg
+++ b/resources-icons-21-w/error.svg
@@ -1 +1,9 @@
-<svg height="21" viewBox="0 0 48 48" width="21" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="white" stroke="white"/></svg>
\ No newline at end of file
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #ffffff; }
+    .colour2 { fill: #ffffff; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-21-w/group_type.svg b/resources-icons-21-w/group_type.svg
index 9996c00..855a9b7 100644
--- a/resources-icons-21-w/group_type.svg
+++ b/resources-icons-21-w/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="21" viewBox="0 0 200 500" width="21" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="white" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="white" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="white" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #ffffff; }
+    .colour2 { fill: #ffffff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-21-w/info_type.svg b/resources-icons-21-w/info_type.svg
index 4dcfba5..ec5b713 100644
--- a/resources-icons-21-w/info_type.svg
+++ b/resources-icons-21-w/info_type.svg
@@ -1 +1,9 @@
-<svg height="21" viewBox="0 -960 960 960" width="21" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="white" stroke="white"/></svg>
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #ffffff; }
+    .colour2 { fill: #ffffff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-21-w/numeric_type.svg b/resources-icons-21-w/numeric_type.svg
new file mode 100644
index 0000000..59972c8
--- /dev/null
+++ b/resources-icons-21-w/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #ffffff; }
+    .colour2 { fill: #ffffff; } 
+    rect.colour2 { stroke: #ffffff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-21-w/tap_type.svg b/resources-icons-21-w/tap_type.svg
index 2fcd199..0aa7c21 100644
--- a/resources-icons-21-w/tap_type.svg
+++ b/resources-icons-21-w/tap_type.svg
@@ -1 +1,10 @@
-<svg height="21" viewBox="0 -960 960 960" width="21" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="white" stroke="white"/></svg>
\ No newline at end of file
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #ffffff; }
+    .colour2 { fill: #ffffff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-21/drawables.xml b/resources-icons-21/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-21/drawables.xml
+++ b/resources-icons-21/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-21/error.svg b/resources-icons-21/error.svg
index 48c2bf8..81c3832 100644
--- a/resources-icons-21/error.svg
+++ b/resources-icons-21/error.svg
@@ -1 +1,9 @@
-<svg height="21" viewBox="0 0 48 48" width="21" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-21/group_type.svg b/resources-icons-21/group_type.svg
index 53d262a..8d3a896 100644
--- a/resources-icons-21/group_type.svg
+++ b/resources-icons-21/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="21" viewBox="0 0 200 500" width="21" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-21/info_type.svg b/resources-icons-21/info_type.svg
index 4d21404..430eeeb 100644
--- a/resources-icons-21/info_type.svg
+++ b/resources-icons-21/info_type.svg
@@ -1 +1,9 @@
-<svg height="21" viewBox="0 -960 960 960" width="21" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-21/numeric_type.svg b/resources-icons-21/numeric_type.svg
new file mode 100644
index 0000000..a263f25
--- /dev/null
+++ b/resources-icons-21/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-21/tap_type.svg b/resources-icons-21/tap_type.svg
index ce69b53..1e117ff 100644
--- a/resources-icons-21/tap_type.svg
+++ b/resources-icons-21/tap_type.svg
@@ -1 +1,10 @@
-<svg height="21" viewBox="0 -960 960 960" width="21" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-24/drawables.xml b/resources-icons-24/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-24/drawables.xml
+++ b/resources-icons-24/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-24/error.svg b/resources-icons-24/error.svg
index 8ebdb16..f995735 100644
--- a/resources-icons-24/error.svg
+++ b/resources-icons-24/error.svg
@@ -1 +1,9 @@
-<svg height="24" viewBox="0 0 48 48" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-24/group_type.svg b/resources-icons-24/group_type.svg
index 6ae1634..0bebf8c 100644
--- a/resources-icons-24/group_type.svg
+++ b/resources-icons-24/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="24" viewBox="0 0 200 500" width="24" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-24/info_type.svg b/resources-icons-24/info_type.svg
index cdab733..a4df343 100644
--- a/resources-icons-24/info_type.svg
+++ b/resources-icons-24/info_type.svg
@@ -1 +1,9 @@
-<svg height="24" viewBox="0 -960 960 960" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-24/numeric_type.svg b/resources-icons-24/numeric_type.svg
new file mode 100644
index 0000000..acf6fa7
--- /dev/null
+++ b/resources-icons-24/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-24/tap_type.svg b/resources-icons-24/tap_type.svg
index bf3d3d7..c17a67f 100644
--- a/resources-icons-24/tap_type.svg
+++ b/resources-icons-24/tap_type.svg
@@ -1 +1,10 @@
-<svg height="24" viewBox="0 -960 960 960" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-26/drawables.xml b/resources-icons-26/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-26/drawables.xml
+++ b/resources-icons-26/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-26/error.svg b/resources-icons-26/error.svg
index 26e38d6..051c3bc 100644
--- a/resources-icons-26/error.svg
+++ b/resources-icons-26/error.svg
@@ -1 +1,9 @@
-<svg height="26" viewBox="0 0 48 48" width="26" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-26/group_type.svg b/resources-icons-26/group_type.svg
index c120aba..c0e145f 100644
--- a/resources-icons-26/group_type.svg
+++ b/resources-icons-26/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="26" viewBox="0 0 200 500" width="26" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-26/info_type.svg b/resources-icons-26/info_type.svg
index a52188f..007cd22 100644
--- a/resources-icons-26/info_type.svg
+++ b/resources-icons-26/info_type.svg
@@ -1 +1,9 @@
-<svg height="26" viewBox="0 -960 960 960" width="26" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-26/numeric_type.svg b/resources-icons-26/numeric_type.svg
new file mode 100644
index 0000000..9238f72
--- /dev/null
+++ b/resources-icons-26/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-26/tap_type.svg b/resources-icons-26/tap_type.svg
index 87c41ad..41db32d 100644
--- a/resources-icons-26/tap_type.svg
+++ b/resources-icons-26/tap_type.svg
@@ -1 +1,10 @@
-<svg height="26" viewBox="0 -960 960 960" width="26" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-28/drawables.xml b/resources-icons-28/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-28/drawables.xml
+++ b/resources-icons-28/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-28/error.svg b/resources-icons-28/error.svg
index a66bb50..04610bc 100644
--- a/resources-icons-28/error.svg
+++ b/resources-icons-28/error.svg
@@ -1 +1,9 @@
-<svg height="28" viewBox="0 0 48 48" width="28" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-28/group_type.svg b/resources-icons-28/group_type.svg
index fd6eb11..36c575b 100644
--- a/resources-icons-28/group_type.svg
+++ b/resources-icons-28/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="28" viewBox="0 0 200 500" width="28" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-28/info_type.svg b/resources-icons-28/info_type.svg
index f8a23be..48d0b62 100644
--- a/resources-icons-28/info_type.svg
+++ b/resources-icons-28/info_type.svg
@@ -1 +1,9 @@
-<svg height="28" viewBox="0 -960 960 960" width="28" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-28/numeric_type.svg b/resources-icons-28/numeric_type.svg
new file mode 100644
index 0000000..a700c5c
--- /dev/null
+++ b/resources-icons-28/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-28/tap_type.svg b/resources-icons-28/tap_type.svg
index 64506f8..21a9ebe 100644
--- a/resources-icons-28/tap_type.svg
+++ b/resources-icons-28/tap_type.svg
@@ -1 +1,10 @@
-<svg height="28" viewBox="0 -960 960 960" width="28" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-30/drawables.xml b/resources-icons-30/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-30/drawables.xml
+++ b/resources-icons-30/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-30/error.svg b/resources-icons-30/error.svg
index 80de13d..6c5e7e6 100644
--- a/resources-icons-30/error.svg
+++ b/resources-icons-30/error.svg
@@ -1 +1,9 @@
-<svg height="30" viewBox="0 0 48 48" width="30" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-30/group_type.svg b/resources-icons-30/group_type.svg
index c36b512..b8c6540 100644
--- a/resources-icons-30/group_type.svg
+++ b/resources-icons-30/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="30" viewBox="0 0 200 500" width="30" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-30/info_type.svg b/resources-icons-30/info_type.svg
index d21f4cf..ff2f95a 100644
--- a/resources-icons-30/info_type.svg
+++ b/resources-icons-30/info_type.svg
@@ -1 +1,9 @@
-<svg height="30" viewBox="0 -960 960 960" width="30" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-30/numeric_type.svg b/resources-icons-30/numeric_type.svg
new file mode 100644
index 0000000..b5384ee
--- /dev/null
+++ b/resources-icons-30/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-30/tap_type.svg b/resources-icons-30/tap_type.svg
index 70f99b8..f7ca945 100644
--- a/resources-icons-30/tap_type.svg
+++ b/resources-icons-30/tap_type.svg
@@ -1 +1,10 @@
-<svg height="30" viewBox="0 -960 960 960" width="30" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-32/drawables.xml b/resources-icons-32/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-32/drawables.xml
+++ b/resources-icons-32/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-32/error.svg b/resources-icons-32/error.svg
index 3e1eff5..5a8692e 100644
--- a/resources-icons-32/error.svg
+++ b/resources-icons-32/error.svg
@@ -1 +1,9 @@
-<svg height="32" viewBox="0 0 48 48" width="32" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-32/group_type.svg b/resources-icons-32/group_type.svg
index b1199a8..5971300 100644
--- a/resources-icons-32/group_type.svg
+++ b/resources-icons-32/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="32" viewBox="0 0 200 500" width="32" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-32/info_type.svg b/resources-icons-32/info_type.svg
index b62fabe..ca2eb63 100644
--- a/resources-icons-32/info_type.svg
+++ b/resources-icons-32/info_type.svg
@@ -1 +1,9 @@
-<svg height="32" viewBox="0 -960 960 960" width="32" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-32/numeric_type.svg b/resources-icons-32/numeric_type.svg
new file mode 100644
index 0000000..27a939e
--- /dev/null
+++ b/resources-icons-32/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-32/tap_type.svg b/resources-icons-32/tap_type.svg
index 5137c9f..133efdf 100644
--- a/resources-icons-32/tap_type.svg
+++ b/resources-icons-32/tap_type.svg
@@ -1 +1,10 @@
-<svg height="32" viewBox="0 -960 960 960" width="32" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-34/drawables.xml b/resources-icons-34/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-34/drawables.xml
+++ b/resources-icons-34/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-34/error.svg b/resources-icons-34/error.svg
index f015c3f..12d14a4 100644
--- a/resources-icons-34/error.svg
+++ b/resources-icons-34/error.svg
@@ -1 +1,9 @@
-<svg height="34" viewBox="0 0 48 48" width="34" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-34/group_type.svg b/resources-icons-34/group_type.svg
index 9b20a55..7541eef 100644
--- a/resources-icons-34/group_type.svg
+++ b/resources-icons-34/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="34" viewBox="0 0 200 500" width="34" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-34/info_type.svg b/resources-icons-34/info_type.svg
index aa79943..06b533a 100644
--- a/resources-icons-34/info_type.svg
+++ b/resources-icons-34/info_type.svg
@@ -1 +1,9 @@
-<svg height="34" viewBox="0 -960 960 960" width="34" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-34/numeric_type.svg b/resources-icons-34/numeric_type.svg
new file mode 100644
index 0000000..dc74c8b
--- /dev/null
+++ b/resources-icons-34/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-34/tap_type.svg b/resources-icons-34/tap_type.svg
index cf998ef..3f295b3 100644
--- a/resources-icons-34/tap_type.svg
+++ b/resources-icons-34/tap_type.svg
@@ -1 +1,10 @@
-<svg height="34" viewBox="0 -960 960 960" width="34" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-38/drawables.xml b/resources-icons-38/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-38/drawables.xml
+++ b/resources-icons-38/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-38/error.svg b/resources-icons-38/error.svg
index b7e88e9..d722588 100644
--- a/resources-icons-38/error.svg
+++ b/resources-icons-38/error.svg
@@ -1 +1,9 @@
-<svg height="38" viewBox="0 0 48 48" width="38" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-38/group_type.svg b/resources-icons-38/group_type.svg
index 0dd07c3..de5aa90 100644
--- a/resources-icons-38/group_type.svg
+++ b/resources-icons-38/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="38" viewBox="0 0 200 500" width="38" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-38/info_type.svg b/resources-icons-38/info_type.svg
index c1a797a..6d84922 100644
--- a/resources-icons-38/info_type.svg
+++ b/resources-icons-38/info_type.svg
@@ -1 +1,9 @@
-<svg height="38" viewBox="0 -960 960 960" width="38" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-38/numeric_type.svg b/resources-icons-38/numeric_type.svg
new file mode 100644
index 0000000..5e0997b
--- /dev/null
+++ b/resources-icons-38/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-38/tap_type.svg b/resources-icons-38/tap_type.svg
index 4473be2..9ab519c 100644
--- a/resources-icons-38/tap_type.svg
+++ b/resources-icons-38/tap_type.svg
@@ -1 +1,10 @@
-<svg height="38" viewBox="0 -960 960 960" width="38" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-42/drawables.xml b/resources-icons-42/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-42/drawables.xml
+++ b/resources-icons-42/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-42/error.svg b/resources-icons-42/error.svg
index 4fe488b..c0c59c3 100644
--- a/resources-icons-42/error.svg
+++ b/resources-icons-42/error.svg
@@ -1 +1,9 @@
-<svg height="42" viewBox="0 0 48 48" width="42" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-42/group_type.svg b/resources-icons-42/group_type.svg
index 93b4995..413e254 100644
--- a/resources-icons-42/group_type.svg
+++ b/resources-icons-42/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="42" viewBox="0 0 200 500" width="42" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-42/info_type.svg b/resources-icons-42/info_type.svg
index bd0a6e7..2bb65f1 100644
--- a/resources-icons-42/info_type.svg
+++ b/resources-icons-42/info_type.svg
@@ -1 +1,9 @@
-<svg height="42" viewBox="0 -960 960 960" width="42" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-42/numeric_type.svg b/resources-icons-42/numeric_type.svg
new file mode 100644
index 0000000..5959612
--- /dev/null
+++ b/resources-icons-42/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-42/tap_type.svg b/resources-icons-42/tap_type.svg
index 03f4f0e..e7f403f 100644
--- a/resources-icons-42/tap_type.svg
+++ b/resources-icons-42/tap_type.svg
@@ -1 +1,10 @@
-<svg height="42" viewBox="0 -960 960 960" width="42" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-46/drawables.xml b/resources-icons-46/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-46/drawables.xml
+++ b/resources-icons-46/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-46/error.svg b/resources-icons-46/error.svg
index 7e52e6d..bae3156 100644
--- a/resources-icons-46/error.svg
+++ b/resources-icons-46/error.svg
@@ -1 +1,9 @@
-<svg height="46" viewBox="0 0 48 48" width="46" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-46/group_type.svg b/resources-icons-46/group_type.svg
index 26c6b42..d5c26c5 100644
--- a/resources-icons-46/group_type.svg
+++ b/resources-icons-46/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="46" viewBox="0 0 200 500" width="46" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-46/info_type.svg b/resources-icons-46/info_type.svg
index 7e28228..dac098c 100644
--- a/resources-icons-46/info_type.svg
+++ b/resources-icons-46/info_type.svg
@@ -1 +1,9 @@
-<svg height="46" viewBox="0 -960 960 960" width="46" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-46/numeric_type.svg b/resources-icons-46/numeric_type.svg
new file mode 100644
index 0000000..a15be51
--- /dev/null
+++ b/resources-icons-46/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-46/tap_type.svg b/resources-icons-46/tap_type.svg
index b95b22d..93b6cd3 100644
--- a/resources-icons-46/tap_type.svg
+++ b/resources-icons-46/tap_type.svg
@@ -1 +1,10 @@
-<svg height="46" viewBox="0 -960 960 960" width="46" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-48/drawables.xml b/resources-icons-48/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-48/drawables.xml
+++ b/resources-icons-48/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-48/error.svg b/resources-icons-48/error.svg
index c864600..a61a0eb 100644
--- a/resources-icons-48/error.svg
+++ b/resources-icons-48/error.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" viewBox="0 0 48 48"><path stroke="red" fill="red" d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+  <circle class="colour1" cx="480" cy="480" r="400" stroke-width="60" fill-opacity="0.0" />
+  <text class="large colour2" x="480" y="520" text-anchor="middle" dominant-baseline="middle">!</text>
+</svg>
diff --git a/resources-icons-48/group_type.svg b/resources-icons-48/group_type.svg
index 322ef7d..b9c633b 100644
--- a/resources-icons-48/group_type.svg
+++ b/resources-icons-48/group_type.svg
@@ -1,7 +1,12 @@
-<svg viewBox="0 0 200 500" width="48" height="48" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1, 0, 0, 1, 0, 0)">
-    <rect x="0" y="0"   width="200" height="100" fill="blue" rx="40" ry="40"/>
-    <rect x="0" y="200" width="200" height="100" fill="blue" rx="40" ry="40"/>
-    <rect x="0" y="400" width="200" height="100" fill="blue" rx="40" ry="40"/>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+  <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+  <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+  <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+  <circle class="colour2" cx="120" cy="240" r="80" />
+  <circle class="colour2" cx="120" cy="480" r="80" />
+  <circle class="colour2" cx="120" cy="720" r="80" />
 </svg>
diff --git a/resources-icons-48/info_type.svg b/resources-icons-48/info_type.svg
index 889ec4b..208a995 100644
--- a/resources-icons-48/info_type.svg
+++ b/resources-icons-48/info_type.svg
@@ -1 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+  <circle class="colour1" cx="480" cy="480" r="400" stroke-width="60" fill-opacity="0.0" />
+  <rect class="colour2" x="420" y="410" width="120" height="360" />
+  <circle class="colour2" cx="480" cy="280" r="60" />
+</svg>
diff --git a/resources-icons-48/numeric_type.svg b/resources-icons-48/numeric_type.svg
new file mode 100644
index 0000000..629d626
--- /dev/null
+++ b/resources-icons-48/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+  <rect class="colour2" x="30" y="130" width="900" height="700" rx="100" ry="100" stroke-width="60" fill-opacity="0.0" />
+  <text class="small colour1" x="110" y="610">1</text>
+  <text class="large colour2" x="350" y="640">2</text>
+  <text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-48/tap_type.svg b/resources-icons-48/tap_type.svg
index 35d175c..541374c 100644
--- a/resources-icons-48/tap_type.svg
+++ b/resources-icons-48/tap_type.svg
@@ -1 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+  <g>
+   <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z" />
+   <path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z" />
+  </g>
+</svg>
diff --git a/resources-icons-53/drawables.xml b/resources-icons-53/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-53/drawables.xml
+++ b/resources-icons-53/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-53/error.svg b/resources-icons-53/error.svg
index eb83c50..7814e5f 100644
--- a/resources-icons-53/error.svg
+++ b/resources-icons-53/error.svg
@@ -1 +1,9 @@
-<svg height="53" viewBox="0 0 48 48" width="53" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
\ No newline at end of file
+<svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-53/group_type.svg b/resources-icons-53/group_type.svg
index 42a64e1..9522d4e 100644
--- a/resources-icons-53/group_type.svg
+++ b/resources-icons-53/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="53" viewBox="0 0 200 500" width="53" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
-</svg>
\ No newline at end of file
+<svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
+</svg>
diff --git a/resources-icons-53/info_type.svg b/resources-icons-53/info_type.svg
index 16b10d6..ab49817 100644
--- a/resources-icons-53/info_type.svg
+++ b/resources-icons-53/info_type.svg
@@ -1 +1,9 @@
-<svg height="53" viewBox="0 -960 960 960" width="53" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-53/numeric_type.svg b/resources-icons-53/numeric_type.svg
new file mode 100644
index 0000000..15085b5
--- /dev/null
+++ b/resources-icons-53/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-53/tap_type.svg b/resources-icons-53/tap_type.svg
index 2dad00c..146741a 100644
--- a/resources-icons-53/tap_type.svg
+++ b/resources-icons-53/tap_type.svg
@@ -1 +1,10 @@
-<svg height="53" viewBox="0 -960 960 960" width="53" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
\ No newline at end of file
+<svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/resources-icons-55/drawables.xml b/resources-icons-55/drawables.xml
index 33c0707..bfa0670 100644
--- a/resources-icons-55/drawables.xml
+++ b/resources-icons-55/drawables.xml
@@ -20,4 +20,5 @@
     <bitmap id="GroupTypeIcon" filename="group_type.svg"/>
     <bitmap id="TapTypeIcon" filename="tap_type.svg"/>
     <bitmap id="InfoTypeIcon" filename="info_type.svg"/>
+    <bitmap id="NumericTypeIcon" filename="numeric_type.svg"/>
 </drawables>
diff --git a/resources-icons-55/error.svg b/resources-icons-55/error.svg
index 47ef4c9..2298b7e 100644
--- a/resources-icons-55/error.svg
+++ b/resources-icons-55/error.svg
@@ -1 +1,9 @@
-<svg height="55" viewBox="0 0 48 48" width="55" xmlns="http://www.w3.org/2000/svg"><path d="M24 34q.7 0 1.175-.475.475-.475.475-1.175 0-.7-.475-1.175Q24.7 30.7 24 30.7q-.7 0-1.175.475-.475.475-.475 1.175 0 .7.475 1.175Q23.3 34 24 34Zm-1.35-7.65h3V13.7h-3ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z" fill="red" stroke="red"/></svg>
+<svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #aa0000; }
+    .colour2 { fill: #ff1111; }
+    text.large { font: bold 600px sans-serif; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+</svg>
diff --git a/resources-icons-55/group_type.svg b/resources-icons-55/group_type.svg
index 3596e4c..a5141e4 100644
--- a/resources-icons-55/group_type.svg
+++ b/resources-icons-55/group_type.svg
@@ -1,7 +1,12 @@
-<svg height="55" viewBox="0 0 200 500" width="55" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1, 0, 0, 1, 0, 0)">
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="0"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="200"/>
-<rect fill="blue" height="100" rx="40" ry="40" width="200" x="0" y="400"/>
-</g>
+<svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
+<rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="640"/>
+<circle class="colour2" cx="120" cy="240" r="80"/>
+<circle class="colour2" cx="120" cy="480" r="80"/>
+<circle class="colour2" cx="120" cy="720" r="80"/>
 </svg>
diff --git a/resources-icons-55/info_type.svg b/resources-icons-55/info_type.svg
index 7e33a82..e176930 100644
--- a/resources-icons-55/info_type.svg
+++ b/resources-icons-55/info_type.svg
@@ -1 +1,9 @@
-<svg height="55" viewBox="0 -960 960 960" width="55" xmlns="http://www.w3.org/2000/svg"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" fill="blue" stroke="blue"/></svg>
+<svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { stroke: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
+<rect class="colour2" height="360" width="120" x="420" y="410"/>
+<circle class="colour2" cx="480" cy="280" r="60"/>
+</svg>
diff --git a/resources-icons-55/numeric_type.svg b/resources-icons-55/numeric_type.svg
new file mode 100644
index 0000000..1d2a37b
--- /dev/null
+++ b/resources-icons-55/numeric_type.svg
@@ -0,0 +1,13 @@
+<svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style>
+    text.small { font: bold 400px sans-serif; }
+    text.large { font: bold 500px sans-serif; }
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; } 
+    rect.colour2 { stroke: #00ccff; }
+  </style>
+<rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
+<text class="small colour1" x="110" y="610">1</text>
+<text class="large colour2" x="350" y="640">2</text>
+<text class="small colour1" x="650" y="610">3</text>
+</svg>
diff --git a/resources-icons-55/tap_type.svg b/resources-icons-55/tap_type.svg
index 913a870..390d3bc 100644
--- a/resources-icons-55/tap_type.svg
+++ b/resources-icons-55/tap_type.svg
@@ -1 +1,10 @@
-<svg height="55" viewBox="0 -960 960 960" width="55" xmlns="http://www.w3.org/2000/svg"><path d="M445-80q-29 0-56-12t-45-35L127-403l21-23q14-15 34.5-18.5T221-438l99 53v-365q0-12.75 8.675-21.375 8.676-8.625 21.5-8.625 12.825 0 21.325 8.625T380-750v465l-144-77 156 198q10 12 23.76 18 13.76 6 29.24 6h205q38 0 64-26t26-64v-170q0-25.5-17.25-42.75T680-460H460v-60h219.646q50.148 0 85.251 35T800-400v170q0 63-43.5 106.5T650-80H445ZM203-665q-11.074-18.754-17.037-40.492Q180-727.229 180-750.246 180-821 229.725-870.5T350-920q70.55 0 120.275 49.738Q520-820.524 520-749.956q0 22.956-5.963 44.614Q508.074-683.685 497-665l-52-30q7-12 11-26t4-29.478Q460-796 427.882-828q-32.117-32-78-32Q304-860 272-827.917 240-795.833 240-750q0 15 4 29t11 26l-52 30Zm285 335Z" fill="blue" stroke="blue"/></svg>
+<svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style>
+    .colour1 { fill: #4444ff; }
+    .colour2 { fill: #00ccff; }
+  </style>
+<g>
+<path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
+<path class="colour2" d="m463.81,60.98c137.36,0 249.16,114.24 249.16,255.58c0,31.11 -5.64,61.34 -15.6,88.9l-6.07,-2.22c-6.5,-2.22 -15.16,-5.33 -26.44,-8c-10.4,-2.22 -20.8,-4 -31.63,-4.89c9.53,-22.67 14.73,-47.56 14.73,-73.79c0,-104.46 -82.33,-188.9 -184.17,-188.9c-101.83,0 -184.17,84.45 -184.17,188.9c0,46.23 16.03,88.9 43.34,121.79c-13.86,1.33 -26,3.12 -35.53,5.33c-15.6,4 -25.57,7.55 -32.93,12c-25.14,-40.01 -39.87,-88.01 -39.87,-139.13c0,-141.35 111.37,-255.58 249.16,-255.58l0.01,0.01z"/>
+</g>
+</svg>
diff --git a/source/HomeAssistantMenuItemFactory.mc b/source/HomeAssistantMenuItemFactory.mc
index d18ba58..23f8069 100644
--- a/source/HomeAssistantMenuItemFactory.mc
+++ b/source/HomeAssistantMenuItemFactory.mc
@@ -24,6 +24,7 @@ class HomeAssistantMenuItemFactory {
     private var mTapTypeIcon          as WatchUi.Bitmap;
     private var mGroupTypeIcon        as WatchUi.Bitmap;
     private var mInfoTypeIcon         as WatchUi.Bitmap;
+    private var mNumericTypeIcon      as WatchUi.Bitmap;
     private var mHomeAssistantService as HomeAssistantService;
 
     private static var instance;
@@ -51,6 +52,12 @@ class HomeAssistantMenuItemFactory {
             :locY  => WatchUi.LAYOUT_VALIGN_CENTER
         });
 
+        mNumericTypeIcon = new WatchUi.Bitmap({
+            :rezId => $.Rez.Drawables.NumericTypeIcon,
+            :locX  => WatchUi.LAYOUT_HALIGN_CENTER,
+            :locY  => WatchUi.LAYOUT_VALIGN_CENTER
+        });
+
         mHomeAssistantService = new HomeAssistantService();
     }
 
@@ -172,7 +179,7 @@ class HomeAssistantMenuItemFactory {
         for (var i = 0; i < keys.size(); i++) {
             options[keys[i]] = mMenuItemOptions.get(keys[i]);
         }
-        options[:icon] = mTapTypeIcon;
+        options[:icon] = mNumericTypeIcon;
         return new HomeAssistantNumericMenuItem(
             label,
             template,

From 193f53bbf0e8fb0621819d484e42547298036fbf Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Sun, 9 Nov 2025 19:13:05 +0000
Subject: [PATCH 2/6] Update manifest.xml

Reverted this file, which should not have been committed.
---
 manifest.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index b8eac2c..c6fe151 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -33,7 +33,6 @@
       "Monkey C: Edit Products" - Lets you add or remove any product
     -->
         <iq:products>
-<!--
             <iq:product id="approachs50"/>
             <iq:product id="approachs7042mm"/>
             <iq:product id="approachs7047mm"/>
@@ -149,9 +148,7 @@
             <iq:product id="marqgolfer"/>
             <iq:product id="montana7xx"/>
             <iq:product id="venu"/>
--->
             <iq:product id="venu2"/>
-<!--
             <iq:product id="venu2plus"/>
             <iq:product id="venu2s"/>
             <iq:product id="venu3"/>
@@ -171,7 +168,6 @@
             <iq:product id="vivoactive4s"/>
             <iq:product id="vivoactive5"/>
             <iq:product id="vivoactive6"/>
--->
         </iq:products>
         <!--
       Use "Monkey C: Edit Permissions" from the Visual Studio Code command

From 87499dba509fea9b377022717efaf3ba8f1e8ac9 Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Sun, 9 Nov 2025 22:57:46 +0000
Subject: [PATCH 3/6] Amended error icon size 48

---
 resources-icons-48/error.svg     | 5 ++++-
 resources-icons-48/info_type.svg | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/resources-icons-48/error.svg b/resources-icons-48/error.svg
index a61a0eb..835cbd5 100644
--- a/resources-icons-48/error.svg
+++ b/resources-icons-48/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
   <circle class="colour1" cx="480" cy="480" r="400" stroke-width="60" fill-opacity="0.0" />
-  <text class="large colour2" x="480" y="520" text-anchor="middle" dominant-baseline="middle">!</text>
+  <g class="colour2">
+    <rect x="420" y="220" width="120" height="360" rx="40" ry="40" />
+    <circle cx="480" cy="710" r="60" />
+  </g>
 </svg>
diff --git a/resources-icons-48/info_type.svg b/resources-icons-48/info_type.svg
index 208a995..bd836c8 100644
--- a/resources-icons-48/info_type.svg
+++ b/resources-icons-48/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
   <circle class="colour1" cx="480" cy="480" r="400" stroke-width="60" fill-opacity="0.0" />
-  <rect class="colour2" x="420" y="410" width="120" height="360" />
-  <circle class="colour2" cx="480" cy="280" r="60" />
+  <g class="colour2">
+    <circle cx="480" cy="280" r="60" />
+    <rect x="420" y="410" width="120" height="360" rx="40" ry="40" />
+  </g>
 </svg>

From 1bdc117c134619b1ad6fb320fb783088826dca07 Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Sun, 9 Nov 2025 23:03:29 +0000
Subject: [PATCH 4/6] Amended all icons

---
 resources-icons-18-w/error.svg     | 5 ++++-
 resources-icons-18-w/info_type.svg | 6 ++++--
 resources-icons-18/error.svg       | 5 ++++-
 resources-icons-18/info_type.svg   | 6 ++++--
 resources-icons-21-w/error.svg     | 5 ++++-
 resources-icons-21-w/info_type.svg | 6 ++++--
 resources-icons-21/error.svg       | 5 ++++-
 resources-icons-21/info_type.svg   | 6 ++++--
 resources-icons-24/error.svg       | 5 ++++-
 resources-icons-24/info_type.svg   | 6 ++++--
 resources-icons-26/error.svg       | 5 ++++-
 resources-icons-26/info_type.svg   | 6 ++++--
 resources-icons-28/error.svg       | 5 ++++-
 resources-icons-28/info_type.svg   | 6 ++++--
 resources-icons-30/error.svg       | 5 ++++-
 resources-icons-30/info_type.svg   | 6 ++++--
 resources-icons-32/error.svg       | 5 ++++-
 resources-icons-32/info_type.svg   | 6 ++++--
 resources-icons-34/error.svg       | 5 ++++-
 resources-icons-34/info_type.svg   | 6 ++++--
 resources-icons-38/error.svg       | 5 ++++-
 resources-icons-38/info_type.svg   | 6 ++++--
 resources-icons-42/error.svg       | 5 ++++-
 resources-icons-42/info_type.svg   | 6 ++++--
 resources-icons-46/error.svg       | 5 ++++-
 resources-icons-46/info_type.svg   | 6 ++++--
 resources-icons-53/error.svg       | 5 ++++-
 resources-icons-53/info_type.svg   | 6 ++++--
 resources-icons-55/error.svg       | 5 ++++-
 resources-icons-55/info_type.svg   | 6 ++++--
 30 files changed, 120 insertions(+), 45 deletions(-)

diff --git a/resources-icons-18-w/error.svg b/resources-icons-18-w/error.svg
index 993ee83..eca19ce 100644
--- a/resources-icons-18-w/error.svg
+++ b/resources-icons-18-w/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-18-w/info_type.svg b/resources-icons-18-w/info_type.svg
index ef55d32..5096538 100644
--- a/resources-icons-18-w/info_type.svg
+++ b/resources-icons-18-w/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #ffffff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-18/error.svg b/resources-icons-18/error.svg
index a2553b7..767dfbd 100644
--- a/resources-icons-18/error.svg
+++ b/resources-icons-18/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-18/info_type.svg b/resources-icons-18/info_type.svg
index 9407998..36477d0 100644
--- a/resources-icons-18/info_type.svg
+++ b/resources-icons-18/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-21-w/error.svg b/resources-icons-21-w/error.svg
index 0b7bb19..76c15b7 100644
--- a/resources-icons-21-w/error.svg
+++ b/resources-icons-21-w/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-21-w/info_type.svg b/resources-icons-21-w/info_type.svg
index ec5b713..9ee062e 100644
--- a/resources-icons-21-w/info_type.svg
+++ b/resources-icons-21-w/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #ffffff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-21/error.svg b/resources-icons-21/error.svg
index 81c3832..686e718 100644
--- a/resources-icons-21/error.svg
+++ b/resources-icons-21/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-21/info_type.svg b/resources-icons-21/info_type.svg
index 430eeeb..e04cd01 100644
--- a/resources-icons-21/info_type.svg
+++ b/resources-icons-21/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-24/error.svg b/resources-icons-24/error.svg
index f995735..a785f5d 100644
--- a/resources-icons-24/error.svg
+++ b/resources-icons-24/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-24/info_type.svg b/resources-icons-24/info_type.svg
index a4df343..84814e9 100644
--- a/resources-icons-24/info_type.svg
+++ b/resources-icons-24/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-26/error.svg b/resources-icons-26/error.svg
index 051c3bc..e064c56 100644
--- a/resources-icons-26/error.svg
+++ b/resources-icons-26/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-26/info_type.svg b/resources-icons-26/info_type.svg
index 007cd22..8f9334b 100644
--- a/resources-icons-26/info_type.svg
+++ b/resources-icons-26/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-28/error.svg b/resources-icons-28/error.svg
index 04610bc..fc14ef7 100644
--- a/resources-icons-28/error.svg
+++ b/resources-icons-28/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-28/info_type.svg b/resources-icons-28/info_type.svg
index 48d0b62..b208798 100644
--- a/resources-icons-28/info_type.svg
+++ b/resources-icons-28/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-30/error.svg b/resources-icons-30/error.svg
index 6c5e7e6..28e575a 100644
--- a/resources-icons-30/error.svg
+++ b/resources-icons-30/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-30/info_type.svg b/resources-icons-30/info_type.svg
index ff2f95a..6e04f09 100644
--- a/resources-icons-30/info_type.svg
+++ b/resources-icons-30/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-32/error.svg b/resources-icons-32/error.svg
index 5a8692e..89caeb6 100644
--- a/resources-icons-32/error.svg
+++ b/resources-icons-32/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-32/info_type.svg b/resources-icons-32/info_type.svg
index ca2eb63..5c83e6d 100644
--- a/resources-icons-32/info_type.svg
+++ b/resources-icons-32/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-34/error.svg b/resources-icons-34/error.svg
index 12d14a4..7daa64a 100644
--- a/resources-icons-34/error.svg
+++ b/resources-icons-34/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-34/info_type.svg b/resources-icons-34/info_type.svg
index 06b533a..9343dae 100644
--- a/resources-icons-34/info_type.svg
+++ b/resources-icons-34/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-38/error.svg b/resources-icons-38/error.svg
index d722588..73ae4d1 100644
--- a/resources-icons-38/error.svg
+++ b/resources-icons-38/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-38/info_type.svg b/resources-icons-38/info_type.svg
index 6d84922..18248f5 100644
--- a/resources-icons-38/info_type.svg
+++ b/resources-icons-38/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-42/error.svg b/resources-icons-42/error.svg
index c0c59c3..2a3328d 100644
--- a/resources-icons-42/error.svg
+++ b/resources-icons-42/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-42/info_type.svg b/resources-icons-42/info_type.svg
index 2bb65f1..4871185 100644
--- a/resources-icons-42/info_type.svg
+++ b/resources-icons-42/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-46/error.svg b/resources-icons-46/error.svg
index bae3156..bfacd00 100644
--- a/resources-icons-46/error.svg
+++ b/resources-icons-46/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-46/info_type.svg b/resources-icons-46/info_type.svg
index dac098c..4a8f5ec 100644
--- a/resources-icons-46/info_type.svg
+++ b/resources-icons-46/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-53/error.svg b/resources-icons-53/error.svg
index 7814e5f..be4e732 100644
--- a/resources-icons-53/error.svg
+++ b/resources-icons-53/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-53/info_type.svg b/resources-icons-53/info_type.svg
index ab49817..54a8d80 100644
--- a/resources-icons-53/info_type.svg
+++ b/resources-icons-53/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>
diff --git a/resources-icons-55/error.svg b/resources-icons-55/error.svg
index 2298b7e..fa26b45 100644
--- a/resources-icons-55/error.svg
+++ b/resources-icons-55/error.svg
@@ -5,5 +5,8 @@
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<text class="large colour2" dominant-baseline="middle" text-anchor="middle" x="480" y="520">!</text>
+<g class="colour2">
+<rect height="360" rx="40" ry="40" width="120" x="420" y="220"/>
+<circle cx="480" cy="710" r="60"/>
+</g>
 </svg>
diff --git a/resources-icons-55/info_type.svg b/resources-icons-55/info_type.svg
index e176930..9f52410 100644
--- a/resources-icons-55/info_type.svg
+++ b/resources-icons-55/info_type.svg
@@ -4,6 +4,8 @@
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
-<rect class="colour2" height="360" width="120" x="420" y="410"/>
-<circle class="colour2" cx="480" cy="280" r="60"/>
+<g class="colour2">
+<circle cx="480" cy="280" r="60"/>
+<rect height="360" rx="40" ry="40" width="120" x="420" y="410"/>
+</g>
 </svg>

From 38d9c2c06d3fcbbb30dcb4795232a541aed48c8f Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Mon, 10 Nov 2025 20:41:48 +0000
Subject: [PATCH 5/6] Icons with lighter blue

---
 resources-icons-18/group_type.svg   | 2 +-
 resources-icons-18/info_type.svg    | 2 +-
 resources-icons-18/numeric_type.svg | 2 +-
 resources-icons-18/tap_type.svg     | 2 +-
 resources-icons-21/group_type.svg   | 2 +-
 resources-icons-21/info_type.svg    | 2 +-
 resources-icons-21/numeric_type.svg | 2 +-
 resources-icons-21/tap_type.svg     | 2 +-
 resources-icons-24/group_type.svg   | 2 +-
 resources-icons-24/info_type.svg    | 2 +-
 resources-icons-24/numeric_type.svg | 2 +-
 resources-icons-24/tap_type.svg     | 2 +-
 resources-icons-26/group_type.svg   | 2 +-
 resources-icons-26/info_type.svg    | 2 +-
 resources-icons-26/numeric_type.svg | 2 +-
 resources-icons-26/tap_type.svg     | 2 +-
 resources-icons-28/group_type.svg   | 2 +-
 resources-icons-28/info_type.svg    | 2 +-
 resources-icons-28/numeric_type.svg | 2 +-
 resources-icons-28/tap_type.svg     | 2 +-
 resources-icons-30/group_type.svg   | 2 +-
 resources-icons-30/info_type.svg    | 2 +-
 resources-icons-30/numeric_type.svg | 2 +-
 resources-icons-30/tap_type.svg     | 2 +-
 resources-icons-32/group_type.svg   | 2 +-
 resources-icons-32/info_type.svg    | 2 +-
 resources-icons-32/numeric_type.svg | 2 +-
 resources-icons-32/tap_type.svg     | 2 +-
 resources-icons-34/group_type.svg   | 2 +-
 resources-icons-34/info_type.svg    | 2 +-
 resources-icons-34/numeric_type.svg | 2 +-
 resources-icons-34/tap_type.svg     | 2 +-
 resources-icons-38/group_type.svg   | 2 +-
 resources-icons-38/info_type.svg    | 2 +-
 resources-icons-38/numeric_type.svg | 2 +-
 resources-icons-38/tap_type.svg     | 2 +-
 resources-icons-42/group_type.svg   | 2 +-
 resources-icons-42/info_type.svg    | 2 +-
 resources-icons-42/numeric_type.svg | 2 +-
 resources-icons-42/tap_type.svg     | 2 +-
 resources-icons-46/group_type.svg   | 2 +-
 resources-icons-46/info_type.svg    | 2 +-
 resources-icons-46/numeric_type.svg | 2 +-
 resources-icons-46/tap_type.svg     | 2 +-
 resources-icons-48/group_type.svg   | 2 +-
 resources-icons-48/info_type.svg    | 2 +-
 resources-icons-48/numeric_type.svg | 2 +-
 resources-icons-48/tap_type.svg     | 2 +-
 resources-icons-53/group_type.svg   | 2 +-
 resources-icons-53/info_type.svg    | 2 +-
 resources-icons-53/numeric_type.svg | 2 +-
 resources-icons-53/tap_type.svg     | 2 +-
 resources-icons-55/group_type.svg   | 2 +-
 resources-icons-55/info_type.svg    | 2 +-
 resources-icons-55/numeric_type.svg | 2 +-
 resources-icons-55/tap_type.svg     | 2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/resources-icons-18/group_type.svg b/resources-icons-18/group_type.svg
index 4e0f15c..5d7a363 100644
--- a/resources-icons-18/group_type.svg
+++ b/resources-icons-18/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-18/info_type.svg b/resources-icons-18/info_type.svg
index 36477d0..dd693f5 100644
--- a/resources-icons-18/info_type.svg
+++ b/resources-icons-18/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-18/numeric_type.svg b/resources-icons-18/numeric_type.svg
index a870ccd..c53494d 100644
--- a/resources-icons-18/numeric_type.svg
+++ b/resources-icons-18/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-18/tap_type.svg b/resources-icons-18/tap_type.svg
index 4a368f3..8812493 100644
--- a/resources-icons-18/tap_type.svg
+++ b/resources-icons-18/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-21/group_type.svg b/resources-icons-21/group_type.svg
index 8d3a896..3716eb8 100644
--- a/resources-icons-21/group_type.svg
+++ b/resources-icons-21/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-21/info_type.svg b/resources-icons-21/info_type.svg
index e04cd01..263beba 100644
--- a/resources-icons-21/info_type.svg
+++ b/resources-icons-21/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-21/numeric_type.svg b/resources-icons-21/numeric_type.svg
index a263f25..b83141e 100644
--- a/resources-icons-21/numeric_type.svg
+++ b/resources-icons-21/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-21/tap_type.svg b/resources-icons-21/tap_type.svg
index 1e117ff..54eb62c 100644
--- a/resources-icons-21/tap_type.svg
+++ b/resources-icons-21/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-24/group_type.svg b/resources-icons-24/group_type.svg
index 0bebf8c..5e5bf56 100644
--- a/resources-icons-24/group_type.svg
+++ b/resources-icons-24/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-24/info_type.svg b/resources-icons-24/info_type.svg
index 84814e9..43b7767 100644
--- a/resources-icons-24/info_type.svg
+++ b/resources-icons-24/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-24/numeric_type.svg b/resources-icons-24/numeric_type.svg
index acf6fa7..2ab3e21 100644
--- a/resources-icons-24/numeric_type.svg
+++ b/resources-icons-24/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-24/tap_type.svg b/resources-icons-24/tap_type.svg
index c17a67f..5ef37d3 100644
--- a/resources-icons-24/tap_type.svg
+++ b/resources-icons-24/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-26/group_type.svg b/resources-icons-26/group_type.svg
index c0e145f..2fba101 100644
--- a/resources-icons-26/group_type.svg
+++ b/resources-icons-26/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-26/info_type.svg b/resources-icons-26/info_type.svg
index 8f9334b..537388b 100644
--- a/resources-icons-26/info_type.svg
+++ b/resources-icons-26/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-26/numeric_type.svg b/resources-icons-26/numeric_type.svg
index 9238f72..ac1f7d3 100644
--- a/resources-icons-26/numeric_type.svg
+++ b/resources-icons-26/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-26/tap_type.svg b/resources-icons-26/tap_type.svg
index 41db32d..de27f80 100644
--- a/resources-icons-26/tap_type.svg
+++ b/resources-icons-26/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-28/group_type.svg b/resources-icons-28/group_type.svg
index 36c575b..3bd5bc8 100644
--- a/resources-icons-28/group_type.svg
+++ b/resources-icons-28/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-28/info_type.svg b/resources-icons-28/info_type.svg
index b208798..88a25c9 100644
--- a/resources-icons-28/info_type.svg
+++ b/resources-icons-28/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-28/numeric_type.svg b/resources-icons-28/numeric_type.svg
index a700c5c..e046266 100644
--- a/resources-icons-28/numeric_type.svg
+++ b/resources-icons-28/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-28/tap_type.svg b/resources-icons-28/tap_type.svg
index 21a9ebe..f935891 100644
--- a/resources-icons-28/tap_type.svg
+++ b/resources-icons-28/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-30/group_type.svg b/resources-icons-30/group_type.svg
index b8c6540..306e83a 100644
--- a/resources-icons-30/group_type.svg
+++ b/resources-icons-30/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-30/info_type.svg b/resources-icons-30/info_type.svg
index 6e04f09..1291f90 100644
--- a/resources-icons-30/info_type.svg
+++ b/resources-icons-30/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-30/numeric_type.svg b/resources-icons-30/numeric_type.svg
index b5384ee..b330aee 100644
--- a/resources-icons-30/numeric_type.svg
+++ b/resources-icons-30/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-30/tap_type.svg b/resources-icons-30/tap_type.svg
index f7ca945..03b8fc5 100644
--- a/resources-icons-30/tap_type.svg
+++ b/resources-icons-30/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-32/group_type.svg b/resources-icons-32/group_type.svg
index 5971300..24e5c4b 100644
--- a/resources-icons-32/group_type.svg
+++ b/resources-icons-32/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-32/info_type.svg b/resources-icons-32/info_type.svg
index 5c83e6d..d066025 100644
--- a/resources-icons-32/info_type.svg
+++ b/resources-icons-32/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-32/numeric_type.svg b/resources-icons-32/numeric_type.svg
index 27a939e..000fd74 100644
--- a/resources-icons-32/numeric_type.svg
+++ b/resources-icons-32/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-32/tap_type.svg b/resources-icons-32/tap_type.svg
index 133efdf..510b45f 100644
--- a/resources-icons-32/tap_type.svg
+++ b/resources-icons-32/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-34/group_type.svg b/resources-icons-34/group_type.svg
index 7541eef..dda2a13 100644
--- a/resources-icons-34/group_type.svg
+++ b/resources-icons-34/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-34/info_type.svg b/resources-icons-34/info_type.svg
index 9343dae..ed5d6ca 100644
--- a/resources-icons-34/info_type.svg
+++ b/resources-icons-34/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-34/numeric_type.svg b/resources-icons-34/numeric_type.svg
index dc74c8b..1d3e858 100644
--- a/resources-icons-34/numeric_type.svg
+++ b/resources-icons-34/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-34/tap_type.svg b/resources-icons-34/tap_type.svg
index 3f295b3..5c702da 100644
--- a/resources-icons-34/tap_type.svg
+++ b/resources-icons-34/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-38/group_type.svg b/resources-icons-38/group_type.svg
index de5aa90..b34eccf 100644
--- a/resources-icons-38/group_type.svg
+++ b/resources-icons-38/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-38/info_type.svg b/resources-icons-38/info_type.svg
index 18248f5..29ee6a9 100644
--- a/resources-icons-38/info_type.svg
+++ b/resources-icons-38/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-38/numeric_type.svg b/resources-icons-38/numeric_type.svg
index 5e0997b..bab998c 100644
--- a/resources-icons-38/numeric_type.svg
+++ b/resources-icons-38/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-38/tap_type.svg b/resources-icons-38/tap_type.svg
index 9ab519c..1e0db06 100644
--- a/resources-icons-38/tap_type.svg
+++ b/resources-icons-38/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-42/group_type.svg b/resources-icons-42/group_type.svg
index 413e254..d3d80e8 100644
--- a/resources-icons-42/group_type.svg
+++ b/resources-icons-42/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-42/info_type.svg b/resources-icons-42/info_type.svg
index 4871185..a35a748 100644
--- a/resources-icons-42/info_type.svg
+++ b/resources-icons-42/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-42/numeric_type.svg b/resources-icons-42/numeric_type.svg
index 5959612..36222a1 100644
--- a/resources-icons-42/numeric_type.svg
+++ b/resources-icons-42/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-42/tap_type.svg b/resources-icons-42/tap_type.svg
index e7f403f..be72486 100644
--- a/resources-icons-42/tap_type.svg
+++ b/resources-icons-42/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-46/group_type.svg b/resources-icons-46/group_type.svg
index d5c26c5..4a689b8 100644
--- a/resources-icons-46/group_type.svg
+++ b/resources-icons-46/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-46/info_type.svg b/resources-icons-46/info_type.svg
index 4a8f5ec..36806e6 100644
--- a/resources-icons-46/info_type.svg
+++ b/resources-icons-46/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-46/numeric_type.svg b/resources-icons-46/numeric_type.svg
index a15be51..124afae 100644
--- a/resources-icons-46/numeric_type.svg
+++ b/resources-icons-46/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-46/tap_type.svg b/resources-icons-46/tap_type.svg
index 93b6cd3..736c23c 100644
--- a/resources-icons-46/tap_type.svg
+++ b/resources-icons-46/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-48/group_type.svg b/resources-icons-48/group_type.svg
index b9c633b..7530de3 100644
--- a/resources-icons-48/group_type.svg
+++ b/resources-icons-48/group_type.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
   <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
   <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-48/info_type.svg b/resources-icons-48/info_type.svg
index bd836c8..6f508cc 100644
--- a/resources-icons-48/info_type.svg
+++ b/resources-icons-48/info_type.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
   <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
   <circle class="colour1" cx="480" cy="480" r="400" stroke-width="60" fill-opacity="0.0" />
diff --git a/resources-icons-48/numeric_type.svg b/resources-icons-48/numeric_type.svg
index 629d626..8ad81a1 100644
--- a/resources-icons-48/numeric_type.svg
+++ b/resources-icons-48/numeric_type.svg
@@ -2,7 +2,7 @@
   <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-48/tap_type.svg b/resources-icons-48/tap_type.svg
index 541374c..3348d1b 100644
--- a/resources-icons-48/tap_type.svg
+++ b/resources-icons-48/tap_type.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
   <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
   <g>
diff --git a/resources-icons-53/group_type.svg b/resources-icons-53/group_type.svg
index 9522d4e..4b726d5 100644
--- a/resources-icons-53/group_type.svg
+++ b/resources-icons-53/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-53/info_type.svg b/resources-icons-53/info_type.svg
index 54a8d80..65890ed 100644
--- a/resources-icons-53/info_type.svg
+++ b/resources-icons-53/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-53/numeric_type.svg b/resources-icons-53/numeric_type.svg
index 15085b5..2ad454c 100644
--- a/resources-icons-53/numeric_type.svg
+++ b/resources-icons-53/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-53/tap_type.svg b/resources-icons-53/tap_type.svg
index 146741a..a842a20 100644
--- a/resources-icons-53/tap_type.svg
+++ b/resources-icons-53/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>
diff --git a/resources-icons-55/group_type.svg b/resources-icons-55/group_type.svg
index a5141e4..f9c83f3 100644
--- a/resources-icons-55/group_type.svg
+++ b/resources-icons-55/group_type.svg
@@ -1,6 +1,6 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
diff --git a/resources-icons-55/info_type.svg b/resources-icons-55/info_type.svg
index 9f52410..e54f6a6 100644
--- a/resources-icons-55/info_type.svg
+++ b/resources-icons-55/info_type.svg
@@ -1,6 +1,6 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { stroke: #4444ff; }
+    .colour1 { stroke: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-55/numeric_type.svg b/resources-icons-55/numeric_type.svg
index 1d2a37b..07334b9 100644
--- a/resources-icons-55/numeric_type.svg
+++ b/resources-icons-55/numeric_type.svg
@@ -2,7 +2,7 @@
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; } 
     rect.colour2 { stroke: #00ccff; }
   </style>
diff --git a/resources-icons-55/tap_type.svg b/resources-icons-55/tap_type.svg
index 390d3bc..c592980 100644
--- a/resources-icons-55/tap_type.svg
+++ b/resources-icons-55/tap_type.svg
@@ -1,6 +1,6 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
 <style>
-    .colour1 { fill: #4444ff; }
+    .colour1 { fill: #0091ff; }
     .colour2 { fill: #00ccff; }
   </style>
 <g>

From 0d6c3a10c6e9c8be7f05a3a3de1d45cd80ea7f3c Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Tue, 11 Nov 2025 19:57:51 +0000
Subject: [PATCH 6/6] Changed icons SVG

Changed the way colours were managed in the SVG files to make them more amenable to scripting. Changed the scripts to automate icon resizing.

Co-Authored-By: Joseph Abbey <me@josephabbey.dev>
---
 iconResize.cmd                        | 23 ++++++++
 iconResize.py                         | 76 ++++++++++++---------------
 launcherIconResize.py                 |  2 +-
 resources-icons-18-w/error.svg        |  8 ++-
 resources-icons-18-w/group_type.svg   |  7 ++-
 resources-icons-18-w/info_type.svg    |  8 ++-
 resources-icons-18-w/numeric_type.svg |  9 ++--
 resources-icons-18-w/tap_type.svg     |  7 ++-
 resources-icons-18/error.svg          |  8 ++-
 resources-icons-18/group_type.svg     |  7 ++-
 resources-icons-18/info_type.svg      |  8 ++-
 resources-icons-18/numeric_type.svg   |  9 ++--
 resources-icons-18/tap_type.svg       |  7 ++-
 resources-icons-21-w/error.svg        |  8 ++-
 resources-icons-21-w/group_type.svg   |  7 ++-
 resources-icons-21-w/info_type.svg    |  8 ++-
 resources-icons-21-w/numeric_type.svg |  9 ++--
 resources-icons-21-w/tap_type.svg     |  7 ++-
 resources-icons-21/error.svg          |  8 ++-
 resources-icons-21/group_type.svg     |  7 ++-
 resources-icons-21/info_type.svg      |  8 ++-
 resources-icons-21/numeric_type.svg   |  9 ++--
 resources-icons-21/tap_type.svg       |  7 ++-
 resources-icons-24/error.svg          |  8 ++-
 resources-icons-24/group_type.svg     |  7 ++-
 resources-icons-24/info_type.svg      |  8 ++-
 resources-icons-24/numeric_type.svg   |  9 ++--
 resources-icons-24/tap_type.svg       |  7 ++-
 resources-icons-26/error.svg          |  8 ++-
 resources-icons-26/group_type.svg     |  7 ++-
 resources-icons-26/info_type.svg      |  8 ++-
 resources-icons-26/numeric_type.svg   |  9 ++--
 resources-icons-26/tap_type.svg       |  7 ++-
 resources-icons-28/error.svg          |  8 ++-
 resources-icons-28/group_type.svg     |  7 ++-
 resources-icons-28/info_type.svg      |  8 ++-
 resources-icons-28/numeric_type.svg   |  9 ++--
 resources-icons-28/tap_type.svg       |  7 ++-
 resources-icons-30/error.svg          |  8 ++-
 resources-icons-30/group_type.svg     |  7 ++-
 resources-icons-30/info_type.svg      |  8 ++-
 resources-icons-30/numeric_type.svg   |  9 ++--
 resources-icons-30/tap_type.svg       |  7 ++-
 resources-icons-32/error.svg          |  8 ++-
 resources-icons-32/group_type.svg     |  7 ++-
 resources-icons-32/info_type.svg      |  8 ++-
 resources-icons-32/numeric_type.svg   |  9 ++--
 resources-icons-32/tap_type.svg       |  7 ++-
 resources-icons-34/error.svg          |  8 ++-
 resources-icons-34/group_type.svg     |  7 ++-
 resources-icons-34/info_type.svg      |  8 ++-
 resources-icons-34/numeric_type.svg   |  9 ++--
 resources-icons-34/tap_type.svg       |  7 ++-
 resources-icons-38/error.svg          |  8 ++-
 resources-icons-38/group_type.svg     |  7 ++-
 resources-icons-38/info_type.svg      |  8 ++-
 resources-icons-38/numeric_type.svg   |  9 ++--
 resources-icons-38/tap_type.svg       |  7 ++-
 resources-icons-42/error.svg          |  8 ++-
 resources-icons-42/group_type.svg     |  7 ++-
 resources-icons-42/info_type.svg      |  8 ++-
 resources-icons-42/numeric_type.svg   |  9 ++--
 resources-icons-42/tap_type.svg       |  7 ++-
 resources-icons-46/error.svg          |  8 ++-
 resources-icons-46/group_type.svg     |  7 ++-
 resources-icons-46/info_type.svg      |  8 ++-
 resources-icons-46/numeric_type.svg   |  9 ++--
 resources-icons-46/tap_type.svg       |  7 ++-
 resources-icons-48/error.svg          |  8 ++-
 resources-icons-48/group_type.svg     |  7 ++-
 resources-icons-48/info_type.svg      |  8 ++-
 resources-icons-48/numeric_type.svg   |  9 ++--
 resources-icons-48/tap_type.svg       |  7 ++-
 resources-icons-53/error.svg          |  8 ++-
 resources-icons-53/group_type.svg     |  7 ++-
 resources-icons-53/info_type.svg      |  8 ++-
 resources-icons-53/numeric_type.svg   |  9 ++--
 resources-icons-53/tap_type.svg       |  7 ++-
 resources-icons-55/error.svg          |  8 ++-
 resources-icons-55/group_type.svg     |  7 ++-
 resources-icons-55/info_type.svg      |  8 ++-
 resources-icons-55/numeric_type.svg   |  9 ++--
 resources-icons-55/tap_type.svg       |  7 ++-
 resources-launcher-68-68/launcher.svg |  4 +-
 translate.cmd                         |  4 --
 85 files changed, 507 insertions(+), 226 deletions(-)
 create mode 100644 iconResize.cmd

diff --git a/iconResize.cmd b/iconResize.cmd
new file mode 100644
index 0000000..4ba803f
--- /dev/null
+++ b/iconResize.cmd
@@ -0,0 +1,23 @@
+@echo off
+rem -----------------------------------------------------------------------------------
+rem
+rem  Distributed under MIT Licence
+rem    See https://github.com/house-of-abbey/GarminHomeAssistant/blob/main/LICENSE.
+rem
+rem -----------------------------------------------------------------------------------
+rem
+rem  GarminHomeAssistant is a Garmin IQ application written in Monkey C and routinely
+rem  tested on a Venu 2 device. The source code is provided at:
+rem             https://github.com/house-of-abbey/GarminHomeAssistant.
+rem
+rem  J D Abbey & P A Abbey, 11 November 2025
+rem
+rem  Run the icon generation Python scripts
+rem
+rem -----------------------------------------------------------------------------------
+
+REM change the current directory to the batch file's location
+cd /d %~dp0
+python iconResize.py
+python launcherIconResize.py
+pause
diff --git a/iconResize.py b/iconResize.py
index 44e1f85..41cdb11 100644
--- a/iconResize.py
+++ b/iconResize.py
@@ -30,44 +30,32 @@
 #
 ####################################################################################
 
-from bs4 import BeautifulSoup, Comment
+from bs4 import BeautifulSoup
 import os
 import shutil
 
 output_dir_prefix = 'resources-icons-'
 input_dir         = output_dir_prefix + '48'
 
-Doub = 0
-Sing = 1
-Half = 2
-
-# Original icons for 416x416 screen size with 48x48 icons
-original = (96, 48, 24)
-
-# The icons need to scale as a ratio of screen size 48:416 pixels
-#
-# Icon     55  53   48   46   42   37   32   30   28   26   24   21   19  18
-# Screen  480 454  416  390  360  320  280  260  240  218  208  176  166 156
-
 # Convert icons to different screen sizes by these parameters
-lookup = {
-  #   Doub Sing Half
-  #      0   1   2
-  480: (110, 55, 28),
-  454: (106, 53, 27),
-#  416: ( 96, 48, 24),
-  390: ( 90, 46, 23),
-  360: ( 84, 42, 21),
-  320: ( 74, 38, 19),
-  295: ( 68, 34, 17), # Especially for the instinct3amoled50mm device that clip the icons
-  280: ( 64, 32, 16),
-  260: ( 60, 30, 15),
-  240: ( 56, 28, 14),
-  218: ( 50, 26, 13),
-  208: ( 48, 24, 12),
-  176: ( 42, 21, 11),
-  156: ( 36, 18,  9)
-}
+lookup = [
+  55,
+  53,
+#  48,
+  46,
+  42,
+  38,
+  34, # Especially for the instinct3amoled50mm device that clip the icons
+  32,
+  30,
+  28,
+  26,
+  24,
+  "21-w",
+  21,
+  "18-w",
+  18
+]
 
 # Delete all but the original 48x48 icon directories
 for entry in os.listdir("."):
@@ -75,8 +63,12 @@ for entry in os.listdir("."):
     shutil.rmtree(entry)
 
 # (Re-)Create the resized icon directories
-for screen_size, icon_sizes in lookup.items():
-  output_dir = output_dir_prefix + str(icon_sizes[Sing])
+for icon_size in lookup:
+  output_dir = output_dir_prefix + str(icon_size)
+  white = False
+  if isinstance(icon_size, str):
+    white = True
+    icon_size = int(icon_size.split("-")[0])
   print("\nCreate directory:", output_dir)
   if os.path.exists(output_dir) and os.path.isdir(output_dir):
     shutil.rmtree(output_dir)
@@ -87,16 +79,14 @@ for screen_size, icon_sizes in lookup.items():
       with open(input_dir + "/" + entry, "r") as f:
         soup = BeautifulSoup(f.read(), features="xml")
         svg: BeautifulSoup = list(soup.children)[0]
-        h = int(svg.attrs["height"])
-        if (h == original[Doub]):
-          svg.attrs["width"]  = lookup[screen_size][Doub]
-          svg.attrs["height"] = lookup[screen_size][Doub]
-        elif (h == original[Sing]):
-          svg.attrs["width"]  = lookup[screen_size][Sing]
-          svg.attrs["height"] = lookup[screen_size][Sing]
-        elif (h == original[Half]):
-          svg.attrs["width"]  = lookup[screen_size][Half]
-          svg.attrs["height"] = lookup[screen_size][Half]
+        svg.attrs["width"]  = icon_size
+        svg.attrs["height"] = icon_size
+        if white:
+          # Add white colour style
+          svg.find("style", id="colours").string = """
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+"""
         with open(output_dir + "/" + entry, "wb") as o:
           o.write(svg.encode("utf-8") + b"\n")
     elif entry.endswith(".xml"):
diff --git a/launcherIconResize.py b/launcherIconResize.py
index da9e7ed..1d53941 100644
--- a/launcherIconResize.py
+++ b/launcherIconResize.py
@@ -42,7 +42,7 @@ input_dir         = output_dir_prefix + '70-70'
 # Convert icons to different screen sizes by these parameters
 lookup = [26, 30, 33, 35, 36, 38, 40, 52, 54, 56, 60, 61, 62, 65, 68, 80]
 
-# Delete all but the original 48x48 icon directories
+# Delete all but the original 70x70 icon directories
 for entry in os.listdir("."):
   if entry.startswith(output_dir_prefix) and entry != input_dir:
     shutil.rmtree(entry)
diff --git a/resources-icons-18-w/error.svg b/resources-icons-18-w/error.svg
index eca19ce..51f5fa4 100644
--- a/resources-icons-18-w/error.svg
+++ b/resources-icons-18-w/error.svg
@@ -1,7 +1,11 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { stroke: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-18-w/group_type.svg b/resources-icons-18-w/group_type.svg
index 75fce08..c86fffa 100644
--- a/resources-icons-18-w/group_type.svg
+++ b/resources-icons-18-w/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { fill: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-18-w/info_type.svg b/resources-icons-18-w/info_type.svg
index 5096538..cfad615 100644
--- a/resources-icons-18-w/info_type.svg
+++ b/resources-icons-18-w/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { stroke: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-18-w/numeric_type.svg b/resources-icons-18-w/numeric_type.svg
index 89d3bbf..9e8ad1b 100644
--- a/resources-icons-18-w/numeric_type.svg
+++ b/resources-icons-18-w/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #ffffff; }
-    .colour2 { fill: #ffffff; } 
-    rect.colour2 { stroke: #ffffff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-18-w/tap_type.svg b/resources-icons-18-w/tap_type.svg
index eeb3640..bdcc546 100644
--- a/resources-icons-18-w/tap_type.svg
+++ b/resources-icons-18-w/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { fill: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-18/error.svg b/resources-icons-18/error.svg
index 767dfbd..119cbd8 100644
--- a/resources-icons-18/error.svg
+++ b/resources-icons-18/error.svg
@@ -1,7 +1,11 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-18/group_type.svg b/resources-icons-18/group_type.svg
index 5d7a363..6ea5253 100644
--- a/resources-icons-18/group_type.svg
+++ b/resources-icons-18/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-18/info_type.svg b/resources-icons-18/info_type.svg
index dd693f5..a530bdd 100644
--- a/resources-icons-18/info_type.svg
+++ b/resources-icons-18/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-18/numeric_type.svg b/resources-icons-18/numeric_type.svg
index c53494d..a6bc5cf 100644
--- a/resources-icons-18/numeric_type.svg
+++ b/resources-icons-18/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-18/tap_type.svg b/resources-icons-18/tap_type.svg
index 8812493..37253d9 100644
--- a/resources-icons-18/tap_type.svg
+++ b/resources-icons-18/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="18" viewBox="0 0 960 960" width="18" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-21-w/error.svg b/resources-icons-21-w/error.svg
index 76c15b7..e4b19d4 100644
--- a/resources-icons-21-w/error.svg
+++ b/resources-icons-21-w/error.svg
@@ -1,7 +1,11 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { stroke: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-21-w/group_type.svg b/resources-icons-21-w/group_type.svg
index 855a9b7..0f65e83 100644
--- a/resources-icons-21-w/group_type.svg
+++ b/resources-icons-21-w/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { fill: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-21-w/info_type.svg b/resources-icons-21-w/info_type.svg
index 9ee062e..f8a6f4e 100644
--- a/resources-icons-21-w/info_type.svg
+++ b/resources-icons-21-w/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { stroke: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-21-w/numeric_type.svg b/resources-icons-21-w/numeric_type.svg
index 59972c8..7921ba9 100644
--- a/resources-icons-21-w/numeric_type.svg
+++ b/resources-icons-21-w/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #ffffff; }
-    .colour2 { fill: #ffffff; } 
-    rect.colour2 { stroke: #ffffff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-21-w/tap_type.svg b/resources-icons-21-w/tap_type.svg
index 0aa7c21..d4a51d0 100644
--- a/resources-icons-21-w/tap_type.svg
+++ b/resources-icons-21-w/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #dddddd; }
+    .colour2 { color: #ffffff; }
+</style>
 <style>
-    .colour1 { fill: #ffffff; }
-    .colour2 { fill: #ffffff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-21/error.svg b/resources-icons-21/error.svg
index 686e718..c1bb30f 100644
--- a/resources-icons-21/error.svg
+++ b/resources-icons-21/error.svg
@@ -1,7 +1,11 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-21/group_type.svg b/resources-icons-21/group_type.svg
index 3716eb8..fb6f16c 100644
--- a/resources-icons-21/group_type.svg
+++ b/resources-icons-21/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-21/info_type.svg b/resources-icons-21/info_type.svg
index 263beba..75497d5 100644
--- a/resources-icons-21/info_type.svg
+++ b/resources-icons-21/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-21/numeric_type.svg b/resources-icons-21/numeric_type.svg
index b83141e..d61cab6 100644
--- a/resources-icons-21/numeric_type.svg
+++ b/resources-icons-21/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-21/tap_type.svg b/resources-icons-21/tap_type.svg
index 54eb62c..9ad97db 100644
--- a/resources-icons-21/tap_type.svg
+++ b/resources-icons-21/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="21" viewBox="0 0 960 960" width="21" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-24/error.svg b/resources-icons-24/error.svg
index a785f5d..8cc15e1 100644
--- a/resources-icons-24/error.svg
+++ b/resources-icons-24/error.svg
@@ -1,7 +1,11 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-24/group_type.svg b/resources-icons-24/group_type.svg
index 5e5bf56..e35fd7b 100644
--- a/resources-icons-24/group_type.svg
+++ b/resources-icons-24/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-24/info_type.svg b/resources-icons-24/info_type.svg
index 43b7767..2872a6d 100644
--- a/resources-icons-24/info_type.svg
+++ b/resources-icons-24/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-24/numeric_type.svg b/resources-icons-24/numeric_type.svg
index 2ab3e21..73ccd73 100644
--- a/resources-icons-24/numeric_type.svg
+++ b/resources-icons-24/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-24/tap_type.svg b/resources-icons-24/tap_type.svg
index 5ef37d3..58c0133 100644
--- a/resources-icons-24/tap_type.svg
+++ b/resources-icons-24/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="24" viewBox="0 0 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-26/error.svg b/resources-icons-26/error.svg
index e064c56..77f182a 100644
--- a/resources-icons-26/error.svg
+++ b/resources-icons-26/error.svg
@@ -1,7 +1,11 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-26/group_type.svg b/resources-icons-26/group_type.svg
index 2fba101..c0cf753 100644
--- a/resources-icons-26/group_type.svg
+++ b/resources-icons-26/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-26/info_type.svg b/resources-icons-26/info_type.svg
index 537388b..576518b 100644
--- a/resources-icons-26/info_type.svg
+++ b/resources-icons-26/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-26/numeric_type.svg b/resources-icons-26/numeric_type.svg
index ac1f7d3..9798da4 100644
--- a/resources-icons-26/numeric_type.svg
+++ b/resources-icons-26/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-26/tap_type.svg b/resources-icons-26/tap_type.svg
index de27f80..c9101aa 100644
--- a/resources-icons-26/tap_type.svg
+++ b/resources-icons-26/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="26" viewBox="0 0 960 960" width="26" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-28/error.svg b/resources-icons-28/error.svg
index fc14ef7..26249b3 100644
--- a/resources-icons-28/error.svg
+++ b/resources-icons-28/error.svg
@@ -1,7 +1,11 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-28/group_type.svg b/resources-icons-28/group_type.svg
index 3bd5bc8..58f0511 100644
--- a/resources-icons-28/group_type.svg
+++ b/resources-icons-28/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-28/info_type.svg b/resources-icons-28/info_type.svg
index 88a25c9..1a85e51 100644
--- a/resources-icons-28/info_type.svg
+++ b/resources-icons-28/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-28/numeric_type.svg b/resources-icons-28/numeric_type.svg
index e046266..e6554c8 100644
--- a/resources-icons-28/numeric_type.svg
+++ b/resources-icons-28/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-28/tap_type.svg b/resources-icons-28/tap_type.svg
index f935891..5a310a8 100644
--- a/resources-icons-28/tap_type.svg
+++ b/resources-icons-28/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="28" viewBox="0 0 960 960" width="28" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-30/error.svg b/resources-icons-30/error.svg
index 28e575a..525cb55 100644
--- a/resources-icons-30/error.svg
+++ b/resources-icons-30/error.svg
@@ -1,7 +1,11 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-30/group_type.svg b/resources-icons-30/group_type.svg
index 306e83a..025f20f 100644
--- a/resources-icons-30/group_type.svg
+++ b/resources-icons-30/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-30/info_type.svg b/resources-icons-30/info_type.svg
index 1291f90..45b0df1 100644
--- a/resources-icons-30/info_type.svg
+++ b/resources-icons-30/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-30/numeric_type.svg b/resources-icons-30/numeric_type.svg
index b330aee..0c66836 100644
--- a/resources-icons-30/numeric_type.svg
+++ b/resources-icons-30/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-30/tap_type.svg b/resources-icons-30/tap_type.svg
index 03b8fc5..292f787 100644
--- a/resources-icons-30/tap_type.svg
+++ b/resources-icons-30/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="30" viewBox="0 0 960 960" width="30" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-32/error.svg b/resources-icons-32/error.svg
index 89caeb6..816dc5b 100644
--- a/resources-icons-32/error.svg
+++ b/resources-icons-32/error.svg
@@ -1,7 +1,11 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-32/group_type.svg b/resources-icons-32/group_type.svg
index 24e5c4b..8f20961 100644
--- a/resources-icons-32/group_type.svg
+++ b/resources-icons-32/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-32/info_type.svg b/resources-icons-32/info_type.svg
index d066025..3c5e9ea 100644
--- a/resources-icons-32/info_type.svg
+++ b/resources-icons-32/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-32/numeric_type.svg b/resources-icons-32/numeric_type.svg
index 000fd74..043893e 100644
--- a/resources-icons-32/numeric_type.svg
+++ b/resources-icons-32/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-32/tap_type.svg b/resources-icons-32/tap_type.svg
index 510b45f..0bf7030 100644
--- a/resources-icons-32/tap_type.svg
+++ b/resources-icons-32/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="32" viewBox="0 0 960 960" width="32" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-34/error.svg b/resources-icons-34/error.svg
index 7daa64a..9124fb2 100644
--- a/resources-icons-34/error.svg
+++ b/resources-icons-34/error.svg
@@ -1,7 +1,11 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-34/group_type.svg b/resources-icons-34/group_type.svg
index dda2a13..07ee952 100644
--- a/resources-icons-34/group_type.svg
+++ b/resources-icons-34/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-34/info_type.svg b/resources-icons-34/info_type.svg
index ed5d6ca..8fcc6e6 100644
--- a/resources-icons-34/info_type.svg
+++ b/resources-icons-34/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-34/numeric_type.svg b/resources-icons-34/numeric_type.svg
index 1d3e858..8158de3 100644
--- a/resources-icons-34/numeric_type.svg
+++ b/resources-icons-34/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-34/tap_type.svg b/resources-icons-34/tap_type.svg
index 5c702da..25747ce 100644
--- a/resources-icons-34/tap_type.svg
+++ b/resources-icons-34/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="34" viewBox="0 0 960 960" width="34" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-38/error.svg b/resources-icons-38/error.svg
index 73ae4d1..876a460 100644
--- a/resources-icons-38/error.svg
+++ b/resources-icons-38/error.svg
@@ -1,7 +1,11 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-38/group_type.svg b/resources-icons-38/group_type.svg
index b34eccf..2429826 100644
--- a/resources-icons-38/group_type.svg
+++ b/resources-icons-38/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-38/info_type.svg b/resources-icons-38/info_type.svg
index 29ee6a9..c0963d2 100644
--- a/resources-icons-38/info_type.svg
+++ b/resources-icons-38/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-38/numeric_type.svg b/resources-icons-38/numeric_type.svg
index bab998c..468a596 100644
--- a/resources-icons-38/numeric_type.svg
+++ b/resources-icons-38/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-38/tap_type.svg b/resources-icons-38/tap_type.svg
index 1e0db06..b1d8013 100644
--- a/resources-icons-38/tap_type.svg
+++ b/resources-icons-38/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="38" viewBox="0 0 960 960" width="38" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-42/error.svg b/resources-icons-42/error.svg
index 2a3328d..f90c715 100644
--- a/resources-icons-42/error.svg
+++ b/resources-icons-42/error.svg
@@ -1,7 +1,11 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-42/group_type.svg b/resources-icons-42/group_type.svg
index d3d80e8..d8f37c3 100644
--- a/resources-icons-42/group_type.svg
+++ b/resources-icons-42/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-42/info_type.svg b/resources-icons-42/info_type.svg
index a35a748..5fb0efc 100644
--- a/resources-icons-42/info_type.svg
+++ b/resources-icons-42/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-42/numeric_type.svg b/resources-icons-42/numeric_type.svg
index 36222a1..b5e2ef4 100644
--- a/resources-icons-42/numeric_type.svg
+++ b/resources-icons-42/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-42/tap_type.svg b/resources-icons-42/tap_type.svg
index be72486..dd9ec87 100644
--- a/resources-icons-42/tap_type.svg
+++ b/resources-icons-42/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="42" viewBox="0 0 960 960" width="42" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-46/error.svg b/resources-icons-46/error.svg
index bfacd00..18622f1 100644
--- a/resources-icons-46/error.svg
+++ b/resources-icons-46/error.svg
@@ -1,7 +1,11 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-46/group_type.svg b/resources-icons-46/group_type.svg
index 4a689b8..ff55b1b 100644
--- a/resources-icons-46/group_type.svg
+++ b/resources-icons-46/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-46/info_type.svg b/resources-icons-46/info_type.svg
index 36806e6..234f34e 100644
--- a/resources-icons-46/info_type.svg
+++ b/resources-icons-46/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-46/numeric_type.svg b/resources-icons-46/numeric_type.svg
index 124afae..bfda50f 100644
--- a/resources-icons-46/numeric_type.svg
+++ b/resources-icons-46/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-46/tap_type.svg b/resources-icons-46/tap_type.svg
index 736c23c..a021725 100644
--- a/resources-icons-46/tap_type.svg
+++ b/resources-icons-46/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="46" viewBox="0 0 960 960" width="46" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-48/error.svg b/resources-icons-48/error.svg
index 835cbd5..f6eea5b 100644
--- a/resources-icons-48/error.svg
+++ b/resources-icons-48/error.svg
@@ -1,7 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
   <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
   <circle class="colour1" cx="480" cy="480" r="400" stroke-width="60" fill-opacity="0.0" />
diff --git a/resources-icons-48/group_type.svg b/resources-icons-48/group_type.svg
index 7530de3..a808fb2 100644
--- a/resources-icons-48/group_type.svg
+++ b/resources-icons-48/group_type.svg
@@ -1,7 +1,10 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
   <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
   <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
   <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-48/info_type.svg b/resources-icons-48/info_type.svg
index 6f508cc..93d2421 100644
--- a/resources-icons-48/info_type.svg
+++ b/resources-icons-48/info_type.svg
@@ -1,7 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
   <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
   <circle class="colour1" cx="480" cy="480" r="400" stroke-width="60" fill-opacity="0.0" />
   <g class="colour2">
diff --git a/resources-icons-48/numeric_type.svg b/resources-icons-48/numeric_type.svg
index 8ad81a1..f72babe 100644
--- a/resources-icons-48/numeric_type.svg
+++ b/resources-icons-48/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
   <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
   <rect class="colour2" x="30" y="130" width="900" height="700" rx="100" ry="100" stroke-width="60" fill-opacity="0.0" />
   <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-48/tap_type.svg b/resources-icons-48/tap_type.svg
index 3348d1b..3aa8193 100644
--- a/resources-icons-48/tap_type.svg
+++ b/resources-icons-48/tap_type.svg
@@ -1,7 +1,10 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 960 960" height="48" width="48">
+  <style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
   <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
   <g>
    <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z" />
diff --git a/resources-icons-53/error.svg b/resources-icons-53/error.svg
index be4e732..cd83137 100644
--- a/resources-icons-53/error.svg
+++ b/resources-icons-53/error.svg
@@ -1,7 +1,11 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-53/group_type.svg b/resources-icons-53/group_type.svg
index 4b726d5..2e53545 100644
--- a/resources-icons-53/group_type.svg
+++ b/resources-icons-53/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-53/info_type.svg b/resources-icons-53/info_type.svg
index 65890ed..22ad459 100644
--- a/resources-icons-53/info_type.svg
+++ b/resources-icons-53/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-53/numeric_type.svg b/resources-icons-53/numeric_type.svg
index 2ad454c..f2dd2ea 100644
--- a/resources-icons-53/numeric_type.svg
+++ b/resources-icons-53/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-53/tap_type.svg b/resources-icons-53/tap_type.svg
index a842a20..4f4d8f7 100644
--- a/resources-icons-53/tap_type.svg
+++ b/resources-icons-53/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="53" viewBox="0 0 960 960" width="53" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-icons-55/error.svg b/resources-icons-55/error.svg
index fa26b45..bd95e43 100644
--- a/resources-icons-55/error.svg
+++ b/resources-icons-55/error.svg
@@ -1,7 +1,11 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #aa0000; }
+    .colour2 { color: #ff1111; }
+  </style>
 <style>
-    .colour1 { stroke: #aa0000; }
-    .colour2 { fill: #ff1111; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
     text.large { font: bold 600px sans-serif; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
diff --git a/resources-icons-55/group_type.svg b/resources-icons-55/group_type.svg
index f9c83f3..8fefa93 100644
--- a/resources-icons-55/group_type.svg
+++ b/resources-icons-55/group_type.svg
@@ -1,7 +1,10 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="160"/>
 <rect class="colour1" height="160" rx="20" ry="20" width="560" x="300" y="400"/>
diff --git a/resources-icons-55/info_type.svg b/resources-icons-55/info_type.svg
index e54f6a6..4f81fda 100644
--- a/resources-icons-55/info_type.svg
+++ b/resources-icons-55/info_type.svg
@@ -1,7 +1,11 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { stroke: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1 { stroke: currentColor; }
+    .colour2 { fill: currentColor; }
   </style>
 <circle class="colour1" cx="480" cy="480" fill-opacity="0.0" r="400" stroke-width="60"/>
 <g class="colour2">
diff --git a/resources-icons-55/numeric_type.svg b/resources-icons-55/numeric_type.svg
index 07334b9..09b281a 100644
--- a/resources-icons-55/numeric_type.svg
+++ b/resources-icons-55/numeric_type.svg
@@ -1,10 +1,13 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
     text.small { font: bold 400px sans-serif; }
     text.large { font: bold 500px sans-serif; }
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; } 
-    rect.colour2 { stroke: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; } 
+    rect.colour2 { stroke: currentColor; }
   </style>
 <rect class="colour2" fill-opacity="0.0" height="700" rx="100" ry="100" stroke-width="60" width="900" x="30" y="130"/>
 <text class="small colour1" x="110" y="610">1</text>
diff --git a/resources-icons-55/tap_type.svg b/resources-icons-55/tap_type.svg
index c592980..729f4e2 100644
--- a/resources-icons-55/tap_type.svg
+++ b/resources-icons-55/tap_type.svg
@@ -1,7 +1,10 @@
 <svg height="55" viewBox="0 0 960 960" width="55" xmlns="http://www.w3.org/2000/svg">
+<style id="colours">
+    .colour1 { color: #0091ff; }
+    .colour2 { color: #00ccff; }
+  </style>
 <style>
-    .colour1 { fill: #0091ff; }
-    .colour2 { fill: #00ccff; }
+    .colour1, .colour2 { fill: currentColor; }
   </style>
 <g>
 <path class="colour1" d="m463.2,216.48c58.5,0 94.47,43.11 97.5,103.57l0,8l0,93.79l96.2,18.22c3.9,0.44 7.37,1.33 11.26,2.22c72.37,20 116.57,94.67 101.39,168.91l-1.73,8l-45.5,174.69c-9.53,36 -37.7,63.56 -73.23,71.56l-6.94,1.33l-104.86,15.56c-40.3,5.78 -79.3,-14.22 -98.8,-49.79l-3.47,-7.11l-1.3,-2.66c-10.4,-22.67 -25.57,-42.22 -44.64,-56.9l-8.24,-6.22l-81.47,-56.01l-4.34,-2.66l0,0l-4.34,-2.22l-102.26,-52.01c-10.83,-5.78 -17.77,-16.89 -17.77,-29.34c-1.3,-49.33 19.93,-87.12 61.1,-108.46c30.76,-15.56 71.06,-14.67 122.63,0.89l11.26,3.56l0,-185.35c0,-64.45 36.4,-111.57 97.5,-111.57l0.02,-0.01zm0,66.67c-19.93,0 -30.76,12 -32.5,38.67l0,6.22l0,232.91c0,24 -23.4,40.01 -45.07,31.11c-63.27,-27.12 -105.73,-33.34 -124.36,-23.56c-11.26,5.78 -18.2,12.89 -22.1,23.11l-1.73,5.33l82.33,42.22l7.8,4.45l0,0l7.8,4.45l81.47,56.01c29.46,20 53.73,47.56 70.63,79.57l5.2,11.11l1.3,2.66c5.2,12 16.9,19.11 29.46,19.11l4.34,0l104.86,-15.56c11.26,-1.77 20.8,-9.34 25.14,-20l1.73,-4.45l45.5,-174.24c10.83,-41.78 -13.43,-84.45 -53.73,-95.56l-3.03,-0.44l0,0l-125.66,-23.56c-14.3,-2.66 -24.7,-14.22 -26.44,-28l-0.43,-4.89l0,-121.79c0,-30.67 -10.83,-44.9 -32.5,-44.9l0,0.02z"/>
diff --git a/resources-launcher-68-68/launcher.svg b/resources-launcher-68-68/launcher.svg
index 2d63153..3fdea64 100644
--- a/resources-launcher-68-68/launcher.svg
+++ b/resources-launcher-68-68/launcher.svg
@@ -1,4 +1,4 @@
-<svg width="68" height="68" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg fill="none" height="68" viewBox="0 0 400 400" width="68" xmlns="http://www.w3.org/2000/svg">
 <path d="M320 301.762C320 310.012 313.25 316.762 305 316.762H95C86.75 316.762 80 310.012 80 301.762V211.762C80 203.512 84.77 191.993 90.61 186.153L189.39 87.3725C195.22 81.5425 204.77 81.5425 210.6 87.3725L309.39 186.162C315.22 191.992 320 203.522 320 211.772V301.772V301.762Z" fill="#F2F4F9"/>
 <path d="M309.39 186.153L210.61 87.3725C204.78 81.5425 195.23 81.5425 189.4 87.3725L90.61 186.153C84.78 191.983 80 203.512 80 211.762V301.762C80 310.012 86.75 316.762 95 316.762H187.27L146.64 276.132C144.55 276.852 142.32 277.262 140 277.262C128.7 277.262 119.5 268.062 119.5 256.762C119.5 245.462 128.7 236.262 140 236.262C151.3 236.262 160.5 245.462 160.5 256.762C160.5 259.092 160.09 261.322 159.37 263.412L191 295.042V179.162C184.2 175.822 179.5 168.842 179.5 160.772C179.5 149.472 188.7 140.272 200 140.272C211.3 140.272 220.5 149.472 220.5 160.772C220.5 168.842 215.8 175.822 209 179.162V260.432L240.46 228.972C239.84 227.012 239.5 224.932 239.5 222.772C239.5 211.472 248.7 202.272 260 202.272C271.3 202.272 280.5 211.472 280.5 222.772C280.5 234.072 271.3 243.272 260 243.272C257.5 243.272 255.12 242.802 252.91 241.982L209 285.892V316.772H305C313.25 316.772 320 310.022 320 301.772V211.772C320 203.522 315.23 192.002 309.39 186.162V186.153Z" fill="#18BCF2"/>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/translate.cmd b/translate.cmd
index 0b504fb..031e5fb 100644
--- a/translate.cmd
+++ b/translate.cmd
@@ -14,10 +14,6 @@ rem  J D Abbey & P A Abbey, 28 December 2022
 rem
 rem  Run the automatic translation script.
 rem
-rem  Reference:
-rem   * Using Monkey C from the Command Line
-rem     https://developer.garmin.com/connect-iq/reference-guides/monkey-c-command-line-setup/
-rem
 rem -----------------------------------------------------------------------------------
 
 rem 'pip' instructs us to add this to the PATH for 'websockets.exe' and 'httpx.exe'