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,