diff --git a/assets/js/components/VehicleIcon/Airpurifier.vue b/assets/js/components/VehicleIcon/Airpurifier.vue
new file mode 100644
index 000000000..a3abc4cf1
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Airpurifier.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M3 21V6q0-1.25.875-2.125T6 3h4q1.25 0 2.125.875T13 6v15zm7-6h1v-5h-1zm-5 4h6v-2h-1q-.825 0-1.412-.587T8 15v-5q0-.825.588-1.412T10 8h1V6q0-.425-.288-.712T10 5H6q-.425 0-.712.288T5 6zm12.2-5.425q-.65 0-1.275-.175t-1.225-.45l.625-1.9q.5.225.988.375t.912.15q.3 0 .6-.1t.625-.3q.6-.425 1.2-.575t1.15-.15q.625 0 1.288.163t1.237.437l-.625 1.9q-.575-.2-1.062-.35t-.838-.15q-.3 0-.662.113t-.763.387q-.525.35-1.062.488t-1.113.137m.025-3.9q-.65 0-1.3-.175T14.7 9.05l.625-1.9q.65.275 1.1.4t.8.125q.3 0 .6-.087t.625-.313q.625-.425 1.213-.575t1.137-.15q.625 0 1.25.163t1.275.437l-.625 1.9q-.65-.225-1.1-.363t-.8-.137q-.325 0-.663.1t-.762.4q-.45.325-1.012.475t-1.138.15m0 7.8q-.65 0-1.287-.175t-1.238-.45l.625-1.9q.55.25 1.025.388t.875.137q.3 0 .6-.088t.625-.312q.575-.4 1.225-.562t1.15-.163q.625 0 1.275.175t1.225.425l-.625 1.9q-.65-.225-1.112-.363t-.788-.137q-.35 0-.712.113t-.713.387q-.425.3-.987.463t-1.163.162M11 19V5.788V6v-.212z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Airpurifier",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Climate.vue b/assets/js/components/VehicleIcon/Climate.vue
new file mode 100644
index 000000000..8754870d4
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Climate.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M20 12H4q-.825 0-1.412-.587T2 10V4q0-.825.588-1.412T4 2h16q.825 0 1.413.588T22 4v6q0 .825-.587 1.413T20 12M4 19v-2q1.25 0 2.125-.875T7 14h2q0 2.075-1.463 3.538T4 19m16 0q-2.075 0-3.537-1.463T15 14h2q0 1.25.875 2.125T20 17zm-9 1v-6h2v6zm9-10H4zM6 10V8q0-.825.588-1.412T8 6h8q.825 0 1.413.588T18 8v2h-2V8H8v2zm-2 0h16V4H4z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Climate",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Compute.vue b/assets/js/components/VehicleIcon/Compute.vue
new file mode 100644
index 000000000..873f838da
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Compute.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M8.075 20q-.275 0-.513-.137q-.237-.138-.362-.388L5.25 16H6.7l1 2H10v-1H8.3l-1-2H4.7l-1.425-2.5q-.05-.125-.087-.25q-.038-.125-.038-.25t.038-.25q.037-.125.087-.25L4.7 9h2.6l1-2H10V6H7.7l-1 2H5.25L7.2 4.525q.125-.25.362-.388Q7.8 4 8.075 4H10.5q.425 0 .713.287q.287.288.287.713v4H10l-1 1h2.5v3H9.3l-1-2H6l-1 1h2.7l1 2h2.8v5q0 .425-.287.712q-.288.288-.713.288Zm5.425 0q-.425 0-.712-.288q-.288-.287-.288-.712v-5h2.8l1-2H19l-1-1h-2.3l-1 2h-2.2v-3H15l-1-1h-1.5V5q0-.425.288-.713Q13.075 4 13.5 4h2.425q.275 0 .513.137q.237.138.362.388L18.75 8H17.3l-1-2H14v1h1.7l1 2h2.6l1.425 2.5q.05.125.087.25q.038.125.038.25t-.038.25q-.037.125-.087.25L19.3 15h-2.6l-1 2H14v1h2.3l1-2h1.45l-1.95 3.475q-.125.25-.362.388q-.238.137-.513.137Z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Compute",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Device.vue b/assets/js/components/VehicleIcon/Device.vue
new file mode 100644
index 000000000..75b7b9b40
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Device.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M4 21q-1.25 0-2.125-.875T1 18V6q0-1.25.875-2.125T4 3h8q1.25 0 2.125.875T15 6v6.3h1q.825 0 1.413.588T18 14.3v3.2q0 .2.15.35t.35.15t.35-.15t.15-.35V11q-.825 0-1.412-.587T17 9V6h1V4h1.5v2h1V4H22v2h1v3q0 .825-.587 1.413T21 11v6.4q0 1.05-.725 1.775T18.5 19.9t-1.775-.725T16 17.4v-3.2h-1V17q0 1.65-1.175 2.825T11 21zm0-2h7q.825 0 1.413-.587T13 17t-.587-1.412T11 15H6.5q-.2 0-.35.15T6 15.5t.15.35t.35.15H11q.425 0 .713.288T12 17t-.288.713T11 18H6.5q-1.05 0-1.775-.725T4 15.5t.725-1.775T6.5 13H11q.525 0 1.038.15t.962.45V6q0-.425-.288-.712T12 5H4q-.425 0-.712.288T3 6v12q0 .425.288.713T4 19m0 0h7h-8z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Device",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Dishwasher.vue b/assets/js/components/VehicleIcon/Dishwasher.vue
new file mode 100644
index 000000000..0d472b911
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Dishwasher.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M8 7q.425 0 .713-.288T9 6t-.288-.712T8 5t-.712.288T7 6t.288.713T8 7m3 0q.425 0 .713-.288T12 6t-.288-.712T11 5t-.712.288T10 6t.288.713T11 7m1 11q1.575 0 2.688-1.075T15.8 14.3q0-.725-.25-1.412T14.8 11.7L12 8.9l-2.7 2.7q-.55.55-.837 1.25T8.2 14.3q.05 1.55 1.15 2.625T12 18m0-1.9q-.75 0-1.275-.525T10.2 14.3q0-.375.138-.712t.412-.613l1.25-1.25l1.225 1.225q.275.275.425.625t.15.725q0 .75-.525 1.275T12 16.1M6 22q-.825 0-1.412-.587T4 20V4q0-.825.588-1.412T6 2h12q.825 0 1.413.588T20 4v16q0 .825-.587 1.413T18 22zm0-2h12V4H6zm0 0V4z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Dishwasher",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Heatpump.vue b/assets/js/components/VehicleIcon/Heatpump.vue
new file mode 100644
index 000000000..1bf2bd54c
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Heatpump.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M12 18q-2.5 0-4.25-1.75T6 12t1.75-4.25T12 6t4.25 1.75T18 12t-1.75 4.25T12 18m-.75-2.075V13.8l-1.5 1.5q.35.225.713.388t.787.237m1.5 0q.4-.075.775-.238t.725-.387l-1.5-1.5zm2.55-1.675q.225-.35.388-.725t.237-.775H13.8zm-1.5-3h2.125q-.075-.4-.238-.775T15.3 9.75zm-1.05-1.05l1.5-1.5q-.35-.225-.712-.387t-.788-.238zM12 13q.425 0 .713-.288T13 12t-.288-.712T12 11t-.712.288T11 12t.288.713T12 13m-.75-2.8V8.075q-.4.075-.775.238T9.75 8.7zm-3.175 1.05H10.2l-1.5-1.5q-.225.35-.387.725t-.238.775m.625 3l1.5-1.5H8.075q.075.4.238.775t.387.725M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5H5zM5 5v14z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Heatpump",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Laundry.vue b/assets/js/components/VehicleIcon/Laundry.vue
new file mode 100644
index 000000000..3d72f55df
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Laundry.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M6 22q-.825 0-1.412-.587T4 20V4q0-.825.588-1.412T6 2h12q.825 0 1.413.588T20 4v16q0 .825-.587 1.413T18 22zm0-2h12V4H6zm6-1q2.075 0 3.538-1.463T17 14t-1.463-3.537T12 9t-3.537 1.463T7 14t1.463 3.538T12 19m0-1.7q-.65 0-1.263-.238T9.65 16.35l4.7-4.7q.475.475.713 1.088T15.3 14q0 1.375-.962 2.338T12 17.3M8 7q.425 0 .713-.288T9 6t-.288-.712T8 5t-.712.288T7 6t.288.713T8 7m3 0q.425 0 .713-.288T12 6t-.288-.712T11 5t-.712.288T10 6t.288.713T11 7M6 20V4z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Laundry",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Meter.vue b/assets/js/components/VehicleIcon/Meter.vue
new file mode 100644
index 000000000..89758a3f3
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Meter.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M9 21.95v-2.5q-2.65-.925-4.325-3.237T3 10.95q0-1.875.713-3.512t1.924-2.85t2.85-1.925t3.488-.713t3.5.713t2.875 1.925t1.938 2.85T21 10.95q0 2.95-1.687 5.238T15 19.425v2.525h-2V19.9q-.25.05-.5.05h-.525q-.25 0-.488-.012T11 19.9v2.05zM12 18q2.9 0 4.95-2.05T19 11t-2.05-4.95T12 4T7.05 6.05T5 11t2.05 4.95T12 18M8 9h8V7H8zm3.25 8l3-3L13 12.75l1.25-1.25l-1.5-1.5l-3 3L11 14.25L9.75 15.5zm.75-6"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Meter",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Shuttle.vue b/assets/js/components/VehicleIcon/Shuttle.vue
new file mode 100644
index 000000000..14d779341
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Shuttle.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M6 19q-1.25 0-2.125-.875T3 16q-.825 0-1.412-.587T1 14V7q0-.825.588-1.412T3 5h13.175q.4 0 .763.15t.637.425l4.85 4.85q.275.275.425.638t.15.762V14q0 .825-.587 1.413T21 16q0 1.25-.875 2.125T18 19t-2.125-.875T15 16H9q0 1.25-.875 2.125T6 19m9-9h4l-3-3h-1zm-6 0h4V7H9zm-6 0h4V7H3zm3 7.25q.525 0 .888-.363T7.25 16t-.363-.888T6 14.75t-.888.363T4.75 16t.363.888t.887.362m12 0q.525 0 .888-.363T19.25 16t-.363-.888T18 14.75t-.888.363t-.362.887t.363.888t.887.362M8.2 14h7.6q.425-.45.975-.725T18 13t1.225.275t.975.725h.8v-2H3v2h.8q.425-.45.975-.725T6 13t1.225.275T8.2 14M21 12H3z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Shuttle",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/Tool.vue b/assets/js/components/VehicleIcon/Tool.vue
new file mode 100644
index 000000000..f240984ee
--- /dev/null
+++ b/assets/js/components/VehicleIcon/Tool.vue
@@ -0,0 +1,14 @@
+<template>
+	<svg width="1em" height="1em" viewBox="0 0 24 24">
+		<path
+			fill="currentColor"
+			d="M6 19h6v-1H6zm.75-9h4.5q.3 0 .525-.225T12 9.25t-.225-.525t-.525-.225h-4.5q-.3 0-.525.225T6 9.25t.225.525t.525.225m0-2.5h4.5q.3 0 .525-.225T12 6.75t-.225-.525T11.25 6h-4.5q-.3 0-.525.225T6 6.75t.225.525t.525.225M16 11V9h2V7h-2V5h2q.825 0 1.413.588T20 7h2q.425 0 .713.288T23 8t-.288.713T22 9h-2q0 .825-.587 1.413T18 11zm-4 5h-2v-5h4V5H6q-.825 0-1.412.588T4 7v2q0 .825.588 1.413T6 11h2v5H6v-3q-1.65 0-2.825-1.175T2 9V7q0-1.65 1.175-2.825T6 3h8q.825 0 1.413.588T16 5v6q0 .825-.587 1.413T14 13h-2zm-6.5 5q-.625 0-1.062-.437T4 19.5v-2q0-.625.438-1.062T5.5 16h7q.625 0 1.063.438T14 17.5v2q0 .625-.437 1.063T12.5 21zm6.5-2H6z"
+		/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Tool",
+};
+</script>
diff --git a/assets/js/components/VehicleIcon/VehicleIcon.story.vue b/assets/js/components/VehicleIcon/VehicleIcon.story.vue
index 01b5f26a0..37a8eba46 100644
--- a/assets/js/components/VehicleIcon/VehicleIcon.story.vue
+++ b/assets/js/components/VehicleIcon/VehicleIcon.story.vue
@@ -4,16 +4,26 @@ import VehicleIcon from "./VehicleIcon.vue";
 const icons = [
 	"car",
 	"bike",
-	"scooter",
+	"bus",
 	"moped",
 	"motorcycle",
-	"van",
-	"bus",
+	"scooter",
 	"tractor",
-	"generic",
+	"shuttle",
+	"van",
 	"heater",
-	"cooler",
+	"heatpump",
 	"waterheater",
+	"laundry",
+	"dishwasher",
+	"airpurifier",
+	"climate",
+	"cooler",
+	"generic",
+	"device",
+	"meter",
+	"compute",
+	"tool",
 ];
 </script>
 
diff --git a/assets/js/components/VehicleIcon/VehicleIcon.vue b/assets/js/components/VehicleIcon/VehicleIcon.vue
index 9c27ac037..bf61803d5 100644
--- a/assets/js/components/VehicleIcon/VehicleIcon.vue
+++ b/assets/js/components/VehicleIcon/VehicleIcon.vue
@@ -7,28 +7,48 @@
 import "@h2d2/shopicons/es/regular/car3";
 import MultiIcon from "../MultiIcon";
 
+import airpurifier from "./Airpurifier.vue";
 import bike from "./Bike.vue";
 import bus from "./Bus.vue";
+import climate from "./Climate.vue";
+import compute from "./Compute.vue";
 import cooler from "./Cooler.vue";
+import device from "./Device.vue";
+import dishwasher from "./Dishwasher.vue";
 import generic from "./Generic.vue";
 import heater from "./Heater.vue";
+import heatpump from "./Heatpump.vue";
+import laundry from "./Laundry.vue";
+import meter from "./Meter.vue";
 import moped from "./Moped.vue";
 import motorcycle from "./Motorcycle.vue";
 import scooter from "./Scooter.vue";
+import shuttle from "./Shuttle.vue";
+import tool from "./Tool.vue";
 import tractor from "./Tractor.vue";
 import van from "./Van.vue";
 import waterheater from "./WaterHeater.vue";
 
 const icons = {
+	airpurifier,
 	bike,
 	bus,
 	car: "shopicon-regular-car3",
+	climate,
+	compute,
 	cooler,
+	device,
+	dishwasher,
 	generic,
 	heater,
+	heatpump,
+	laundry,
+	meter,
 	moped,
 	motorcycle,
 	scooter,
+	shuttle,
+	tool,
 	tractor,
 	van,
 	waterheater,
diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
index e33c58d27..c9fe40ec6 100644
--- a/util/templates/defaults.yaml
+++ b/util/templates/defaults.yaml
@@ -245,17 +245,27 @@ params:
     type: choice
     validvalues:
       - car
-      - bus
-      - van
-      - tractor
       - bike
-      - scooter
+      - bus
       - moped
       - motorcycle
-      - generic
-      - waterheater
+      - scooter
+      - tractor
+      - shuttle
+      - van
       - heater
+      - heatpump
+      - waterheater
+      - laundry
+      - dishwasher
+      - airpurifier
+      - climate
       - cooler
+      - generic
+      - device
+      - meter
+      - compute
+      - tool
   - name: ski
     required: true
     description: