diff --git a/public/icons.zip b/public/icons.zip
index 9746a6b6f5..ba5c7b1474 100644
Binary files a/public/icons.zip and b/public/icons.zip differ
diff --git a/public/icons/meta-data.json b/public/icons/meta-data.json
index 5ee9aeea40..d02d10a2bf 100644
--- a/public/icons/meta-data.json
+++ b/public/icons/meta-data.json
@@ -2017,6 +2017,7 @@
   "category": "symbols",
   "path": "symbols/clinical_fe",
   "tags": [
+   "Chart",
    "Clinical Note",
    "Doctor Note",
    "Document",
@@ -2031,6 +2032,7 @@
   "category": "symbols",
   "path": "symbols/clinical_f",
   "tags": [
+   "Chart",
    "Clinical Note",
    "Doctor Note",
    "Document",
@@ -2071,6 +2073,7 @@
   "path": "symbols/cardiogram_e",
   "tags": [
    "Cardiology",
+   "Chart",
    "Heart",
    "Heartbeat",
    "dhis2:cardiogram_e"
@@ -3359,6 +3362,7 @@
   "path": "symbols/register_book",
   "tags": [
    "Book",
+   "Chart",
    "Document",
    "Documentation",
    "Health Record",
@@ -3888,6 +3892,7 @@
   "category": "symbols",
   "path": "symbols/default",
   "tags": [
+   "Chart",
    "Document",
    "Paper",
    "Test",
@@ -6203,34 +6208,6 @@
   ],
   "title": "Cow"
  },
- {
-  "id": "animal_spider",
-  "category": "zoonoses",
-  "path": "zoonoses/animal_spider",
-  "tags": [
-   "Animal",
-   "Arachnid",
-   "Bite",
-   "Disease",
-   "Insect",
-   "Poison",
-   "Zoonoses",
-   "Zoonotic Diseases"
-  ],
-  "title": "Spider"
- },
- {
-  "id": "animal_tick",
-  "category": "zoonoses",
-  "path": "zoonoses/animal_tick",
-  "tags": [
-   "Animal",
-   "Disease",
-   "Insect",
-   "Zoonotic Diseases"
-  ],
-  "title": "Tick"
- },
  {
   "id": "assembly_point",
   "category": "symbols",
@@ -6850,21 +6827,6 @@
   ],
   "title": "PPE Sanitizer ALT"
  },
- {
-  "id": "animal_chicken",
-  "category": "zoonoses",
-  "path": "zoonoses/animal_chicken",
-  "tags": [
-   "Bird Flu",
-   "Chicken",
-   "Chicken Pox",
-   "Farm",
-   "Poultry",
-   "Zoonoses",
-   "Zoonotic Disease"
-  ],
-  "title": "Chicken"
- },
  {
   "id": "blood_cells",
   "category": "body",
@@ -7576,7 +7538,7 @@
    "Graph",
    "Visualization"
   ],
-  "title": "Chart Bars"
+  "title": "Bar Chart"
  },
  {
   "id": "chart_bar_stacked",
@@ -7588,7 +7550,7 @@
    "Graph",
    "Visualization"
   ],
-  "title": "Chart Split Bars"
+  "title": "Split Bar Chart"
  },
  {
   "id": "chart_line",
@@ -7601,7 +7563,7 @@
    "Node",
    "Visualization"
   ],
-  "title": "Chart Line"
+  "title": "Line Chart"
  },
  {
   "id": "chart_line_stacked",
@@ -7614,7 +7576,7 @@
    "Node",
    "Visualization"
   ],
-  "title": "Chart Double Line"
+  "title": "Double Line Chart"
  },
  {
   "id": "chart_pie",
@@ -7627,7 +7589,7 @@
    "Pie Chart",
    "Visualization"
   ],
-  "title": "Chart Pie"
+  "title": "Pie Chart"
  },
  {
   "id": "chart-cured-decreasing",
@@ -7644,7 +7606,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Cured Decreasing"
+  "title": "Cured Decreasing Line Chart"
  },
  {
   "id": "chart-cured-increasing",
@@ -7661,7 +7623,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Cured Increasing"
+  "title": "Cured Increasing Line Chart"
  },
  {
   "id": "chart-death-rate-increasing",
@@ -7678,7 +7640,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Death Rate Decreasing"
+  "title": "Death Rate Decreasing Line Chart"
  },
  {
   "id": "chart-death-rate-decreasing",
@@ -7695,7 +7657,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Death Rate Increasing"
+  "title": "Death Rate Increasing Line Chart"
  },
  {
   "id": "chart-death-rate-stable",
@@ -7712,7 +7674,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Death Rate Stable"
+  "title": "Death Rate Stable Line Chart"
  },
  {
   "id": "chart-infected-decreasing",
@@ -7727,7 +7689,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Infected Decreasing"
+  "title": "Infected Decreasing Line Chart"
  },
  {
   "id": "chart-infected-increasing",
@@ -7742,7 +7704,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Infected Increasing"
+  "title": "Infected Increasing Line Chart"
  },
  {
   "id": "chart-infected-stable",
@@ -7759,7 +7721,7 @@
    "Virology",
    "Virus"
   ],
-  "title": "Chart Infected Stable"
+  "title": "Infected Stable Line Chart"
  },
  {
   "id": "hot_meal",
@@ -8468,5 +8430,124 @@
    "Satellite"
   ],
   "title": "Emergency Operations Center"
+ },
+ {
+  "id": "animal_spider",
+  "category": "zoonoses",
+  "path": "zoonoses/animal_spider",
+  "tags": [
+   "Animal",
+   "Arachnid",
+   "Bite",
+   "Disease",
+   "Insect",
+   "Poison",
+   "Zoonoses",
+   "Zoonotic Diseases"
+  ],
+  "title": "Spider"
+ },
+ {
+  "id": "animal_tick",
+  "category": "zoonoses",
+  "path": "zoonoses/animal_tick",
+  "tags": [
+   "Animal",
+   "Disease",
+   "Insect",
+   "Zoonotic Diseases"
+  ],
+  "title": "Tick"
+ },
+ {
+  "id": "animal_chicken",
+  "category": "zoonoses",
+  "path": "zoonoses/animal_chicken",
+  "tags": [
+   "Bird Flu",
+   "Chicken",
+   "Chicken Pox",
+   "Farm",
+   "Poultry",
+   "Zoonoses",
+   "Zoonotic Disease"
+  ],
+  "title": "Chicken"
+ },
+ {
+  "id": "medicine_mortar",
+  "category": "devices",
+  "path": "devices/medicine_mortar",
+  "tags": [
+   "Compound",
+   "Compounding",
+   "Medicine",
+   "Mix",
+   "Mortar",
+   "Pestle",
+   "Pharmacy"
+  ],
+  "title": "Mortar and Pestle"
+ },
+ {
+  "id": "medicine_bottle",
+  "category": "devices",
+  "path": "devices/medicine_bottle",
+  "tags": [
+   "Bottle",
+   "Capsule",
+   "Drug",
+   "Medication",
+   "Packaging",
+   "Pharmacy",
+   "Prescription"
+  ],
+  "title": "Medicine Container"
+ },
+ {
+  "id": "asthma_inhaler",
+  "category": "devices",
+  "path": "devices/asthma_inhaler",
+  "tags": [
+   "Allergy",
+   "Asthma",
+   "Breath",
+   "Breathing",
+   "Inhaler",
+   "Lung",
+   "Nebulizer",
+   "Puffer",
+   "Pump",
+   "Respiratory System"
+  ],
+  "title": "Inhaler"
+ },
+ {
+  "id": "hearing_aid",
+  "category": "devices",
+  "path": "devices/hearing_aid",
+  "tags": [
+   "Assistive",
+   "Audio",
+   "Audiology",
+   "Device",
+   "Ear",
+   "Hearing"
+  ],
+  "title": "Hearing Aid"
+ },
+ {
+  "id": "crutches",
+  "category": "devices",
+  "path": "devices/crutches",
+  "tags": [
+   "Assistive",
+   "Break",
+   "Crutch",
+   "Physical Therapy",
+   "Rehab",
+   "Rehabilitation"
+  ],
+  "title": "Crutch"
  }
 ]
\ No newline at end of file
diff --git a/public/icons/png/filled/devices/asthma_inhaler.png b/public/icons/png/filled/devices/asthma_inhaler.png
new file mode 100644
index 0000000000..f08b78590c
Binary files /dev/null and b/public/icons/png/filled/devices/asthma_inhaler.png differ
diff --git a/public/icons/png/filled/devices/asthma_inhaler@2x.png b/public/icons/png/filled/devices/asthma_inhaler@2x.png
new file mode 100644
index 0000000000..9d3527a98a
Binary files /dev/null and b/public/icons/png/filled/devices/asthma_inhaler@2x.png differ
diff --git a/public/icons/png/filled/devices/crutches.png b/public/icons/png/filled/devices/crutches.png
new file mode 100644
index 0000000000..5e8b9ddfde
Binary files /dev/null and b/public/icons/png/filled/devices/crutches.png differ
diff --git a/public/icons/png/filled/devices/crutches@2x.png b/public/icons/png/filled/devices/crutches@2x.png
new file mode 100644
index 0000000000..ded3b7a05a
Binary files /dev/null and b/public/icons/png/filled/devices/crutches@2x.png differ
diff --git a/public/icons/png/filled/devices/hearing_aid.png b/public/icons/png/filled/devices/hearing_aid.png
new file mode 100644
index 0000000000..996f5415f5
Binary files /dev/null and b/public/icons/png/filled/devices/hearing_aid.png differ
diff --git a/public/icons/png/filled/devices/hearing_aid@2x.png b/public/icons/png/filled/devices/hearing_aid@2x.png
new file mode 100644
index 0000000000..5ea59fd07d
Binary files /dev/null and b/public/icons/png/filled/devices/hearing_aid@2x.png differ
diff --git a/public/icons/png/filled/devices/medicine_bottle.png b/public/icons/png/filled/devices/medicine_bottle.png
new file mode 100644
index 0000000000..504327f658
Binary files /dev/null and b/public/icons/png/filled/devices/medicine_bottle.png differ
diff --git a/public/icons/png/filled/devices/medicine_bottle@2x.png b/public/icons/png/filled/devices/medicine_bottle@2x.png
new file mode 100644
index 0000000000..d1c9b4189b
Binary files /dev/null and b/public/icons/png/filled/devices/medicine_bottle@2x.png differ
diff --git a/public/icons/png/filled/devices/medicine_mortar.png b/public/icons/png/filled/devices/medicine_mortar.png
new file mode 100644
index 0000000000..dbae2b4fc7
Binary files /dev/null and b/public/icons/png/filled/devices/medicine_mortar.png differ
diff --git a/public/icons/png/filled/devices/medicine_mortar@2x.png b/public/icons/png/filled/devices/medicine_mortar@2x.png
new file mode 100644
index 0000000000..5bb6c0a007
Binary files /dev/null and b/public/icons/png/filled/devices/medicine_mortar@2x.png differ
diff --git a/public/icons/png/filled/zoonoses/animal_tick.png b/public/icons/png/filled/zoonoses/animal_tick.png
index 2ecc309fe6..534937b671 100644
Binary files a/public/icons/png/filled/zoonoses/animal_tick.png and b/public/icons/png/filled/zoonoses/animal_tick.png differ
diff --git a/public/icons/png/negative/devices/asthma__inhaler.png b/public/icons/png/negative/devices/asthma__inhaler.png
new file mode 100644
index 0000000000..94c66a00ae
Binary files /dev/null and b/public/icons/png/negative/devices/asthma__inhaler.png differ
diff --git a/public/icons/png/negative/devices/asthma__inhaler@2x.png b/public/icons/png/negative/devices/asthma__inhaler@2x.png
new file mode 100644
index 0000000000..90522a31df
Binary files /dev/null and b/public/icons/png/negative/devices/asthma__inhaler@2x.png differ
diff --git a/public/icons/png/negative/devices/crutches.png b/public/icons/png/negative/devices/crutches.png
new file mode 100644
index 0000000000..04e18b2084
Binary files /dev/null and b/public/icons/png/negative/devices/crutches.png differ
diff --git a/public/icons/png/negative/devices/crutches@2x.png b/public/icons/png/negative/devices/crutches@2x.png
new file mode 100644
index 0000000000..d111d664a2
Binary files /dev/null and b/public/icons/png/negative/devices/crutches@2x.png differ
diff --git a/public/icons/png/negative/devices/hearing_aid.png b/public/icons/png/negative/devices/hearing_aid.png
new file mode 100644
index 0000000000..588cb174e5
Binary files /dev/null and b/public/icons/png/negative/devices/hearing_aid.png differ
diff --git a/public/icons/png/negative/devices/hearing_aid@2x.png b/public/icons/png/negative/devices/hearing_aid@2x.png
new file mode 100644
index 0000000000..3d7ffb43b8
Binary files /dev/null and b/public/icons/png/negative/devices/hearing_aid@2x.png differ
diff --git a/public/icons/png/negative/devices/medicine_bottle.png b/public/icons/png/negative/devices/medicine_bottle.png
new file mode 100644
index 0000000000..02768b1827
Binary files /dev/null and b/public/icons/png/negative/devices/medicine_bottle.png differ
diff --git a/public/icons/png/negative/devices/medicine_bottle@2x.png b/public/icons/png/negative/devices/medicine_bottle@2x.png
new file mode 100644
index 0000000000..d8016b2086
Binary files /dev/null and b/public/icons/png/negative/devices/medicine_bottle@2x.png differ
diff --git a/public/icons/png/negative/devices/medicine_mortar.png b/public/icons/png/negative/devices/medicine_mortar.png
new file mode 100644
index 0000000000..aac1ce2daf
Binary files /dev/null and b/public/icons/png/negative/devices/medicine_mortar.png differ
diff --git a/public/icons/png/negative/devices/medicine_mortar@2x.png b/public/icons/png/negative/devices/medicine_mortar@2x.png
new file mode 100644
index 0000000000..e1401ca346
Binary files /dev/null and b/public/icons/png/negative/devices/medicine_mortar@2x.png differ
diff --git a/public/icons/png/outline/devices/asthma_inhaler.png b/public/icons/png/outline/devices/asthma_inhaler.png
new file mode 100644
index 0000000000..ef92ec2680
Binary files /dev/null and b/public/icons/png/outline/devices/asthma_inhaler.png differ
diff --git a/public/icons/png/outline/devices/asthma_inhaler@2x.png b/public/icons/png/outline/devices/asthma_inhaler@2x.png
new file mode 100644
index 0000000000..d8ef36ee6b
Binary files /dev/null and b/public/icons/png/outline/devices/asthma_inhaler@2x.png differ
diff --git a/public/icons/png/outline/devices/crutches.png b/public/icons/png/outline/devices/crutches.png
new file mode 100644
index 0000000000..80db06c109
Binary files /dev/null and b/public/icons/png/outline/devices/crutches.png differ
diff --git a/public/icons/png/outline/devices/crutches@2x.png b/public/icons/png/outline/devices/crutches@2x.png
new file mode 100644
index 0000000000..dfe3b09c9c
Binary files /dev/null and b/public/icons/png/outline/devices/crutches@2x.png differ
diff --git a/public/icons/png/outline/devices/hearing_aid.png b/public/icons/png/outline/devices/hearing_aid.png
new file mode 100644
index 0000000000..ef7faf44a8
Binary files /dev/null and b/public/icons/png/outline/devices/hearing_aid.png differ
diff --git a/public/icons/png/outline/devices/hearing_aid@2x.png b/public/icons/png/outline/devices/hearing_aid@2x.png
new file mode 100644
index 0000000000..07cf6c196c
Binary files /dev/null and b/public/icons/png/outline/devices/hearing_aid@2x.png differ
diff --git a/public/icons/png/outline/devices/medicine_bottle.png b/public/icons/png/outline/devices/medicine_bottle.png
new file mode 100644
index 0000000000..f5be8fbf0e
Binary files /dev/null and b/public/icons/png/outline/devices/medicine_bottle.png differ
diff --git a/public/icons/png/outline/devices/medicine_bottle@2x.png b/public/icons/png/outline/devices/medicine_bottle@2x.png
new file mode 100644
index 0000000000..3b8bce872d
Binary files /dev/null and b/public/icons/png/outline/devices/medicine_bottle@2x.png differ
diff --git a/public/icons/png/outline/devices/medicine_mortar.png b/public/icons/png/outline/devices/medicine_mortar.png
new file mode 100644
index 0000000000..f9e7556a69
Binary files /dev/null and b/public/icons/png/outline/devices/medicine_mortar.png differ
diff --git a/public/icons/png/outline/devices/medicine_mortar@2x.png b/public/icons/png/outline/devices/medicine_mortar@2x.png
new file mode 100644
index 0000000000..91ef82a437
Binary files /dev/null and b/public/icons/png/outline/devices/medicine_mortar@2x.png differ
diff --git a/public/icons/svg/filled/devices/asthma_inhaler.svg b/public/icons/svg/filled/devices/asthma_inhaler.svg
new file mode 100644
index 0000000000..1be6fa6231
--- /dev/null
+++ b/public/icons/svg/filled/devices/asthma_inhaler.svg
@@ -0,0 +1,9 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8652 6.13398C16.0949 6.26659 16.2625 6.485 16.3312 6.74118L17.406 10.7526L18.1771 10.4018C18.4447 10.2801 18.7522 10.2822 19.0181 10.4077C19.2839 10.5332 19.481 10.7693 19.5571 11.0532L23.83 27H30C30.5522 27 31 27.4477 31 28L31 40C31 40.2652 30.8946 40.5196 30.7071 40.7071C30.5195 40.8946 30.2652 41 30 41H17.0511C14.7987 41 12.8244 39.494 12.229 37.3217L6.55329 16.614C6.4235 16.1405 6.6567 15.6428 7.10362 15.4395L8.17812 14.9506L6.6719 9.32937C6.60326 9.07319 6.63919 8.80024 6.7718 8.57055C6.90441 8.34087 7.12283 8.17327 7.37901 8.10463L15.1064 6.03408C15.3626 5.96543 15.6356 6.00137 15.8652 6.13398ZM10.0237 14.111L8.86257 9.77766L14.6581 8.22475L15.5604 11.5922L10.0237 14.111Z" fill="currentColor"/>
+<path d="M33 29H35V39H33V29Z" fill="currentColor"/>
+<path d="M38 33C38.5523 33 39 32.5523 39 32C39 31.4477 38.5523 31 38 31C37.4477 31 37 31.4477 37 32C37 32.5523 37.4477 33 38 33Z" fill="currentColor"/>
+<path d="M39 36C39 36.5523 38.5523 37 38 37C37.4477 37 37 36.5523 37 36C37 35.4477 37.4477 35 38 35C38.5523 35 39 35.4477 39 36Z" fill="currentColor"/>
+<path d="M42 35C42.5523 35 43 34.5523 43 34C43 33.4477 42.5523 33 42 33C41.4477 33 41 33.4477 41 34C41 34.5523 41.4477 35 42 35Z" fill="currentColor"/>
+<path d="M43 30C43 30.5523 42.5523 31 42 31C41.4477 31 41 30.5523 41 30C41 29.4477 41.4477 29 42 29C42.5523 29 43 29.4477 43 30Z" fill="currentColor"/>
+<path d="M42 39C42.5523 39 43 38.5523 43 38C43 37.4477 42.5523 37 42 37C41.4477 37 41 37.4477 41 38C41 38.5523 41.4477 39 42 39Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/filled/devices/crutches.svg b/public/icons/svg/filled/devices/crutches.svg
new file mode 100644
index 0000000000..2ea5fd41db
--- /dev/null
+++ b/public/icons/svg/filled/devices/crutches.svg
@@ -0,0 +1,5 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" fill="none"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.0314 9.99982C31.1215 9.98308 32.0001 9.09417 32.0001 8.00006V4.00006H16.0001V8.00006C16.0001 9.09052 16.8728 9.97715 17.9578 9.99962C17.9614 10.0843 17.9662 10.189 17.9725 10.3152C17.9926 10.7188 18.0279 11.342 18.0894 12.2287C18.2122 14.0021 18.4392 16.8312 18.8567 21.068C19.0064 22.587 19.8977 23.9454 20.6038 25.0214L20.6828 25.1419C21.0666 25.7279 21.3995 26.2416 21.6419 26.74C21.8822 27.2341 21.997 27.6423 21.997 28.0023C21.997 28.2598 21.9978 29.0095 21.9986 29.694L22.0002 30.9989C22.0009 31.5508 22.4484 31.9981 23.0001 31.9981L23.0001 39.0017C23.0001 39.553 23.447 40 23.9983 40C24.5497 40 24.9966 39.553 24.9966 39.0017V38.9949H25.0001V32.0144L25.0097 32.0145C25.562 32.0145 26.0097 31.5668 26.0097 31.0144V27.9737C26.0097 27.6181 26.1247 27.217 26.3672 26.7304C26.6123 26.2386 26.9479 25.7341 27.3359 25.1542L27.4004 25.0579C28.1146 23.9919 29.0267 22.6305 29.1485 21.0816C29.4748 16.9302 29.7002 14.1029 29.844 12.3136C29.9159 11.4189 29.9674 10.7838 30.0009 10.3724L30.0314 9.99982ZM28.0075 10.21L28.0247 10.0001H19.9598C19.9626 10.0626 19.966 10.1344 19.97 10.2159C19.9894 10.6052 20.024 11.2153 20.0846 12.0906C20.1216 12.625 20.1683 13.2582 20.2272 14.0001H27.7026C27.7592 13.2908 27.8083 12.6776 27.8504 12.1534C27.9224 11.2581 27.9739 10.6222 28.0075 10.21ZM24.1336 27.004C24.2373 26.5897 24.397 26.1999 24.5771 25.8384C24.8851 25.2204 25.2896 24.6159 25.6576 24.0661L25.6737 24.042C26.4715 22.8498 27.0778 21.9015 27.1546 20.9248C27.305 19.0115 27.434 17.3792 27.5435 16.0001H20.3936C20.5114 17.3597 20.66 18.973 20.8471 20.8719C20.9448 21.8635 21.5634 22.8362 22.3558 24.046C22.7266 24.6121 23.1327 25.2325 23.4404 25.8652C23.6131 26.2203 23.7663 26.6012 23.868 27.004H24.1336Z" fill="currentColor"/>
+<path d="M22.302 41.9658C22.4359 41.334 23.3404 40.9934 23.9863 40.9934C24.6445 40.9934 25.554 41.3328 25.6935 41.9761L25.8423 42.6623C25.9359 43.094 25.7352 43.5387 25.3235 43.6989C24.9352 43.8501 24.4367 43.9999 23.9864 43.9999C23.5642 43.9999 23.0719 43.8496 22.6829 43.6982C22.2689 43.537 22.0634 43.091 22.1556 42.6563L22.302 41.9658Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/filled/devices/hearing_aid.svg b/public/icons/svg/filled/devices/hearing_aid.svg
new file mode 100644
index 0000000000..828267161a
--- /dev/null
+++ b/public/icons/svg/filled/devices/hearing_aid.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 18C15 11.9249 19.9249 7 26 7C32.0751 7 37 11.9249 37 18C37 21.8069 35.067 25.1627 32.1242 27.139C29.6282 28.8153 27 31.4539 27 34.9113V35C27 38.3137 24.3137 41 21 41C17.6863 41 15 38.3137 15 35V34.1421C15 32.1321 15.6724 30.1914 16.8926 28.6208L17.6716 29.3998C18.0282 29.7564 18.5946 29.7917 18.9927 29.482L24.8716 24.9095C25.2389 24.9691 25.6159 25 26 25C29.866 25 33 21.866 33 18C33 14.134 29.866 11 26 11C22.134 11 19 14.134 19 18C19 18.5406 19.0613 19.0668 19.1773 19.5722L14.7609 25.2503C14.4513 25.6484 14.4866 26.2147 14.8432 26.5714L15.4693 27.1975C13.8793 29.1505 13 31.601 13 34.1421V35C13 39.4183 16.5817 43 21 43C25.4183 43 29 39.4183 29 35V34.9113C29 32.5075 30.8696 30.3908 33.2393 28.7993C36.7115 26.4674 39 22.5012 39 18C39 10.8203 33.1797 5 26 5C18.8203 5 13 10.8203 13 18H15ZM20.0564 21.6995C20.6876 22.7116 21.5702 23.5507 22.6168 24.1296L18.4616 27.3613L16.8816 25.7814L20.0564 21.6995Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/filled/devices/medicine_bottle.svg b/public/icons/svg/filled/devices/medicine_bottle.svg
new file mode 100644
index 0000000000..44cd066fba
--- /dev/null
+++ b/public/icons/svg/filled/devices/medicine_bottle.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 7C9 5.34315 10.3431 4 12 4H36C37.6569 4 39 5.34315 39 7V15C39 16.6569 37.6569 18 36 18V41C36 42.6569 34.6569 44 33 44H15C13.3431 44 12 42.6569 12 41L12 18C10.3431 18 9 16.6569 9 15V7ZM16 16L16 6H12C11.4477 6 11 6.44772 11 7V15C11 15.5523 11.4477 16 12 16H16ZM18 16H23L23 6H18V16ZM25 16H30V6H25V16ZM32 16H36C36.5523 16 37 15.5523 37 15V7C37 6.44772 36.5523 6 36 6H32V16ZM23 30V35H25V30H30V28H25V23H23V28H18V30H23Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/filled/devices/medicine_mortar.svg b/public/icons/svg/filled/devices/medicine_mortar.svg
new file mode 100644
index 0000000000..7f04cf8e2b
--- /dev/null
+++ b/public/icons/svg/filled/devices/medicine_mortar.svg
@@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.0137 7.2646C36.6292 6.46529 34.8612 6.892 33.9937 8.23481L27.6854 18H35.9328L39.3523 11.3286C40.0815 9.90593 39.567 8.16141 38.1825 7.3621L38.0137 7.2646Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43 22H41V25C41 30.7841 37.2225 35.6859 32 37.373V41C32 41.5523 31.5523 42 31 42H17C16.4477 42 16 41.5523 16 41V37.373C10.7775 35.6859 7 30.7841 7 25V22H5V20H43V22ZM18 38V40H30V38H18Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/filled/zoonoses/animal_tick.svg b/public/icons/svg/filled/zoonoses/animal_tick.svg
index ea2c933139..4126591bf1 100644
--- a/public/icons/svg/filled/zoonoses/animal_tick.svg
+++ b/public/icons/svg/filled/zoonoses/animal_tick.svg
@@ -1,3 +1,3 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.5719 10.283C20.176 9.89802 19.5429 9.90694 19.1579 10.3029L16.1579 13.3886C15.8108 13.7457 15.7792 14.3037 16.0839 14.6975C16.8281 15.6597 17.5468 16.372 18.4578 16.8728C19.074 17.2115 19.7403 17.4324 20.4975 17.5908C20.0929 18.0431 19.7056 18.5602 19.3423 19.1273L16.3516 17.9897L15.1688 15.2341C14.9509 14.7266 14.3629 14.4918 13.8554 14.7097C13.3479 14.9275 13.1131 15.5155 13.3309 16.023L14.6809 19.1681C14.7878 19.417 14.9911 19.612 15.2443 19.7083L18.3638 20.8949C18.0625 21.5251 17.7897 22.1892 17.5516 22.8738L14.7541 21.8097L12.8315 18.9304C12.5248 18.4711 11.9039 18.3473 11.4446 18.654C10.9853 18.9607 10.8615 19.5817 11.1682 20.041L13.2682 23.186C13.3836 23.3589 13.5501 23.4915 13.7443 23.5654L16.9885 24.7994C16.9317 25.0382 16.8793 25.2778 16.8318 25.5179C16.8006 25.5301 16.7598 25.5463 16.7106 25.5664C16.5967 25.6129 16.4369 25.6807 16.2464 25.7682C15.8681 25.942 15.3561 26.1995 14.8372 26.5304C14.3247 26.8572 13.7657 27.2806 13.3249 27.7974C12.8857 28.3124 12.4999 28.9977 12.4999 29.8228C12.4999 31.0275 12.938 32.3529 13.323 33.3033C13.5219 33.7942 13.7202 34.2175 13.869 34.5185C13.9436 34.6694 14.0063 34.7905 14.0509 34.8752C14.0733 34.9176 14.0912 34.9509 14.1039 34.9743L14.119 35.002L14.1234 35.01L14.1253 35.0135C14.3935 35.4963 15.0027 35.6709 15.4855 35.4027C15.9681 35.1346 16.1421 34.5261 15.8743 34.0434L15.8722 34.0395L15.8621 34.0211C15.8529 34.004 15.8385 33.9774 15.8199 33.942C15.7825 33.8712 15.728 33.7658 15.6619 33.6322C15.5295 33.3643 15.3528 32.9871 15.1767 32.5524C14.8117 31.6513 14.4999 30.6239 14.4999 29.8228C14.4999 29.6451 14.5827 29.4047 14.8467 29.0952C15.1091 28.7875 15.4875 28.4878 15.9125 28.2167C16.1199 28.0845 16.3289 27.965 16.5265 27.86C16.5089 28.1565 16.4999 28.4511 16.4999 28.7429C16.4999 34.7075 20.2719 38 23.9999 38C27.7278 38 31.4999 34.7075 31.4999 28.7429C31.4999 28.4511 31.4908 28.1565 31.4732 27.86C31.6709 27.965 31.8799 28.0845 32.0872 28.2167C32.5122 28.4878 32.8907 28.7875 33.153 29.0952C33.417 29.4047 33.4999 29.6451 33.4999 29.8228C33.4999 30.6239 33.188 31.6513 32.823 32.5524C32.6469 32.9871 32.4702 33.3643 32.3378 33.6322C32.2718 33.7658 32.2172 33.8712 32.1799 33.942C32.1775 33.9464 32.1753 33.9507 32.1731 33.9549C32.1577 33.9839 32.1457 34.0062 32.1376 34.0211L32.1276 34.0395L32.1254 34.0434C31.8576 34.5261 32.0316 35.1346 32.5142 35.4027C32.997 35.6709 33.6062 35.4963 33.8744 35.0135L33.8749 35.0126L33.8763 35.01L33.8808 35.002L33.8958 34.9743C33.9085 34.9509 33.9264 34.9176 33.9488 34.8752C33.9935 34.7905 34.0561 34.6694 34.1307 34.5185C34.2795 34.2175 34.4778 33.7942 34.6767 33.3033C35.0617 32.3529 35.4999 31.0275 35.4999 29.8228C35.4999 28.9977 35.114 28.3124 34.6748 27.7974C34.2341 27.2806 33.675 26.8572 33.1625 26.5304C32.6436 26.1995 32.1316 25.942 31.7533 25.7682C31.5628 25.6807 31.4031 25.6129 31.2892 25.5664C31.24 25.5463 31.1992 25.5301 31.168 25.5179C31.1204 25.2778 31.0681 25.0382 31.0112 24.7994L34.2554 23.5654C34.4497 23.4915 34.6161 23.3589 34.7315 23.186L36.8315 20.041C37.1382 19.5817 37.0145 18.9607 36.5552 18.654C36.0959 18.3473 35.4749 18.4711 35.1682 18.9304L33.2457 21.8097L30.4481 22.8738C30.21 22.1892 29.9372 21.5251 29.6359 20.8949L32.7554 19.7083C33.0086 19.612 33.2119 19.417 33.3188 19.1681L34.6688 16.023C34.8866 15.5155 34.6518 14.9275 34.1443 14.7097C33.6368 14.4918 33.0488 14.7266 32.8309 15.2341L31.6481 17.9897L28.6575 19.1273C28.6348 19.0919 28.612 19.0566 28.5891 19.0216C28.2456 18.4958 27.8815 18.0149 27.5022 17.5908C28.2594 17.4324 28.9257 17.2115 29.5419 16.8728C30.4529 16.372 31.1717 15.6597 31.9159 14.6975C32.2205 14.3037 32.189 13.7457 31.8419 13.3886L28.8419 10.3029C28.4569 9.90694 27.8238 9.89802 27.4278 10.283C27.0318 10.668 27.0229 11.3011 27.4079 11.6971L29.7803 14.1373C29.363 14.5933 28.9847 14.8968 28.5785 15.1201C28.0081 15.4337 27.3038 15.6326 26.2048 15.7828C25.9964 14.3743 25.0884 13.3142 23.9999 13.3142C22.9113 13.3142 22.0034 14.3743 21.7949 15.7828C20.6959 15.6326 19.9916 15.4337 19.4212 15.1201C19.015 14.8968 18.6367 14.5933 18.2194 14.1373L20.5919 11.6971C20.9768 11.3011 20.9679 10.668 20.5719 10.283ZM32.9999 34.5285C33.874 35.0142 33.8744 35.0135 33.8744 35.0135L32.9999 34.5285ZM14.9999 34.5285L14.1253 35.0135C14.1253 35.0135 14.1257 35.0142 14.9999 34.5285Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.5722 10.283C20.1762 9.89802 19.5431 9.90694 19.1581 10.3029L16.1581 13.3886C15.811 13.7457 15.7795 14.3037 16.0841 14.6975C16.8283 15.6597 17.5471 16.372 18.458 16.8728C19.0742 17.2115 19.7406 17.4324 20.4978 17.5908C20.0932 18.0431 19.7058 18.5602 19.3425 19.1273L16.3518 17.9897L15.169 15.2341C14.9512 14.7266 14.3632 14.4918 13.8557 14.7097C13.3482 14.9275 13.1133 15.5155 13.3312 16.023L14.6812 19.1681C14.788 19.417 14.9913 19.612 15.2446 19.7083L18.3641 20.8949C18.0627 21.5251 17.79 22.1892 17.5519 22.8738L14.7543 21.8097L12.8318 18.9304C12.5251 18.4711 11.9041 18.3473 11.4448 18.654C10.9855 18.9607 10.8618 19.5817 11.1685 20.041L13.2685 23.186C13.3839 23.3589 13.5503 23.4915 13.7446 23.5654L16.9888 24.7994C16.9319 25.0382 16.8796 25.2778 16.832 25.5179C16.8008 25.5301 16.76 25.5463 16.7108 25.5664C16.5969 25.6129 16.4372 25.6807 16.2467 25.7682C15.8684 25.942 15.3563 26.1995 14.8374 26.5304C14.325 26.8572 13.7659 27.2806 13.3252 27.7974C12.886 28.3124 12.5001 28.9977 12.5001 29.8228C12.5001 31.0275 12.9383 32.3529 13.3233 33.3033C13.5221 33.7942 13.7205 34.2175 13.8693 34.5185C13.9439 34.6694 14.0065 34.7905 14.0512 34.8752C14.0735 34.9176 14.0914 34.9509 14.1041 34.9743L14.1192 35.002L14.1237 35.01L14.1256 35.0135C14.3938 35.4963 15.003 35.6709 15.4857 35.4027C15.9684 35.1346 16.1424 34.5261 15.8745 34.0434L15.8724 34.0395L15.8624 34.0211C15.8531 34.004 15.8388 33.9774 15.8201 33.942C15.7828 33.8712 15.7282 33.7658 15.6622 33.6322C15.5297 33.3643 15.3531 32.9871 15.1769 32.5524C14.8119 31.6513 14.5001 30.6239 14.5001 29.8228C14.5001 29.6451 14.583 29.4047 14.8469 29.0952C15.1093 28.7875 15.4877 28.4878 15.9128 28.2167C16.1201 28.0845 16.3291 27.965 16.5267 27.86C16.5091 28.1565 16.5001 28.4511 16.5001 28.7429C16.5001 34.7075 20.2722 38 24.0001 38C27.728 38 31.5001 34.7075 31.5001 28.7429C31.5001 28.4511 31.4911 28.1565 31.4735 27.86C31.6711 27.965 31.8801 28.0845 32.0874 28.2167C32.5125 28.4878 32.8909 28.7875 33.1533 29.0952C33.4172 29.4047 33.5001 29.6451 33.5001 29.8228C33.5001 30.6239 33.1883 31.6513 32.8233 32.5524C32.6471 32.9871 32.4705 33.3643 32.338 33.6322C32.272 33.7658 32.2174 33.8712 32.1801 33.942C32.1778 33.9464 32.1755 33.9507 32.1733 33.9549C32.1579 33.9839 32.1459 34.0062 32.1378 34.0211L32.1278 34.0395L32.1257 34.0434C31.8578 34.5261 32.0318 35.1346 32.5145 35.4027C32.9972 35.6709 33.6064 35.4963 33.8746 35.0135L33.8751 35.0126L33.8766 35.01L33.881 35.002L33.8961 34.9743C33.9088 34.9509 33.9267 34.9176 33.949 34.8752C33.9937 34.7905 34.0563 34.6694 34.1309 34.5185C34.2797 34.2175 34.4781 33.7942 34.6769 33.3033C35.0619 32.3529 35.5001 31.0275 35.5001 29.8228C35.5001 28.9977 35.1142 28.3124 34.675 27.7974C34.2343 27.2806 33.6752 26.8572 33.1628 26.5304C32.6439 26.1995 32.1318 25.942 31.7535 25.7682C31.5631 25.6807 31.4033 25.6129 31.2894 25.5664C31.2402 25.5463 31.1994 25.5301 31.1682 25.5179C31.1206 25.2778 31.0683 25.0382 31.0114 24.7994L34.2556 23.5654C34.4499 23.4915 34.6163 23.3589 34.7318 23.186L36.8318 20.041C37.1384 19.5817 37.0147 18.9607 36.5554 18.654C36.0961 18.3473 35.4751 18.4711 35.1685 18.9304L33.2459 21.8097L30.4484 22.8738C30.2102 22.1892 29.9375 21.5251 29.6361 20.8949L32.7556 19.7083C33.0089 19.612 33.2122 19.417 33.319 19.1681L34.669 16.023C34.8869 15.5155 34.6521 14.9275 34.1445 14.7097C33.637 14.4918 33.049 14.7266 32.8312 15.2341L31.6484 17.9897L28.6577 19.1273C28.635 19.0919 28.6122 19.0566 28.5893 19.0216C28.2459 18.4958 27.8818 18.0149 27.5024 17.5908C28.2596 17.4324 28.926 17.2115 29.5422 16.8728C30.4531 16.372 31.1719 15.6597 31.9161 14.6975C32.2208 14.3037 32.1892 13.7457 31.8421 13.3886L28.8421 10.3029C28.4571 9.90694 27.824 9.89802 27.428 10.283C27.032 10.668 27.0231 11.3011 27.4081 11.6971L29.7806 14.1373C29.3633 14.5933 28.985 14.8968 28.5788 15.1201C28.0083 15.4337 27.304 15.6326 26.2051 15.7828C25.9966 14.3743 25.0886 13.3142 24.0001 13.3142C22.9116 13.3142 22.0036 14.3743 21.7951 15.7828C20.6962 15.6326 19.9919 15.4337 19.4214 15.1201C19.0152 14.8968 18.6369 14.5933 18.2197 14.1373L20.5921 11.6971C20.9771 11.3011 20.9682 10.668 20.5722 10.283ZM33.0001 34.5285C33.8743 35.0142 33.8746 35.0135 33.8746 35.0135L33.0001 34.5285ZM15.0001 34.5285L14.1256 35.0135C14.1256 35.0135 14.1259 35.0142 15.0001 34.5285Z" fill="currentColor"/>
 </svg>
diff --git a/public/icons/svg/negative/devices/asthma__inhaler.svg b/public/icons/svg/negative/devices/asthma__inhaler.svg
new file mode 100644
index 0000000000..5898bc147a
--- /dev/null
+++ b/public/icons/svg/negative/devices/asthma__inhaler.svg
@@ -0,0 +1,11 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8311_2368)">
+<path d="M8.84668 9.77766L10.0086 14.111L15.5494 11.5922L14.6464 8.22475L8.84668 9.77766Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48 0H0V48H48V0ZM16.3206 6.74118C16.252 6.485 16.0842 6.26659 15.8544 6.13398C15.6245 6.00137 15.3514 5.96543 15.095 6.03408L7.36205 8.10463C7.10569 8.17327 6.88711 8.34087 6.75441 8.57055C6.6217 8.80024 6.58574 9.07319 6.65444 9.32937L8.16173 14.9506L7.08647 15.4395C6.63922 15.6428 6.40585 16.1405 6.53574 16.614L12.2155 37.3217C12.8113 39.494 14.7871 41 17.0411 41H29.9993C30.2647 41 30.5192 40.8946 30.7069 40.7071C30.8946 40.5196 31 40.2652 31 40L31 28C31 27.4477 30.552 27 29.9993 27H23.8249L19.5489 11.0532C19.4728 10.7693 19.2755 10.5332 19.0095 10.4077C18.7435 10.2822 18.4357 10.2801 18.1679 10.4018L17.3963 10.7526L16.3206 6.74118ZM35 29H33V39H35V29ZM39 32C39 32.5523 38.5523 33 38 33C37.4477 33 37 32.5523 37 32C37 31.4477 37.4477 31 38 31C38.5523 31 39 31.4477 39 32ZM38 37C38.5523 37 39 36.5523 39 36C39 35.4477 38.5523 35 38 35C37.4477 35 37 35.4477 37 36C37 36.5523 37.4477 37 38 37ZM43 34C43 34.5523 42.5523 35 42 35C41.4477 35 41 34.5523 41 34C41 33.4477 41.4477 33 42 33C42.5523 33 43 33.4477 43 34ZM42 31C42.5523 31 43 30.5523 43 30C43 29.4477 42.5523 29 42 29C41.4477 29 41 29.4477 41 30C41 30.5523 41.4477 31 42 31ZM43 38C43 38.5523 42.5523 39 42 39C41.4477 39 41 38.5523 41 38C41 37.4477 41.4477 37 42 37C42.5523 37 43 37.4477 43 38Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_8311_2368">
+<rect width="48" height="48" fill="none"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/icons/svg/negative/devices/crutches.svg b/public/icons/svg/negative/devices/crutches.svg
new file mode 100644
index 0000000000..17811f961b
--- /dev/null
+++ b/public/icons/svg/negative/devices/crutches.svg
@@ -0,0 +1,11 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8311_2369)">
+<rect width="48" height="48" fill="none"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48 0H0V48H48V0ZM32 4H16V8C16 9.10451 16.8953 9.9999 17.9998 10C17.9998 10.0084 17.9999 10.0169 18.0001 10.0254L18.0002 10.0291L18.0005 10.037L18.0013 10.0653C18.0021 10.0898 18.0033 10.1258 18.0052 10.1739C18.0089 10.2702 18.015 10.4152 18.0249 10.6141C18.0447 11.0121 18.0796 11.6264 18.1403 12.5006C18.2615 14.2487 18.4856 17.0374 18.8976 21.2137C19.0457 22.7147 19.9272 24.0565 20.6236 25.1164L20.7022 25.236C21.0811 25.8138 21.409 26.3193 21.6478 26.8096C21.8845 27.2956 21.9967 27.6956 21.9967 28.0471C21.9967 28.301 21.9975 29.0399 21.9983 29.7146L21.9998 31.0008C22.0005 31.5528 22.4483 32.0001 23.0001 32L23.0001 39.0017C23.0001 39.553 23.447 40 23.9983 40C24.5489 40 24.9954 39.5543 24.9966 39.004H25.0001V32C25.5522 31.9999 25.9998 31.5522 25.9998 31V28.0053C25.9998 27.6593 26.1123 27.2672 26.3516 26.7892C26.5934 26.306 26.9248 25.8099 27.3087 25.2387L27.3735 25.1424C28.0793 24.0937 28.9839 22.7495 29.1047 21.2191C29.4275 17.1307 29.6505 14.3462 29.7927 12.584C29.8638 11.7029 29.9148 11.0773 29.9479 10.6722L30.0197 9.99991C31.1152 9.98934 32 9.098 32 8V4ZM27.9964 10H20.0003L20.0003 10.0012C20.0009 10.0215 20.002 10.0533 20.0037 10.0974C20.0071 10.1856 20.0129 10.3229 20.0224 10.5147C20.0415 10.8983 20.0757 11.4996 20.1355 12.3622C20.1679 12.8294 20.2078 13.373 20.2569 14.0001L27.6723 14.0001C27.7202 13.4029 27.7624 12.8788 27.7992 12.423C27.8704 11.5413 27.9214 10.915 27.9546 10.5091L27.9964 10ZM24.1336 27.004C24.2368 26.6098 24.3906 26.2386 24.5631 25.894C24.8682 25.2844 25.2689 24.6883 25.6326 24.1471L25.6488 24.123C26.4389 22.9476 27.0354 22.0177 27.1109 21.0616C27.2675 19.0786 27.4006 17.4021 27.5124 16.0001H20.4218C20.5409 17.3843 20.6933 19.0444 20.8879 21.0174C20.9839 21.9902 21.5919 22.9457 22.3745 24.1392C22.7404 24.697 23.1416 25.3093 23.4459 25.9339C23.6087 26.2682 23.7541 26.6261 23.8545 27.004H24.1336ZM22.3025 41.9577C22.4361 41.3263 23.3409 40.9857 23.9862 40.9857C24.644 40.9857 25.5537 41.3251 25.6927 41.9679L25.8429 42.6619C25.9362 43.0932 25.7359 43.5372 25.3249 43.6977C24.9364 43.8494 24.4372 44 23.9863 44C23.5637 44 23.0706 43.849 22.6814 43.697C22.2681 43.5356 22.0631 43.0901 22.1549 42.6559L22.3025 41.9577Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_8311_2369">
+<rect width="48" height="48" fill="none"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/icons/svg/negative/devices/hearing_aid.svg b/public/icons/svg/negative/devices/hearing_aid.svg
new file mode 100644
index 0000000000..9af06d4035
--- /dev/null
+++ b/public/icons/svg/negative/devices/hearing_aid.svg
@@ -0,0 +1,11 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8311_2370)">
+<path d="M22.5665 24.1296C21.5199 23.5507 20.6374 22.7116 20.0061 21.6995L16.8313 25.7814L18.4113 27.3613L22.5665 24.1296Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48 0H0V48H48V0ZM26 7C19.9249 7 15 11.9249 15 18H13C13 10.8203 18.8203 5 26 5C33.1797 5 39 10.8203 39 18C39 22.5012 36.7115 26.4674 33.2393 28.7993C30.8696 30.3908 29 32.5075 29 34.9113V35C29 39.4183 25.4183 43 21 43C16.5817 43 13 39.4183 13 35V34.1421C13 31.613 13.871 29.1737 15.4468 27.2252L14.7929 26.5714C14.4363 26.2147 14.401 25.6484 14.7107 25.2503L19.127 19.5722C19.011 19.0668 18.9497 18.5406 18.9497 18C18.9497 14.134 22.0837 11 25.9497 11C29.8157 11 32.9497 14.134 32.9497 18C32.9497 21.866 29.8157 25 25.9497 25C25.5656 25 25.1886 24.9691 24.8213 24.9095L18.9424 29.482C18.5443 29.7917 17.9779 29.7564 17.6213 29.3998L16.8707 28.6491C15.6643 30.2147 15 32.1442 15 34.1421V35C15 38.3137 17.6863 41 21 41C24.3137 41 27 38.3137 27 35V34.9113C27 31.4539 29.6282 28.8153 32.1242 27.139C35.067 25.1627 37 21.8069 37 18C37 11.9249 32.0751 7 26 7Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_8311_2370">
+<rect width="48" height="48" fill="none"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/icons/svg/negative/devices/medicine_bottle.svg b/public/icons/svg/negative/devices/medicine_bottle.svg
new file mode 100644
index 0000000000..8b55146b6a
--- /dev/null
+++ b/public/icons/svg/negative/devices/medicine_bottle.svg
@@ -0,0 +1,15 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8311_2372)">
+<path d="M16 16H12C11.4477 16 11 15.5523 11 15V7C11 6.44772 11.4477 6 12 6H16V16Z" fill="currentColor"/>
+<path d="M23 16H18V6H23V16Z" fill="currentColor"/>
+<path d="M30 16H25V6H30V16Z" fill="currentColor"/>
+<path d="M32 16V6H36C36.5523 6 37 6.44772 37 7V15C37 15.5523 36.5523 16 36 16H32Z" fill="currentColor"/>
+<path d="M23 35V30H18V28H23V23H25V28H30V30H25V35H23Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48 0H0V48H48V0ZM12 4C10.3431 4 9 5.34315 9 7V15C9 16.6569 10.3431 18 12 18L12 41C12 42.6569 13.3431 44 15 44H33C34.6569 44 36 42.6569 36 41V18C37.6569 18 39 16.6569 39 15V7C39 5.34315 37.6569 4 36 4H12Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_8311_2372">
+<rect width="48" height="48" fill="none"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/icons/svg/negative/devices/medicine_mortar.svg b/public/icons/svg/negative/devices/medicine_mortar.svg
new file mode 100644
index 0000000000..416596631f
--- /dev/null
+++ b/public/icons/svg/negative/devices/medicine_mortar.svg
@@ -0,0 +1,10 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8290_26094)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48 0H0V48H48V0ZM33.9937 8.23481C34.8612 6.892 36.6292 6.46529 38.0137 7.2646L38.1825 7.3621C39.567 8.16141 40.0815 9.90593 39.3523 11.3286L35.9328 18H27.6854L33.9937 8.23481ZM41 22H43V20H40H34.9077H26.3934H8H5V22H7V25C7 30.7841 10.7775 35.6859 16 37.373V41C16 41.5523 16.4477 42 17 42H31C31.5523 42 32 41.5523 32 41V37.373C37.2225 35.6859 41 30.7841 41 25V22ZM20 38H28H30V40H18V38H20Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_8290_26094">
+<rect width="48" height="48" fill="none"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/icons/svg/outline/devices/asthma_inhaler.svg b/public/icons/svg/outline/devices/asthma_inhaler.svg
new file mode 100644
index 0000000000..6af5314b00
--- /dev/null
+++ b/public/icons/svg/outline/devices/asthma_inhaler.svg
@@ -0,0 +1,8 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.3312 6.74118C16.2625 6.485 16.0949 6.26659 15.8652 6.13398C15.6356 6.00137 15.3626 5.96543 15.1064 6.03408L7.37901 8.10463C7.12283 8.17327 6.90441 8.34087 6.7718 8.57055C6.63919 8.80024 6.60326 9.07319 6.6719 9.32937L8.17812 14.9506L7.10362 15.4395C6.6567 15.6428 6.4235 16.1405 6.55329 16.614L12.229 37.3217C12.8244 39.494 14.7987 41 17.0511 41H30C30.2652 41 30.5195 40.8946 30.7071 40.7071C30.8946 40.5196 31 40.2652 31 40V39H34C34.5523 39 35 38.5523 35 38V30C35 29.4477 34.5523 29 34 29H31V28C31 27.4477 30.5522 27 30 27H23.83L19.5571 11.0532C19.481 10.7693 19.2839 10.5332 19.0181 10.4077C18.7522 10.2822 18.4447 10.2801 18.1771 10.4018L17.406 10.7526L16.3312 6.74118ZM8.70742 16.9073L17.9308 12.7112L22.0968 28.2588C22.2139 28.696 22.6101 29 23.0627 29H29L29 39H17.0511C15.6997 39 14.5151 38.0964 14.1578 36.793L8.70742 16.9073ZM15.5605 11.5923L10.0237 14.1112L8.86257 9.77766L14.6581 8.22475L15.5605 11.5923ZM31 37V31H33V37H31Z" fill="currentColor"/>
+<path d="M42 31C42.5523 31 43 30.5523 43 30C43 29.4477 42.5523 29 42 29C41.4477 29 41 29.4477 41 30C41 30.5523 41.4477 31 42 31Z" fill="currentColor"/>
+<path d="M38 33C38.5523 33 39 32.5523 39 32C39 31.4477 38.5523 31 38 31C37.4477 31 37 31.4477 37 32C37 32.5523 37.4477 33 38 33Z" fill="currentColor"/>
+<path d="M38 37C38.5523 37 39 36.5523 39 36C39 35.4477 38.5523 35 38 35C37.4477 35 37 35.4477 37 36C37 36.5523 37.4477 37 38 37Z" fill="currentColor"/>
+<path d="M43 34C43 34.5523 42.5523 35 42 35C41.4477 35 41 34.5523 41 34C41 33.4477 41.4477 33 42 33C42.5523 33 43 33.4477 43 34Z" fill="currentColor"/>
+<path d="M43 38C43 38.5523 42.5523 39 42 39C41.4477 39 41 38.5523 41 38C41 37.4477 41.4477 37 42 37C42.5523 37 43 37.4477 43 38Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/outline/devices/crutches.svg b/public/icons/svg/outline/devices/crutches.svg
new file mode 100644
index 0000000000..2bda54768a
--- /dev/null
+++ b/public/icons/svg/outline/devices/crutches.svg
@@ -0,0 +1,6 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" fill="none"/>
+<path d="M22.3019 41.9658C22.4358 41.334 23.3404 40.9933 23.9862 40.9933C24.6444 40.9933 25.5539 41.3328 25.6934 41.976L25.8422 42.6622C25.9359 43.094 25.7352 43.5386 25.3235 43.6989C24.9351 43.85 24.4366 43.9999 23.9863 43.9999C23.5642 43.9999 23.0718 43.8496 22.6829 43.6982C22.2688 43.537 22.0634 43.0909 22.1555 42.6562L22.3019 41.9658Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.9467 9.66737C19.9326 9.11542 19.4737 8.67921 18.9217 8.6932C18.3696 8.70719 17.9334 9.1661 17.9473 9.71821L18.947 9.69288C17.9473 9.71821 17.9473 9.71808 17.9473 9.71821L17.9474 9.72198L17.9477 9.72993L17.9485 9.75858C17.9493 9.78343 17.9506 9.81993 17.9525 9.86875C17.9562 9.96638 17.9624 10.1134 17.9724 10.3152C17.9925 10.7187 18.0279 11.3419 18.0893 12.2287C18.2121 14.0021 18.4392 16.8311 18.8566 21.068C19.0063 22.5869 19.8977 23.9454 20.6038 25.0214L20.6827 25.1419C21.0666 25.7279 21.3994 26.2416 21.6418 26.74C21.8822 27.2341 21.997 27.6423 21.997 28.0023C21.997 28.2598 21.9978 29.0095 21.9985 29.6939L22.0001 30.9989C22.0008 31.5508 22.4484 31.998 23 31.9981L23 39.0017C23 39.553 23.447 40 23.9983 40C24.5496 40 24.9966 39.553 24.9966 39.0017V38.9949H25V32.0144C25.0033 32.0144 25.0065 32.0145 25.0097 32.0145C25.562 32.0145 26.0097 31.5667 26.0097 31.0144V27.9737C26.0097 27.6181 26.1247 27.2169 26.3672 26.7304C26.6122 26.2386 26.9479 25.734 27.3359 25.1542L27.4004 25.0579C28.1146 23.9918 29.0267 22.6304 29.1485 21.0815C29.4748 16.9302 29.7002 14.1028 29.844 12.3135C29.9159 11.4189 29.9674 10.7837 30.0009 10.3724L30.0498 9.77441L28.0567 9.60898L28.0075 10.21C27.9739 10.6221 27.9224 11.258 27.8504 12.1533C27.8083 12.6775 27.7592 13.2907 27.7026 14H20.2271C20.1683 13.2581 20.1215 12.625 20.0845 12.0905C20.0239 11.2153 19.9893 10.6051 19.97 10.2158C19.9603 10.0212 19.9544 9.88186 19.951 9.7923C19.9493 9.74752 19.9482 9.71519 19.9475 9.69463L19.9469 9.67252L19.9467 9.66737ZM24.1336 27.0039C24.2373 26.5897 24.3969 26.1999 24.5771 25.8383C24.8851 25.2204 25.2896 24.6158 25.6575 24.0661L25.6737 24.0419C26.4715 22.8497 27.0778 21.9015 27.1546 20.9248C27.305 19.0114 27.434 17.3792 27.5434 16H20.3935C20.5114 17.3597 20.6599 18.9729 20.847 20.8719C20.9447 21.8635 21.5633 22.8362 22.3558 24.046C22.7266 24.612 23.1326 25.2324 23.4404 25.8652C23.6131 26.2203 23.7662 26.6012 23.8679 27.0039H24.1336Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30 6H18V8H30V6ZM16 4V8C16 9.10457 16.8954 10 18 10H30C31.1046 10 32 9.10457 32 8V4H16Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/outline/devices/hearing_aid.svg b/public/icons/svg/outline/devices/hearing_aid.svg
new file mode 100644
index 0000000000..0d16494136
--- /dev/null
+++ b/public/icons/svg/outline/devices/hearing_aid.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26 7C19.9249 7 15 11.9249 15 18H13C13 10.8203 18.8203 5 26 5C33.1797 5 39 10.8203 39 18C39 22.5012 36.7115 26.4674 33.2393 28.7993C30.8696 30.3908 29 32.5075 29 34.9113V35C29 39.4183 25.4183 43 21 43C16.5817 43 13 39.4183 13 35V34.1421C13 31.601 13.8793 29.1505 15.4693 27.1975L14.8432 26.5714C14.4866 26.2147 14.4513 25.6484 14.7609 25.2503L19.1773 19.5722C19.0613 19.0668 19 18.5406 19 18C19 14.134 22.134 11 26 11C29.866 11 33 14.134 33 18C33 21.866 29.866 25 26 25C25.6159 25 25.2389 24.9691 24.8716 24.9095L18.9927 29.482C18.5946 29.7917 18.0282 29.7564 17.6716 29.3998L16.8926 28.6208C15.6724 30.1914 15 32.1321 15 34.1421V35C15 38.3137 17.6863 41 21 41C24.3137 41 27 38.3137 27 35V34.9113C27 31.4539 29.6282 28.8153 32.1242 27.139C35.067 25.1627 37 21.8069 37 18C37 11.9249 32.0751 7 26 7ZM22.6168 24.1296C21.5702 23.5507 20.6876 22.7116 20.0564 21.6995L16.8816 25.7814L18.4616 27.3613L22.6168 24.1296ZM26 13C23.2386 13 21 15.2386 21 18C21 20.7614 23.2386 23 26 23C28.7614 23 31 20.7614 31 18C31 15.2386 28.7614 13 26 13Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/outline/devices/medicine_bottle.svg b/public/icons/svg/outline/devices/medicine_bottle.svg
new file mode 100644
index 0000000000..ae0ae77cfb
--- /dev/null
+++ b/public/icons/svg/outline/devices/medicine_bottle.svg
@@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23 23V28H18V30H23V35H25V30H30V28H25V23H23Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 7C9 5.34315 10.3431 4 12 4H36C37.6569 4 39 5.34315 39 7V15C39 16.6569 37.6569 18 36 18V41C36 42.6569 34.6569 44 33 44H15C13.3431 44 12 42.6569 12 41L12 18C10.3431 18 9 16.6569 9 15V7ZM14 18H34V41C34 41.5523 33.5523 42 33 42H15C14.4477 42 14 41.5523 14 41V18ZM36 16H32V6H36C36.5523 6 37 6.44772 37 7V15C37 15.5523 36.5523 16 36 16ZM30 6H25V16H30V6ZM12 6H16L16 16H12C11.4477 16 11 15.5523 11 15V7C11 6.44772 11.4477 6 12 6ZM18 16V6H23L23 16H18Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/outline/devices/medicine_mortar.svg b/public/icons/svg/outline/devices/medicine_mortar.svg
new file mode 100644
index 0000000000..c6be05a5a3
--- /dev/null
+++ b/public/icons/svg/outline/devices/medicine_mortar.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.0137 8.99665C36.5522 8.73021 35.9628 8.87245 35.6737 9.32005L28.7745 20H32.6603L37.5725 10.4163C37.8155 9.94209 37.644 9.36059 37.1826 9.09415L37.0137 8.99665ZM34.9077 20L39.3523 11.3286C40.0815 9.90593 39.567 8.16141 38.1826 7.3621L38.0137 7.2646C36.6292 6.46529 34.8612 6.892 33.9937 8.23481L26.3934 20H8H6V22H7V25C7 30.7841 10.7775 35.6859 16 37.373V41C16 41.5523 16.4477 42 17 42H31C31.5523 42 32 41.5523 32 41V37.373C37.2225 35.6859 41 30.7841 41 25V22H42V20H40H34.9077ZM39 22H9V25C9 31.0751 13.9249 36 20 36H28C34.0751 36 39 31.0751 39 25V22ZM20 38H18V40H30V38H28H20Z" fill="currentColor"/>
+</svg>
diff --git a/public/icons/svg/outline/zoonoses/animal_tick.svg b/public/icons/svg/outline/zoonoses/animal_tick.svg
index ff0c8d4ade..89e4a5e8c7 100644
--- a/public/icons/svg/outline/zoonoses/animal_tick.svg
+++ b/public/icons/svg/outline/zoonoses/animal_tick.svg
@@ -1,3 +1,3 @@
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.5719 10.283C19.176 9.89802 18.5429 9.90694 18.1579 10.3029L15.1579 13.3886C14.8108 13.7457 14.7792 14.3037 15.0839 14.6975C15.8281 15.6597 16.5468 16.372 17.4578 16.8728C18.0041 17.1731 18.5898 17.3808 19.2433 17.5344C18.8738 18.0086 18.5253 18.5257 18.2013 19.0737L15.3516 17.9897L14.1688 15.2342C13.9509 14.7267 13.3629 14.4918 12.8554 14.7097C12.3479 14.9275 12.1131 15.5155 12.3309 16.023L13.6809 19.1681C13.7878 19.4171 13.9911 19.612 14.2443 19.7083L17.2768 20.8618C17.2285 20.969 17.1811 21.0768 17.1346 21.1851C16.903 21.7242 16.6911 22.2831 16.5021 22.855L13.7541 21.8097L11.8315 18.9304C11.5248 18.471 10.9039 18.3473 10.4446 18.654C9.98525 18.9607 9.86153 19.5817 10.1682 20.041L12.2682 23.186C12.3836 23.3589 12.5501 23.4915 12.7443 23.5654L15.9641 24.7901C15.9087 25.0345 15.8579 25.2798 15.8119 25.5257C15.7839 25.5367 15.7499 25.5503 15.7106 25.5664C15.5967 25.6129 15.4369 25.6806 15.2464 25.7681C14.8681 25.942 14.3561 26.1995 13.8372 26.5304C13.3247 26.8572 12.7657 27.2806 12.3249 27.7974C11.8857 28.3124 11.4999 28.9977 11.4999 29.8228C11.4999 31.0274 11.938 32.3529 12.323 33.3033C12.5219 33.7942 12.7202 34.2174 12.869 34.5185C12.9436 34.6694 13.0063 34.7905 13.0509 34.8752C13.0733 34.9176 13.0912 34.9509 13.1039 34.9743L13.119 35.002L13.1234 35.01L13.1248 35.0126L13.1253 35.0135C13.3935 35.4963 14.0027 35.6709 14.4855 35.4027C14.9681 35.1346 15.1421 34.5261 14.8743 34.0434L14.8722 34.0395L14.8621 34.0211C14.8529 34.004 14.8385 33.9774 14.8199 33.942C14.7825 33.8712 14.728 33.7657 14.6619 33.6322C14.5295 33.3643 14.3528 32.9871 14.1767 32.5524C13.8117 31.6513 13.4999 30.6239 13.4999 29.8228C13.4999 29.6451 13.5827 29.4047 13.8467 29.0952C14.1091 28.7875 14.4875 28.4877 14.9125 28.2167C15.1193 28.0848 15.3277 27.9657 15.5248 27.8609C15.5083 28.1565 15.4999 28.4508 15.4999 28.7429C15.4999 35.1562 19.6214 39 23.9999 39C28.3783 39 32.4999 35.1562 32.4999 28.7429C32.4999 28.4508 32.4914 28.1565 32.4749 27.8609C32.6721 27.9657 32.8804 28.0848 33.0872 28.2167C33.5122 28.4877 33.8907 28.7875 34.153 29.0952C34.417 29.4047 34.4999 29.6451 34.4999 29.8228C34.4999 30.6239 34.188 31.6513 33.823 32.5524C33.6469 32.9871 33.4702 33.3643 33.3378 33.6322C33.2718 33.7657 33.2172 33.8712 33.1799 33.942C33.1775 33.9464 33.1753 33.9507 33.1731 33.9548C33.1577 33.9839 33.1457 34.0062 33.1376 34.0211L33.1276 34.0395L33.1254 34.0434C32.8576 34.5261 33.0316 35.1346 33.5142 35.4027C33.997 35.6709 34.6062 35.4963 34.8744 35.0135L34.8749 35.0126L34.8763 35.01L34.8808 35.002L34.8958 34.9743C34.9085 34.9509 34.9264 34.9176 34.9488 34.8752C34.9935 34.7905 35.0561 34.6694 35.1307 34.5185C35.2795 34.2174 35.4778 33.7942 35.6767 33.3033C36.0617 32.3529 36.4999 31.0274 36.4999 29.8228C36.4999 28.9977 36.114 28.3124 35.6748 27.7974C35.2341 27.2806 34.675 26.8572 34.1625 26.5304C33.6436 26.1995 33.1316 25.942 32.7533 25.7681C32.5628 25.6806 32.4031 25.6129 32.2892 25.5664C32.2498 25.5503 32.2158 25.5367 32.1879 25.5257C32.1418 25.2798 32.091 25.0345 32.0356 24.7901L35.2554 23.5654C35.4497 23.4915 35.6161 23.3589 35.7315 23.186L37.8315 20.041C38.1382 19.5817 38.0145 18.9607 37.5552 18.654C37.0959 18.3473 36.4749 18.471 36.1682 18.9304L34.2457 21.8097L31.4976 22.855C31.3086 22.2831 31.0967 21.7242 30.8652 21.1851C30.8187 21.0768 30.7712 20.969 30.7229 20.8618L33.7554 19.7083C34.0086 19.612 34.2119 19.4171 34.3188 19.1681L35.6688 16.023C35.8866 15.5155 35.6518 14.9275 35.1443 14.7097C34.6368 14.4918 34.0488 14.7267 33.8309 15.2342L32.6481 17.9897L29.7985 19.0737C29.4744 18.5257 29.1259 18.0086 28.7564 17.5344C29.4099 17.3808 29.9956 17.1731 30.5419 16.8728C31.4529 16.372 32.1717 15.6597 32.9159 14.6975C33.2205 14.3037 33.189 13.7457 32.8419 13.3886L29.8419 10.3029C29.4569 9.90694 28.8238 9.89802 28.4278 10.283C28.0318 10.668 28.0229 11.3011 28.4079 11.6971L30.7803 14.1373C30.363 14.5933 29.9847 14.8968 29.5785 15.1201C29.0096 15.4328 28.3074 15.6316 27.2134 15.7816C27.1173 14.9738 26.8343 14.226 26.3989 13.6288C25.8548 12.8826 25.0188 12.3142 23.9999 12.3142C22.9809 12.3142 22.145 12.8826 21.6009 13.6288C21.1655 14.226 20.8824 14.9738 20.7863 15.7816C19.6923 15.6316 18.9901 15.4328 18.4212 15.1201C18.015 14.8968 17.6367 14.5933 17.2194 14.1373L19.5919 11.6971C19.9768 11.3011 19.9679 10.668 19.5719 10.283ZM33.9999 34.5285C34.874 35.0142 34.8744 35.0135 34.8744 35.0135L33.9999 34.5285ZM13.9999 34.5285L13.1253 35.0135C13.1253 35.0135 13.1257 35.0142 13.9999 34.5285ZM23.2169 14.8072C22.9473 15.1769 22.7499 15.7368 22.7499 16.3999L22.7501 16.4361L22.7557 16.9573L22.3317 17.2604C21.11 18.134 19.8906 19.8359 18.9723 21.9742C18.0621 24.0937 17.4999 26.5228 17.4999 28.7429C17.4999 34.259 20.9225 37 23.9999 37C27.0772 37 30.4999 34.259 30.4999 28.7429C30.4999 26.5228 29.9376 24.0937 29.0274 21.9742C28.1092 19.8359 26.8897 18.134 25.668 17.2604L25.244 16.9573L25.2497 16.4361L25.2499 16.3999C25.2499 15.7368 25.0525 15.1769 24.7828 14.8072C24.5126 14.4366 24.2236 14.3142 23.9999 14.3142C23.7762 14.3142 23.4871 14.4366 23.2169 14.8072Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.5722 10.283C19.1762 9.89802 18.5431 9.90694 18.1581 10.3029L15.1581 13.3886C14.811 13.7457 14.7795 14.3037 15.0841 14.6975C15.8283 15.6597 16.5471 16.372 17.458 16.8728C18.0044 17.1731 18.5901 17.3808 19.2436 17.5344C18.8741 18.0086 18.5256 18.5257 18.2015 19.0737L15.3518 17.9897L14.169 15.2342C13.9512 14.7267 13.3632 14.4918 12.8557 14.7097C12.3482 14.9275 12.1133 15.5155 12.3312 16.023L13.6812 19.1681C13.788 19.4171 13.9913 19.612 14.2446 19.7083L17.277 20.8618C17.2287 20.969 17.1813 21.0768 17.1348 21.1851C16.9033 21.7242 16.6913 22.2831 16.5024 22.855L13.7543 21.8097L11.8318 18.9304C11.5251 18.471 10.9041 18.3473 10.4448 18.654C9.9855 18.9607 9.86177 19.5817 10.1685 20.041L12.2685 23.186C12.3839 23.3589 12.5503 23.4915 12.7446 23.5654L15.9643 24.7901C15.909 25.0345 15.8582 25.2798 15.8121 25.5257C15.7841 25.5367 15.7502 25.5503 15.7108 25.5664C15.5969 25.6129 15.4372 25.6806 15.2467 25.7681C14.8684 25.942 14.3563 26.1995 13.8374 26.5304C13.325 26.8572 12.7659 27.2806 12.3252 27.7974C11.886 28.3124 11.5001 28.9977 11.5001 29.8228C11.5001 31.0274 11.9383 32.3529 12.3233 33.3033C12.5221 33.7942 12.7205 34.2174 12.8693 34.5185C12.9439 34.6694 13.0065 34.7905 13.0512 34.8752C13.0735 34.9176 13.0914 34.9509 13.1041 34.9743L13.1192 35.002L13.1237 35.01L13.1251 35.0126L13.1256 35.0135C13.3938 35.4963 14.003 35.6709 14.4857 35.4027C14.9684 35.1346 15.1424 34.5261 14.8745 34.0434L14.8724 34.0395L14.8624 34.0211C14.8531 34.004 14.8388 33.9774 14.8201 33.942C14.7828 33.8712 14.7282 33.7657 14.6622 33.6322C14.5297 33.3643 14.3531 32.9871 14.1769 32.5524C13.8119 31.6513 13.5001 30.6239 13.5001 29.8228C13.5001 29.6451 13.583 29.4047 13.8469 29.0952C14.1093 28.7875 14.4877 28.4877 14.9128 28.2167C15.1195 28.0848 15.3279 27.9657 15.525 27.8609C15.5086 28.1565 15.5001 28.4508 15.5001 28.7429C15.5001 35.1562 19.6216 39 24.0001 39C28.3786 39 32.5001 35.1562 32.5001 28.7429C32.5001 28.4508 32.4917 28.1565 32.4752 27.8609C32.6723 27.9657 32.8807 28.0848 33.0874 28.2167C33.5125 28.4877 33.8909 28.7875 34.1533 29.0952C34.4172 29.4047 34.5001 29.6451 34.5001 29.8228C34.5001 30.6239 34.1883 31.6513 33.8233 32.5524C33.6471 32.9871 33.4705 33.3643 33.338 33.6322C33.272 33.7657 33.2174 33.8712 33.1801 33.942C33.1778 33.9464 33.1755 33.9507 33.1733 33.9548C33.1579 33.9839 33.1459 34.0062 33.1378 34.0211L33.1278 34.0395L33.1257 34.0434C32.8578 34.5261 33.0318 35.1346 33.5145 35.4027C33.9972 35.6709 34.6064 35.4963 34.8746 35.0135L34.8751 35.0126L34.8766 35.01L34.881 35.002L34.8961 34.9743C34.9088 34.9509 34.9267 34.9176 34.949 34.8752C34.9937 34.7905 35.0563 34.6694 35.1309 34.5185C35.2797 34.2174 35.4781 33.7942 35.6769 33.3033C36.0619 32.3529 36.5001 31.0274 36.5001 29.8228C36.5001 28.9977 36.1142 28.3124 35.675 27.7974C35.2343 27.2806 34.6752 26.8572 34.1628 26.5304C33.6439 26.1995 33.1318 25.942 32.7535 25.7681C32.5631 25.6806 32.4033 25.6129 32.2894 25.5664C32.2501 25.5503 32.2161 25.5367 32.1881 25.5257C32.142 25.2798 32.0912 25.0345 32.0359 24.7901L35.2556 23.5654C35.4499 23.4915 35.6163 23.3589 35.7318 23.186L37.8318 20.041C38.1384 19.5817 38.0147 18.9607 37.5554 18.654C37.0961 18.3473 36.4751 18.471 36.1685 18.9304L34.2459 21.8097L31.4978 22.855C31.3089 22.2831 31.0969 21.7242 30.8654 21.1851C30.8189 21.0768 30.7715 20.969 30.7232 20.8618L33.7556 19.7083C34.0089 19.612 34.2122 19.4171 34.319 19.1681L35.669 16.023C35.8869 15.5155 35.6521 14.9275 35.1445 14.7097C34.637 14.4918 34.049 14.7267 33.8312 15.2342L32.6484 17.9897L29.7987 19.0737C29.4746 18.5257 29.1262 18.0086 28.7566 17.5344C29.4101 17.3808 29.9959 17.1731 30.5422 16.8728C31.4531 16.372 32.1719 15.6597 32.9161 14.6975C33.2208 14.3037 33.1892 13.7457 32.8421 13.3886L29.8421 10.3029C29.4571 9.90694 28.824 9.89802 28.428 10.283C28.032 10.668 28.0231 11.3011 28.4081 11.6971L30.7806 14.1373C30.3633 14.5933 29.985 14.8968 29.5788 15.1201C29.0098 15.4328 28.3077 15.6316 27.2136 15.7816C27.1176 14.9738 26.8345 14.226 26.3991 13.6288C25.855 12.8826 25.019 12.3142 24.0001 12.3142C22.9812 12.3142 22.1452 12.8826 21.6011 13.6288C21.1657 14.226 20.8826 14.9738 20.7866 15.7816C19.6925 15.6316 18.9904 15.4328 18.4214 15.1201C18.0152 14.8968 17.6369 14.5933 17.2197 14.1373L19.5921 11.6971C19.9771 11.3011 19.9682 10.668 19.5722 10.283ZM34.0001 34.5285C34.8743 35.0142 34.8746 35.0135 34.8746 35.0135L34.0001 34.5285ZM14.0001 34.5285L13.1256 35.0135C13.1256 35.0135 13.1259 35.0142 14.0001 34.5285ZM23.2171 14.8072C22.9475 15.1769 22.7501 15.7368 22.7501 16.3999L22.7503 16.4361L22.756 16.9573L22.332 17.2604C21.1103 18.134 19.8908 19.8359 18.9725 21.9742C18.0624 24.0937 17.5001 26.5228 17.5001 28.7429C17.5001 34.259 20.9227 37 24.0001 37C27.0775 37 30.5001 34.259 30.5001 28.7429C30.5001 26.5228 29.9378 24.0937 29.0277 21.9742C28.1094 19.8359 26.8899 18.134 25.6682 17.2604L25.2442 16.9573L25.2499 16.4361L25.2501 16.3999C25.2501 15.7368 25.0527 15.1769 24.7831 14.8072C24.5128 14.4366 24.2238 14.3142 24.0001 14.3142C23.7764 14.3142 23.4874 14.4366 23.2171 14.8072Z" fill="currentColor"/>
 </svg>
diff --git a/public/og-icon-images/contraceptives/oral_contraception_pillsx28.png b/public/og-icon-images/contraceptives/oral_contraception_pillsx28.png
index a60afa3dc5..446ac6f0ea 100644
Binary files a/public/og-icon-images/contraceptives/oral_contraception_pillsx28.png and b/public/og-icon-images/contraceptives/oral_contraception_pillsx28.png differ
diff --git a/public/og-icon-images/devices/asthma_inhaler.png b/public/og-icon-images/devices/asthma_inhaler.png
new file mode 100644
index 0000000000..e73dc6c952
Binary files /dev/null and b/public/og-icon-images/devices/asthma_inhaler.png differ
diff --git a/public/og-icon-images/devices/crutches.png b/public/og-icon-images/devices/crutches.png
new file mode 100644
index 0000000000..fcd33a82d9
Binary files /dev/null and b/public/og-icon-images/devices/crutches.png differ
diff --git a/public/og-icon-images/devices/hearing_aid.png b/public/og-icon-images/devices/hearing_aid.png
new file mode 100644
index 0000000000..c364aac9f4
Binary files /dev/null and b/public/og-icon-images/devices/hearing_aid.png differ
diff --git a/public/og-icon-images/devices/inhaler.png b/public/og-icon-images/devices/inhaler.png
new file mode 100644
index 0000000000..e73dc6c952
Binary files /dev/null and b/public/og-icon-images/devices/inhaler.png differ
diff --git a/public/og-icon-images/devices/medicine_bottle.png b/public/og-icon-images/devices/medicine_bottle.png
new file mode 100644
index 0000000000..7e140d9c7c
Binary files /dev/null and b/public/og-icon-images/devices/medicine_bottle.png differ
diff --git a/public/og-icon-images/devices/medicine_mortar.png b/public/og-icon-images/devices/medicine_mortar.png
new file mode 100644
index 0000000000..5dbe7feac8
Binary files /dev/null and b/public/og-icon-images/devices/medicine_mortar.png differ
diff --git a/public/og-icon-images/graphs/chart-cured-decreasing.png b/public/og-icon-images/graphs/chart-cured-decreasing.png
index d0c0cb047a..13b1ff37c2 100644
Binary files a/public/og-icon-images/graphs/chart-cured-decreasing.png and b/public/og-icon-images/graphs/chart-cured-decreasing.png differ
diff --git a/public/og-icon-images/graphs/chart-cured-increasing.png b/public/og-icon-images/graphs/chart-cured-increasing.png
index 79ff8db228..54bfa43626 100644
Binary files a/public/og-icon-images/graphs/chart-cured-increasing.png and b/public/og-icon-images/graphs/chart-cured-increasing.png differ
diff --git a/public/og-icon-images/graphs/chart-death-rate-decreasing.png b/public/og-icon-images/graphs/chart-death-rate-decreasing.png
index 64f892d69a..7a60a8e572 100644
Binary files a/public/og-icon-images/graphs/chart-death-rate-decreasing.png and b/public/og-icon-images/graphs/chart-death-rate-decreasing.png differ
diff --git a/public/og-icon-images/graphs/chart-death-rate-increasing.png b/public/og-icon-images/graphs/chart-death-rate-increasing.png
index e39718ba8a..ae6dd965a2 100644
Binary files a/public/og-icon-images/graphs/chart-death-rate-increasing.png and b/public/og-icon-images/graphs/chart-death-rate-increasing.png differ
diff --git a/public/og-icon-images/graphs/chart-death-rate-stable.png b/public/og-icon-images/graphs/chart-death-rate-stable.png
index 8c076f9d1e..b1a0f911da 100644
Binary files a/public/og-icon-images/graphs/chart-death-rate-stable.png and b/public/og-icon-images/graphs/chart-death-rate-stable.png differ
diff --git a/public/og-icon-images/graphs/chart-infected-decreasing.png b/public/og-icon-images/graphs/chart-infected-decreasing.png
index a6f1d390a5..aacbe53f40 100644
Binary files a/public/og-icon-images/graphs/chart-infected-decreasing.png and b/public/og-icon-images/graphs/chart-infected-decreasing.png differ
diff --git a/public/og-icon-images/graphs/chart-infected-increasing.png b/public/og-icon-images/graphs/chart-infected-increasing.png
index c6f024e70b..dcaffd1452 100644
Binary files a/public/og-icon-images/graphs/chart-infected-increasing.png and b/public/og-icon-images/graphs/chart-infected-increasing.png differ
diff --git a/public/og-icon-images/graphs/chart-infected-stable.png b/public/og-icon-images/graphs/chart-infected-stable.png
index 464814db49..3926ec9068 100644
Binary files a/public/og-icon-images/graphs/chart-infected-stable.png and b/public/og-icon-images/graphs/chart-infected-stable.png differ
diff --git a/public/og-icon-images/graphs/chart_bar.png b/public/og-icon-images/graphs/chart_bar.png
index 187f1f4f86..24cdf8af2b 100644
Binary files a/public/og-icon-images/graphs/chart_bar.png and b/public/og-icon-images/graphs/chart_bar.png differ
diff --git a/public/og-icon-images/graphs/chart_bar_stacked.png b/public/og-icon-images/graphs/chart_bar_stacked.png
index 8a9d3b29dd..66f41c0efa 100644
Binary files a/public/og-icon-images/graphs/chart_bar_stacked.png and b/public/og-icon-images/graphs/chart_bar_stacked.png differ
diff --git a/public/og-icon-images/graphs/chart_line.png b/public/og-icon-images/graphs/chart_line.png
index 1a9efed15a..222f924aad 100644
Binary files a/public/og-icon-images/graphs/chart_line.png and b/public/og-icon-images/graphs/chart_line.png differ
diff --git a/public/og-icon-images/graphs/chart_line_stacked.png b/public/og-icon-images/graphs/chart_line_stacked.png
index f3b2bbdf50..bee00f659b 100644
Binary files a/public/og-icon-images/graphs/chart_line_stacked.png and b/public/og-icon-images/graphs/chart_line_stacked.png differ
diff --git a/public/og-icon-images/graphs/chart_pie.png b/public/og-icon-images/graphs/chart_pie.png
index 7ff6cc0e4a..a76d556f80 100644
Binary files a/public/og-icon-images/graphs/chart_pie.png and b/public/og-icon-images/graphs/chart_pie.png differ
diff --git a/public/og-icon-images/zoonoses/animal_tick.png b/public/og-icon-images/zoonoses/animal_tick.png
index a99d02e3db..7caa45ae23 100644
Binary files a/public/og-icon-images/zoonoses/animal_tick.png and b/public/og-icon-images/zoonoses/animal_tick.png differ
diff --git a/public/sitemap.txt b/public/sitemap.txt
index a6a0923503..e92ffe6802 100644
--- a/public/sitemap.txt
+++ b/public/sitemap.txt
@@ -103,6 +103,7 @@ https://healthicons.org/icon/filled/devices/breast_pump
 https://healthicons.org/icon/filled/devices/cast
 https://healthicons.org/icon/filled/devices/cold_chain
 https://healthicons.org/icon/filled/devices/contact_lenses
+https://healthicons.org/icon/filled/devices/crutches
 https://healthicons.org/icon/filled/devices/tac
 https://healthicons.org/icon/filled/devices/defibrillator
 https://healthicons.org/icon/filled/devices/dental_hygiene
@@ -110,14 +111,18 @@ https://healthicons.org/icon/filled/devices/discriminating_concentration_bioassa
 https://healthicons.org/icon/filled/devices/fever
 https://healthicons.org/icon/filled/devices/eyeglasses
 https://healthicons.org/icon/filled/devices/diabetes_measure
+https://healthicons.org/icon/filled/devices/hearing_aid
 https://healthicons.org/icon/filled/devices/hospitalized
 https://healthicons.org/icon/filled/devices/inpatient
 https://healthicons.org/icon/filled/devices/observation
 https://healthicons.org/icon/filled/devices/blood_pressure
+https://healthicons.org/icon/filled/devices/asthma_inhaler
 https://healthicons.org/icon/filled/devices/intravenous_bag
 https://healthicons.org/icon/filled/devices/medical_sample
+https://healthicons.org/icon/filled/devices/medicine_bottle
 https://healthicons.org/icon/filled/devices/microscope
 https://healthicons.org/icon/filled/devices/mobile
+https://healthicons.org/icon/filled/devices/medicine_mortar
 https://healthicons.org/icon/filled/devices/odontology
 https://healthicons.org/icon/filled/devices/odontology_implant
 https://healthicons.org/icon/filled/devices/oxygen_tank