diff --git a/boblight/meta.json b/boblight/meta.json
index 3b0f0a63..26b41be8 100644
--- a/boblight/meta.json
+++ b/boblight/meta.json
@@ -1,5 +1,5 @@
 {
-    "title": "Boblight"
+    "title": "Boblight",
     "tagline": "Connect to Boblight devices.",
     "icon": "boblight.png",
     "stability": "community",
diff --git a/dweetio/meta.json b/dweetio/meta.json
index bbc0af7f..d9d3aed9 100644
--- a/dweetio/meta.json
+++ b/dweetio/meta.json
@@ -8,6 +8,6 @@
         "cloud"
     ],
     "categories": [
-        "service"
+        "online-service"
     ]
 }
diff --git a/elro/elro.png b/elro/elro.png
new file mode 100644
index 00000000..dc1145d1
Binary files /dev/null and b/elro/elro.png differ
diff --git a/elro/meta.json b/elro/meta.json
index 44cb6762..348c07d8 100644
--- a/elro/meta.json
+++ b/elro/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "Elro",
     "tagline": "Connect to Elro devices.",
-    "icon": "elro.svg",
+    "icon": "elro.png",
     "stability": "community",
     "offline": true,
     "technology": [
diff --git a/flowercare/meta.json b/flowercare/meta.json
index 6e198bff..6de840e8 100644
--- a/flowercare/meta.json
+++ b/flowercare/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "Flower Care",
     "tagline": "Flower Care.",
-    "icon": "flowercare.svg",
+    "icon": "xiaomi.svg",
     "stability": "community",
     "offline": true,
     "technology": [
diff --git a/flowercare/xiaomi.svg b/flowercare/xiaomi.svg
new file mode 100644
index 00000000..72c4236e
--- /dev/null
+++ b/flowercare/xiaomi.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" version="1.1" viewBox="0 0 52.917 52.917" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <clipPath id="clipPath831">
+   <path d="M 0,595.28 H 841.89 V 0 H 0 Z"/>
+  </clipPath>
+ </defs>
+ <g transform="translate(-9.6659 -106.33)">
+  <g transform="matrix(.35278 0 0 -.35278 -186.45 261.78)" clip-path="url(#clipPath831)">
+   <g transform="matrix(1.4354 0 0 1.4355 -242.08 -126.56)">
+    <path d="m656.46 290.64h-96.563c-2.191 0-3.967 1.776-3.967 3.967v96.563c0 2.191 1.776 3.966 3.967 3.966h96.563c2.191 0 3.967-1.775 3.967-3.966v-96.563c0-2.191-1.776-3.967-3.967-3.967" fill="#ff6700" fill-rule="evenodd"/>
+    <g fill="#fff">
+     <path d="m637.87 362.27h-8.221c-0.352 0-0.637-0.28-0.637-0.625v-37.509c0-0.342 0.285-0.622 0.637-0.622h8.221c0.349 0 0.638 0.28 0.638 0.622v37.509c0 0.345-0.289 0.625-0.638 0.625"/>
+     <path d="m609.8 362.27h-31.315c-0.352 0-0.635-0.28-0.635-0.625v-37.509c0-0.342 0.283-0.622 0.635-0.622h8.223c0.35 0 0.64 0.28 0.64 0.622v29.439c0 0.34 0.283 0.622 0.635 0.622h17.713c4.981 0 6.395-3.815 6.395-6.276v-23.785c0-0.342 0.286-0.622 0.638-0.622h8.218c0.35 0 0.637 0.28 0.637 0.622v26.609c0 2.195-0.264 5.351-3.096 8.129-2.963 2.9-5.666 3.396-8.688 3.396"/>
+     <path d="m604.04 347.33h-8.633c-0.352 0-0.641-0.28-0.641-0.623v-22.574c0-0.341 0.289-0.621 0.641-0.621h8.633c0.349 0 0.635 0.28 0.635 0.621v22.574c0 0.343-0.286 0.623-0.635 0.623"/>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/intertechno/intertechno.jpg b/intertechno/intertechno.jpg
new file mode 100644
index 00000000..7bb6cd01
Binary files /dev/null and b/intertechno/intertechno.jpg differ
diff --git a/intertechno/meta.json b/intertechno/meta.json
index 2d2d1633..41363bf2 100644
--- a/intertechno/meta.json
+++ b/intertechno/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "Intertechno",
     "tagline": "Control Intertechno 433MHz sockets.",
-    "icon": "intertechno.svg",
+    "icon": "intertechno.jpg",
     "stability": "community",
     "offline": true,
     "technology": [
diff --git a/nanoleaf/meta.json b/nanoleaf/meta.json
index 459cbc2a..5631122d 100644
--- a/nanoleaf/meta.json
+++ b/nanoleaf/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "Nanoleaf",
     "tagline": "Control Nanoleaf light panels.",
-    "icon": "nanoleaf.svg",
+    "icon": "nanoleaf.png"
     "stability": "consumer",
     "offline": true,
     "technology": [
diff --git a/openuv/meta.json b/openuv/meta.json
index b5ab5943..5ecd3bfc 100644
--- a/openuv/meta.json
+++ b/openuv/meta.json
@@ -8,6 +8,6 @@
         "cloud"
     ],
     "categories": [
-        "service"
+        "online-service"
     ]
 }
diff --git a/openweathermap/meta.json b/openweathermap/meta.json
index 2d95e9d9..daf62b5e 100644
--- a/openweathermap/meta.json
+++ b/openweathermap/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "OpenWeatherMap",
     "tagline": "Get current weather data for your location",
-    "icon": "openweathermap.svg",
+    "icon": "openweathermap.png",
     "stability": "consumer",
     "offline": false,
     "technology": [
@@ -9,6 +9,6 @@
     ],
     "categories": [
         "weather",
-        "service"
+        "online-service"
     ]
 }
diff --git a/openweathermap/openweathermap.png b/openweathermap/openweathermap.png
new file mode 100644
index 00000000..0e5d792a
Binary files /dev/null and b/openweathermap/openweathermap.png differ
diff --git a/osdomotics/merkur-board.jpg b/osdomotics/merkur-board.jpg
new file mode 100644
index 00000000..8c8a87c3
Binary files /dev/null and b/osdomotics/merkur-board.jpg differ
diff --git a/osdomotics/meta.json b/osdomotics/meta.json
index c1fe720b..451cae65 100644
--- a/osdomotics/meta.json
+++ b/osdomotics/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "OSDomotics",
     "tagline": "Connect and control Merkur boards.",
-    "icon": "osdomotics.svg",
+    "icon": "merkur-board.jpg",
     "stability": "community",
     "offline": true,
     "technology": [
diff --git a/serialportcommander/meta.json b/serialportcommander/meta.json
index f3d89bd8..d41457c4 100644
--- a/serialportcommander/meta.json
+++ b/serialportcommander/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "Serial Port Commander",
     "tagline": "Send and receive raw serial port commands.",
-    "icon": "serialportcomander.svg",
+    "icon": "serialportcommander.svg",
     "stability": "community",
     "offline": true,
     "technology": [
diff --git a/shelly/meta.json b/shelly/meta.json
index 4141bb61..0893108d 100644
--- a/shelly/meta.json
+++ b/shelly/meta.json
@@ -1,7 +1,7 @@
 {
     "title": "Shelly",
     "tagline": "Control Shelly devices.",
-    "icon": "shelly.svg",
+    "icon": "shelly.png",
     "stability": "consumer",
     "offline": true,
     "technology": [