diff --git a/ui/src/app/core/accessories/types/valve/valve.component.html b/ui/src/app/core/accessories/types/valve/valve.component.html
index 9f4a68558..9534e8aa5 100644
--- a/ui/src/app/core/accessories/types/valve/valve.component.html
+++ b/ui/src/app/core/accessories/types/valve/valve.component.html
@@ -21,13 +21,13 @@
     ></div>
     <div
       *ngIf="service.values.ValveType === 2"
-      [inlineSVG]="'/assets/hap-icons/valve-generic.svg'"
+      [inlineSVG]="'/assets/hap-icons/valve-showerhead.svg'"
       [attr.aria-label]="'Valve'"
       class="accessory-svg"
     ></div>
     <div
       *ngIf="service.values.ValveType === 3"
-      [inlineSVG]="'/assets/hap-icons/valve-generic.svg'"
+      [inlineSVG]="'/assets/hap-icons/valve-waterfaucet.svg'"
       [attr.aria-label]="'Valve'"
       class="accessory-svg"
     ></div>
diff --git a/ui/src/assets/hap-icons/valve-generic.svg b/ui/src/assets/hap-icons/valve-generic.svg
index facffbf83..107bb7be7 100644
--- a/ui/src/assets/hap-icons/valve-generic.svg
+++ b/ui/src/assets/hap-icons/valve-generic.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Water-tap-01" fill-rule="nonzero">
-            <path d="M72.6672694,67 L95,67 L95,44.6666667 C95,32.2974359 85.0361664,22.3333333 72.6672694,22.3333333 L50.3345389,22.3333333 L50.3345389,11.1666667 L67.1699819,11.1666667 L67.1699819,0 L22.5045208,0 L22.5045208,11.1666667 L39.3399638,11.1666667 L39.3399638,22.3333333 L0,22.3333333 L0,44.6666667 L72.6672694,44.6666667 L72.6672694,67 Z" id="XMLID_3_" class="valve_off_grey" fill="#CBCBCB"></path>
+            <path d="M72.6672694,67 L95,67 L95,44.6666667 C95,32.2974359 85.0361664,22.3333333 72.6672694,22.3333333 L50.3345389,22.3333333 L50.3345389,11.1666667 L67.1699819,11.1666667 L67.1699819,0 L22.5045208,0 L22.5045208,11.1666667 L39.3399638,11.1666667 L39.3399638,22.3333333 L0,22.3333333 L0,44.6666667 L72.6672694,44.6666667 L72.6672694,67 Z" id="XMLID_3_" fill="#808080"></path>
             <circle id="XMLID_4_" class="valve_off_hidden" fill="#2D98D3" cx="83.5" cy="84.5" r="5.5"></circle>
             <circle id="XMLID_5_" class="valve_off_hidden" fill="#2D98D3" cx="72.5" cy="98.5" r="5.5"></circle>
             <circle id="XMLID_6_" class="valve_off_hidden" fill="#2D98D3" cx="94.5" cy="98.5" r="5.5"></circle>
@@ -14,4 +14,4 @@
             <circle id="XMLID_9_" class="valve_off_hidden" fill="#2D98D3" cx="105.5" cy="111.5" r="5.5"></circle>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/ui/src/assets/hap-icons/valve-irrigation.svg b/ui/src/assets/hap-icons/valve-irrigation.svg
index 878d2254c..ce97e9601 100644
--- a/ui/src/assets/hap-icons/valve-irrigation.svg
+++ b/ui/src/assets/hap-icons/valve-irrigation.svg
@@ -14,9 +14,9 @@
             <circle id="Oval" class="valve_off_hidden" fill="#2D98D3" cx="319.566406" cy="100.5" r="21.5"></circle>
             <circle id="Oval" class="valve_off_hidden" fill="#2D98D3" cx="227.566406" cy="79.5" r="21.5"></circle>
             <polygon class="valve_off_grey" id="Path" fill="#42D653" points="0 347.554688 454.617187 347.554688 454.617188 271.222656 425.945312 309.388672 390.386719 271.222656 360.625 309.388672 324.054688 271.222656 295.980469 309.388672 260.863281 271.222656 227.308594 309.388672 194.144531 271.222656 162.945312 309.388672 128.582031 271.222656 97.9023438 309.388672 62.71875 271.222656 32.515625 309.388672 0 271.222656"></polygon>
-            <rect class="valve_off_grey"  id="Rectangle" fill="#CF74E6" x="173.066406" y="129" width="108" height="63" rx="3"></rect>
-            <rect class="valve_off_grey"  id="Rectangle" fill="#CF74E6" x="192.066406" y="190" width="71" height="30" rx="3"></rect>
-            <polygon class="valve_off_grey"  id="Path-2" fill="#CF74E6" points="210.066406 220 210.066406 266.637695 226.990234 285.363281 244.229492 266.637695 244.229492 220"></polygon>
+            <rect id="Rectangle" fill="#808080" x="173.066406" y="129" width="108" height="63" rx="3"></rect>
+            <rect id="Rectangle" fill="#808080" x="192.066406" y="190" width="71" height="30" rx="3"></rect>
+            <polygon id="Path-2" fill="#808080" points="210.066406 220 210.066406 266.637695 226.990234 285.363281 244.229492 266.637695 244.229492 220"></polygon>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/ui/src/assets/hap-icons/valve-showerhead.svg b/ui/src/assets/hap-icons/valve-showerhead.svg
new file mode 100644
index 000000000..4e1d6a25c
--- /dev/null
+++ b/ui/src/assets/hap-icons/valve-showerhead.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100px" height="100px" viewBox="0 0 100 100" version="1.1">
+<g id="surface1">
+<path class="valve_off_grey" style="stroke:none;fill-rule:nonzero;fill:#808080;fill-opacity:1;" d="M 92.382812 0 C 93.089844 0.375 93.492188 0.789062 93.75 1.5625 C 93.773438 2.101562 93.78125 2.632812 93.785156 3.171875 C 93.785156 3.335938 93.789062 3.5 93.789062 3.667969 C 93.792969 4.210938 93.792969 4.753906 93.796875 5.296875 C 93.796875 5.480469 93.796875 5.667969 93.800781 5.859375 C 93.804688 6.839844 93.804688 7.820312 93.808594 8.800781 C 93.808594 9.816406 93.816406 10.828125 93.824219 11.84375 C 93.828125 12.621094 93.832031 13.402344 93.832031 14.179688 C 93.832031 14.554688 93.835938 14.929688 93.839844 15.300781 C 93.84375 15.824219 93.84375 16.347656 93.839844 16.871094 C 93.84375 17.101562 93.84375 17.101562 93.847656 17.335938 C 93.839844 18.351562 93.628906 18.917969 92.96875 19.726562 C 92.304688 20.230469 91.632812 20.1875 90.820312 20.117188 C 90.097656 19.789062 89.652344 19.4375 89.257812 18.75 C 89.214844 18.226562 89.203125 17.753906 89.222656 17.234375 C 89.222656 17.101562 89.226562 16.964844 89.230469 16.824219 C 89.234375 16.488281 89.246094 16.15625 89.257812 15.820312 C 86.464844 15.832031 83.667969 15.847656 80.875 15.867188 C 79.574219 15.875 78.277344 15.882812 76.980469 15.886719 C 75.722656 15.894531 74.46875 15.902344 73.214844 15.910156 C 72.738281 15.914062 72.261719 15.917969 71.785156 15.917969 C 68.585938 15.925781 65.414062 15.980469 62.378906 17.125 C 62.242188 17.175781 62.105469 17.226562 61.96875 17.277344 C 56.609375 19.324219 52.378906 23.304688 49.953125 28.5 C 49.066406 30.503906 48.519531 32.59375 48.242188 34.765625 C 48.5 34.789062 48.5 34.789062 48.761719 34.816406 C 50.847656 35.070312 50.847656 35.070312 51.414062 35.65625 C 51.527344 35.8125 51.640625 35.972656 51.757812 36.132812 C 51.820312 36.195312 51.886719 36.261719 51.953125 36.328125 C 51.96875 36.835938 51.976562 37.335938 51.972656 37.84375 C 51.972656 38.070312 51.972656 38.070312 51.972656 38.300781 C 51.96875 38.789062 51.96875 39.273438 51.964844 39.757812 C 51.964844 40.085938 51.964844 40.414062 51.960938 40.742188 C 51.960938 41.550781 51.957031 42.355469 51.953125 43.164062 C 52.0625 43.1875 52.171875 43.210938 52.285156 43.230469 C 60.253906 44.921875 67.347656 50.839844 71.875 57.421875 C 75.195312 62.660156 75.195312 62.660156 75.195312 64.0625 C 75.3125 64.066406 75.425781 64.066406 75.546875 64.070312 C 76.359375 64.121094 76.847656 64.1875 77.539062 64.648438 C 78.058594 65.425781 78.175781 66.0625 78.125 66.992188 C 77.890625 67.777344 77.707031 68.0625 77.003906 68.484375 C 75.867188 68.9375 74.636719 68.832031 73.4375 68.824219 C 73.15625 68.824219 72.875 68.824219 72.59375 68.828125 C 71.824219 68.828125 71.054688 68.828125 70.285156 68.828125 C 69.457031 68.824219 68.625 68.828125 67.796875 68.828125 C 66.171875 68.832031 64.542969 68.832031 62.917969 68.828125 C 61.597656 68.828125 60.277344 68.828125 58.953125 68.828125 C 58.671875 68.828125 58.671875 68.828125 58.386719 68.828125 C 58.003906 68.828125 57.621094 68.828125 57.238281 68.828125 C 53.65625 68.832031 50.074219 68.828125 46.492188 68.824219 C 43.417969 68.824219 40.34375 68.824219 37.269531 68.828125 C 33.699219 68.828125 30.132812 68.832031 26.5625 68.828125 C 26.179688 68.828125 25.800781 68.828125 25.421875 68.828125 C 25.140625 68.828125 25.140625 68.828125 24.851562 68.828125 C 23.53125 68.828125 22.214844 68.828125 20.894531 68.828125 C 19.285156 68.832031 17.675781 68.832031 16.070312 68.828125 C 15.246094 68.828125 14.425781 68.824219 13.605469 68.828125 C 12.855469 68.828125 12.105469 68.828125 11.351562 68.824219 C 11.082031 68.824219 10.808594 68.824219 10.539062 68.828125 C 7.96875 68.839844 7.96875 68.839844 6.835938 68.164062 C 6.3125 67.480469 6.207031 66.941406 6.25 66.101562 C 6.351562 65.46875 6.46875 65.199219 6.835938 64.648438 C 7.613281 64.128906 8.265625 64.097656 9.179688 64.0625 C 9.210938 63.953125 9.246094 63.847656 9.277344 63.734375 C 9.621094 62.65625 10.042969 61.675781 10.582031 60.679688 C 10.660156 60.539062 10.738281 60.394531 10.816406 60.246094 C 12.777344 56.65625 15.40625 53.207031 18.554688 50.585938 C 18.726562 50.4375 18.894531 50.289062 19.070312 50.136719 C 22.382812 47.289062 27.894531 43.164062 32.421875 43.164062 C 32.414062 42.859375 32.414062 42.859375 32.40625 42.550781 C 32.386719 41.800781 32.378906 41.050781 32.367188 40.296875 C 32.363281 39.972656 32.355469 39.648438 32.347656 39.324219 C 32.335938 38.855469 32.332031 38.386719 32.328125 37.917969 C 32.320312 37.773438 32.316406 37.628906 32.3125 37.480469 C 32.3125 36.703125 32.386719 36.371094 32.886719 35.757812 C 33.753906 35.070312 34.414062 34.910156 35.511719 34.9375 C 35.699219 34.941406 35.890625 34.945312 36.085938 34.945312 C 36.230469 34.953125 36.375 34.957031 36.523438 34.960938 C 36.527344 34.8125 36.527344 34.664062 36.53125 34.515625 C 36.890625 26.265625 41.15625 18.304688 47.15625 12.769531 C 51.28125 9.09375 56.273438 6.417969 61.644531 5.113281 C 61.800781 5.078125 61.957031 5.039062 62.117188 5 C 65.40625 4.25 68.65625 4.246094 72.015625 4.257812 C 72.515625 4.257812 73.011719 4.261719 73.511719 4.261719 C 74.683594 4.261719 75.855469 4.265625 77.027344 4.269531 C 78.359375 4.273438 79.695312 4.273438 81.03125 4.277344 C 83.773438 4.28125 86.515625 4.289062 89.257812 4.296875 C 89.253906 4.09375 89.246094 3.894531 89.242188 3.6875 C 89.238281 3.417969 89.234375 3.152344 89.230469 2.886719 C 89.226562 2.753906 89.222656 2.621094 89.21875 2.484375 C 89.207031 1.695312 89.265625 1.152344 89.722656 0.5 C 90.5 -0.214844 91.386719 -0.234375 92.382812 0 Z M 50.976562 15.625 C 50.875 15.710938 50.773438 15.796875 50.667969 15.886719 C 47.996094 18.175781 46.070312 20.777344 44.335938 23.828125 C 44.222656 24.027344 44.105469 24.226562 43.988281 24.429688 C 42.265625 27.625 41.332031 31.363281 41.015625 34.960938 C 41.855469 34.960938 42.691406 34.960938 43.554688 34.960938 C 43.582031 34.765625 43.613281 34.570312 43.640625 34.371094 C 44.769531 27.171875 47.996094 21.207031 53.710938 16.601562 C 59.257812 12.644531 65.0625 11.40625 71.785156 11.40625 C 72.292969 11.402344 72.800781 11.398438 73.308594 11.394531 C 74.492188 11.386719 75.679688 11.382812 76.867188 11.378906 C 78.21875 11.378906 79.570312 11.371094 80.925781 11.363281 C 83.703125 11.347656 86.480469 11.335938 89.257812 11.328125 C 89.257812 10.492188 89.257812 9.652344 89.257812 8.789062 C 86.570312 8.78125 83.886719 8.773438 81.199219 8.769531 C 79.953125 8.765625 78.703125 8.765625 77.457031 8.757812 C 76.25 8.753906 75.042969 8.753906 73.835938 8.753906 C 73.378906 8.75 72.921875 8.75 72.464844 8.746094 C 64.449219 8.710938 57.195312 10.265625 50.976562 15.625 Z M 36.914062 39.648438 C 36.914062 40.617188 36.914062 41.582031 36.914062 42.578125 C 40.394531 42.578125 43.875 42.578125 47.460938 42.578125 C 47.460938 41.609375 47.460938 40.644531 47.460938 39.648438 C 43.980469 39.648438 40.5 39.648438 36.914062 39.648438 Z M 30.078125 48.632812 C 29.875 48.722656 29.671875 48.8125 29.460938 48.902344 C 28.996094 49.117188 28.554688 49.34375 28.113281 49.597656 C 27.960938 49.679688 27.808594 49.761719 27.65625 49.847656 C 22.058594 52.953125 16.9375 57.773438 14.257812 63.671875 C 14.257812 63.800781 14.257812 63.929688 14.257812 64.0625 C 32.691406 64.0625 51.125 64.0625 70.117188 64.0625 C 69.800781 63.113281 69.457031 62.351562 68.945312 61.511719 C 68.828125 61.320312 68.828125 61.320312 68.710938 61.125 C 66.921875 58.234375 64.601562 55.417969 61.914062 53.320312 C 61.816406 53.242188 61.71875 53.167969 61.621094 53.089844 C 58.929688 50.980469 55.953125 49.222656 52.734375 48.046875 C 52.570312 47.984375 52.40625 47.921875 52.234375 47.855469 C 50.339844 47.1875 48.578125 47.140625 46.589844 47.140625 C 46.242188 47.140625 45.898438 47.136719 45.550781 47.136719 C 44.828125 47.132812 44.109375 47.128906 43.386719 47.132812 C 42.65625 47.132812 41.921875 47.128906 41.191406 47.121094 C 35.484375 46.988281 35.484375 46.988281 30.078125 48.632812 Z M 30.078125 48.632812 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 61.328125 86.914062 C 61.976562 87.265625 62.222656 87.507812 62.519531 88.179688 C 62.757812 89.109375 62.753906 89.988281 62.753906 90.941406 C 62.753906 91.140625 62.753906 91.339844 62.757812 91.542969 C 62.757812 91.964844 62.757812 92.382812 62.757812 92.800781 C 62.757812 93.441406 62.761719 94.082031 62.765625 94.722656 C 62.765625 95.128906 62.765625 95.539062 62.765625 95.945312 C 62.769531 96.136719 62.769531 96.328125 62.773438 96.523438 C 62.761719 97.777344 62.667969 98.847656 61.742188 99.785156 C 60.980469 100.179688 60.207031 100.144531 59.375 100 C 58.621094 99.449219 58.273438 98.929688 58.007812 98.046875 C 57.949219 97.363281 57.949219 96.679688 57.949219 95.992188 C 57.949219 95.792969 57.949219 95.59375 57.945312 95.386719 C 57.945312 94.96875 57.945312 94.546875 57.945312 94.125 C 57.945312 93.484375 57.941406 92.84375 57.9375 92.203125 C 57.9375 91.792969 57.9375 91.382812 57.9375 90.972656 C 57.933594 90.785156 57.933594 90.59375 57.929688 90.398438 C 57.941406 89.136719 58.035156 88.066406 58.960938 87.125 C 59.722656 86.734375 60.496094 86.792969 61.328125 86.914062 Z M 61.328125 86.914062 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 43.164062 86.914062 C 43.8125 87.265625 44.058594 87.507812 44.355469 88.179688 C 44.59375 89.109375 44.589844 89.988281 44.589844 90.941406 C 44.589844 91.140625 44.589844 91.339844 44.59375 91.542969 C 44.59375 91.964844 44.59375 92.382812 44.59375 92.800781 C 44.59375 93.441406 44.597656 94.082031 44.601562 94.722656 C 44.601562 95.128906 44.601562 95.539062 44.601562 95.945312 C 44.605469 96.136719 44.605469 96.328125 44.609375 96.523438 C 44.597656 97.777344 44.503906 98.847656 43.578125 99.785156 C 42.816406 100.179688 42.042969 100.144531 41.210938 100 C 40.457031 99.449219 40.109375 98.929688 39.84375 98.046875 C 39.785156 97.363281 39.785156 96.679688 39.785156 95.992188 C 39.785156 95.792969 39.785156 95.59375 39.78125 95.386719 C 39.78125 94.96875 39.78125 94.546875 39.78125 94.125 C 39.78125 93.484375 39.777344 92.84375 39.773438 92.203125 C 39.773438 91.792969 39.773438 91.382812 39.773438 90.972656 C 39.769531 90.785156 39.769531 90.59375 39.765625 90.398438 C 39.777344 89.136719 39.871094 88.066406 40.796875 87.125 C 41.558594 86.734375 42.332031 86.792969 43.164062 86.914062 Z M 43.164062 86.914062 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 25 86.914062 C 25.753906 87.464844 26.101562 87.984375 26.367188 88.867188 C 26.425781 89.550781 26.425781 90.234375 26.425781 90.921875 C 26.425781 91.121094 26.425781 91.320312 26.429688 91.527344 C 26.429688 91.945312 26.429688 92.367188 26.429688 92.789062 C 26.429688 93.429688 26.433594 94.070312 26.4375 94.710938 C 26.4375 95.121094 26.4375 95.53125 26.4375 95.941406 C 26.441406 96.128906 26.441406 96.320312 26.445312 96.515625 C 26.433594 97.777344 26.339844 98.847656 25.414062 99.789062 C 24.652344 100.179688 23.878906 100.121094 23.046875 100 C 22.398438 99.648438 22.152344 99.40625 21.855469 98.734375 C 21.617188 97.804688 21.621094 96.925781 21.621094 95.972656 C 21.621094 95.773438 21.621094 95.574219 21.617188 95.371094 C 21.617188 94.949219 21.617188 94.53125 21.617188 94.113281 C 21.617188 93.472656 21.613281 92.832031 21.609375 92.191406 C 21.609375 91.785156 21.609375 91.375 21.609375 90.96875 C 21.605469 90.777344 21.605469 90.585938 21.601562 90.390625 C 21.613281 89.136719 21.707031 88.066406 22.632812 87.128906 C 23.394531 86.734375 24.167969 86.769531 25 86.914062 Z M 25 86.914062 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 70.507812 71.289062 C 71.023438 71.71875 71.378906 72.058594 71.679688 72.65625 C 71.703125 72.980469 71.710938 73.308594 71.714844 73.636719 C 71.714844 73.839844 71.71875 74.042969 71.722656 74.253906 C 71.722656 74.476562 71.726562 74.695312 71.726562 74.925781 C 71.730469 75.265625 71.730469 75.265625 71.730469 75.613281 C 71.734375 76.09375 71.734375 76.574219 71.738281 77.054688 C 71.742188 77.789062 71.75 78.527344 71.757812 79.261719 C 71.761719 79.726562 71.761719 80.195312 71.761719 80.660156 C 71.765625 80.882812 71.769531 81.101562 71.773438 81.328125 C 71.769531 82.859375 71.769531 82.859375 71.304688 83.625 C 70.667969 84.1875 70.3125 84.351562 69.457031 84.449219 C 68.613281 84.359375 68.222656 84.132812 67.578125 83.59375 C 67.199219 82.996094 67.136719 82.53125 67.132812 81.828125 C 67.132812 81.632812 67.128906 81.4375 67.128906 81.234375 C 67.128906 81.023438 67.128906 80.816406 67.128906 80.597656 C 67.128906 80.382812 67.128906 80.164062 67.125 79.941406 C 67.125 79.480469 67.125 79.023438 67.125 78.5625 C 67.125 77.859375 67.121094 77.160156 67.117188 76.457031 C 67.117188 76.011719 67.117188 75.5625 67.117188 75.117188 C 67.113281 74.90625 67.113281 74.699219 67.109375 74.484375 C 67.117188 73.40625 67.144531 72.597656 67.773438 71.679688 C 68.664062 71.035156 69.480469 70.9375 70.507812 71.289062 Z M 70.507812 71.289062 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 52.34375 71.289062 C 52.859375 71.71875 53.214844 72.058594 53.515625 72.65625 C 53.539062 72.976562 53.546875 73.292969 53.550781 73.613281 C 53.550781 73.8125 53.554688 74.011719 53.558594 74.21875 C 53.558594 74.433594 53.5625 74.652344 53.5625 74.875 C 53.566406 75.207031 53.566406 75.207031 53.566406 75.546875 C 53.570312 76.019531 53.570312 76.488281 53.574219 76.960938 C 53.578125 77.679688 53.585938 78.398438 53.59375 79.117188 C 53.597656 79.574219 53.597656 80.03125 53.597656 80.488281 C 53.601562 80.703125 53.605469 80.917969 53.609375 81.140625 C 53.605469 82.347656 53.546875 83.070312 52.734375 83.984375 C 52.066406 84.492188 51.398438 84.460938 50.585938 84.375 C 49.800781 83.960938 49.34375 83.636719 49.023438 82.8125 C 48.972656 82.339844 48.972656 82.339844 48.96875 81.808594 C 48.96875 81.605469 48.964844 81.40625 48.964844 81.199219 C 48.964844 80.984375 48.964844 80.769531 48.964844 80.550781 C 48.964844 80.328125 48.964844 80.105469 48.960938 79.875 C 48.960938 79.40625 48.960938 78.9375 48.960938 78.46875 C 48.960938 77.75 48.957031 77.03125 48.953125 76.3125 C 48.953125 75.859375 48.953125 75.402344 48.953125 74.945312 C 48.949219 74.730469 48.949219 74.515625 48.945312 74.296875 C 48.949219 74.09375 48.949219 73.894531 48.949219 73.6875 C 48.949219 73.511719 48.949219 73.335938 48.949219 73.152344 C 49.039062 72.542969 49.25 72.179688 49.609375 71.679688 C 50.515625 71.046875 51.308594 70.933594 52.34375 71.289062 Z M 52.34375 71.289062 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 34.179688 71.289062 C 34.695312 71.71875 35.050781 72.058594 35.351562 72.65625 C 35.375 72.976562 35.382812 73.292969 35.386719 73.613281 C 35.386719 73.8125 35.390625 74.011719 35.394531 74.21875 C 35.394531 74.433594 35.398438 74.652344 35.398438 74.875 C 35.402344 75.207031 35.402344 75.207031 35.402344 75.546875 C 35.40625 76.019531 35.40625 76.488281 35.410156 76.960938 C 35.414062 77.679688 35.421875 78.398438 35.429688 79.117188 C 35.433594 79.574219 35.433594 80.03125 35.433594 80.488281 C 35.4375 80.703125 35.441406 80.917969 35.445312 81.140625 C 35.441406 82.347656 35.382812 83.070312 34.570312 83.984375 C 33.902344 84.492188 33.234375 84.460938 32.421875 84.375 C 31.636719 83.960938 31.179688 83.636719 30.859375 82.8125 C 30.808594 82.339844 30.808594 82.339844 30.800781 81.808594 C 30.800781 81.609375 30.796875 81.410156 30.796875 81.207031 C 30.792969 80.992188 30.792969 80.777344 30.792969 80.554688 C 30.792969 80.335938 30.792969 80.113281 30.789062 79.882812 C 30.789062 79.414062 30.785156 78.949219 30.785156 78.480469 C 30.785156 77.761719 30.777344 77.046875 30.773438 76.332031 C 30.769531 75.875 30.769531 75.421875 30.769531 74.964844 C 30.765625 74.75 30.765625 74.539062 30.761719 74.316406 C 30.769531 73.117188 30.828125 72.390625 31.640625 71.484375 C 32.441406 70.972656 33.292969 71.007812 34.179688 71.289062 Z M 34.179688 71.289062 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 16.015625 71.289062 C 16.636719 71.789062 16.933594 72.09375 17.1875 72.851562 C 17.207031 73.171875 17.21875 73.492188 17.222656 73.8125 C 17.222656 74.007812 17.226562 74.203125 17.230469 74.40625 C 17.230469 74.617188 17.234375 74.828125 17.234375 75.046875 C 17.234375 75.265625 17.238281 75.480469 17.238281 75.707031 C 17.242188 76.167969 17.242188 76.625 17.246094 77.085938 C 17.25 77.789062 17.257812 78.492188 17.265625 79.199219 C 17.269531 79.644531 17.269531 80.09375 17.269531 80.539062 C 17.273438 80.75 17.277344 80.960938 17.28125 81.175781 C 17.277344 82.371094 17.207031 83.078125 16.40625 83.984375 C 15.738281 84.492188 15.070312 84.460938 14.257812 84.375 C 13.472656 83.960938 13.015625 83.636719 12.695312 82.8125 C 12.644531 82.339844 12.644531 82.339844 12.636719 81.808594 C 12.636719 81.609375 12.632812 81.410156 12.632812 81.207031 C 12.628906 80.992188 12.628906 80.777344 12.628906 80.554688 C 12.628906 80.335938 12.628906 80.113281 12.625 79.882812 C 12.625 79.414062 12.621094 78.949219 12.621094 78.480469 C 12.621094 77.761719 12.613281 77.046875 12.609375 76.332031 C 12.605469 75.875 12.605469 75.421875 12.605469 74.964844 C 12.601562 74.75 12.601562 74.539062 12.597656 74.316406 C 12.605469 73.117188 12.664062 72.390625 13.476562 71.484375 C 14.277344 70.972656 15.128906 71.007812 16.015625 71.289062 Z M 16.015625 71.289062 "/>
+</g>
+</svg>
diff --git a/ui/src/assets/hap-icons/valve-waterfaucet.svg b/ui/src/assets/hap-icons/valve-waterfaucet.svg
new file mode 100644
index 000000000..443312d67
--- /dev/null
+++ b/ui/src/assets/hap-icons/valve-waterfaucet.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100px" height="100px" viewBox="0 0 100 100" version="1.1">
+<g id="surface1">
+<path style="stroke:none;fill-rule:nonzero;fill:#808080;fill-opacity:1;" d="M 72.070312 0 C 72.96875 0.679688 73.183594 1.851562 73.472656 2.90625 C 73.550781 3.179688 73.550781 3.179688 73.628906 3.460938 C 74.5625 7 74.324219 10.308594 72.53125 13.523438 C 70.042969 17.65625 65.863281 18.78125 61.480469 19.980469 C 61.203125 20.058594 60.921875 20.136719 60.640625 20.214844 C 60.046875 20.378906 59.449219 20.542969 58.855469 20.707031 C 57.921875 20.960938 56.992188 21.21875 56.058594 21.476562 C 55.902344 21.519531 55.746094 21.566406 55.585938 21.609375 C 55.265625 21.695312 54.949219 21.785156 54.632812 21.871094 C 54.15625 22.003906 53.675781 22.136719 53.199219 22.269531 C 50.125 23.121094 47.054688 23.980469 43.980469 24.839844 C 43.625 24.941406 43.625 24.941406 43.257812 25.042969 C 42.589844 25.230469 41.921875 25.417969 41.257812 25.605469 C 40.960938 25.6875 40.960938 25.6875 40.664062 25.773438 C 40.484375 25.824219 40.304688 25.875 40.125 25.925781 C 39.96875 25.96875 39.816406 26.011719 39.65625 26.054688 C 39.324219 26.152344 39 26.257812 38.671875 26.367188 C 38.464844 26.910156 38.453125 27.429688 38.453125 28.007812 C 38.453125 28.175781 38.453125 28.347656 38.453125 28.523438 C 38.453125 28.707031 38.453125 28.894531 38.453125 29.082031 C 38.453125 29.378906 38.453125 29.378906 38.453125 29.679688 C 38.453125 30.328125 38.457031 30.976562 38.457031 31.625 C 38.457031 32.074219 38.457031 32.523438 38.457031 32.976562 C 38.460938 34.160156 38.460938 35.34375 38.464844 36.527344 C 38.464844 37.734375 38.464844 38.945312 38.46875 40.152344 C 38.46875 42.523438 38.472656 44.894531 38.476562 47.265625 C 40.953125 46.609375 43.425781 45.953125 45.902344 45.292969 C 46.519531 45.128906 47.136719 44.964844 47.75 44.800781 C 52.511719 43.539062 57.269531 42.269531 62.023438 40.984375 C 62.441406 40.871094 62.863281 40.757812 63.28125 40.644531 C 65.089844 40.15625 66.898438 39.667969 68.707031 39.179688 C 69.449219 38.976562 70.195312 38.777344 70.9375 38.574219 C 71.28125 38.484375 71.625 38.390625 71.96875 38.296875 C 77.074219 36.90625 81.609375 36.429688 86.417969 39.046875 C 87.304688 39.554688 88.09375 40.152344 88.867188 40.820312 C 89.101562 41 89.101562 41 89.34375 41.179688 C 89.90625 41.65625 90.339844 42.15625 90.796875 42.738281 C 90.953125 42.929688 91.109375 43.125 91.269531 43.328125 C 92.632812 45.28125 93.386719 47.5625 93.996094 49.84375 C 94.105469 50.246094 94.21875 50.648438 94.328125 51.054688 C 95.414062 54.96875 95.414062 54.96875 95.179688 56.140625 C 94.472656 56.921875 93.570312 57.136719 92.578125 57.421875 C 92.640625 57.632812 92.707031 57.839844 92.773438 58.054688 C 93.222656 59.9375 93.0625 61.394531 92.207031 63.128906 C 90.894531 64.875 89.050781 65.265625 87.035156 65.785156 C 86.726562 65.867188 86.417969 65.949219 86.105469 66.03125 C 85.464844 66.203125 84.820312 66.375 84.179688 66.542969 C 83.21875 66.792969 82.257812 67.050781 81.296875 67.304688 C 80.152344 67.613281 79.007812 67.917969 77.863281 68.21875 C 77.636719 68.28125 77.40625 68.339844 77.171875 68.402344 C 75.492188 68.824219 74.054688 68.9375 72.460938 68.164062 C 70.992188 67.183594 70.265625 66.011719 69.902344 64.304688 C 69.867188 64.148438 69.835938 63.992188 69.800781 63.832031 C 69.777344 63.714844 69.75 63.597656 69.726562 63.476562 C 67.925781 63.960938 66.121094 64.445312 64.320312 64.929688 C 64.179688 64.964844 64.039062 65.003906 63.894531 65.042969 C 55.421875 67.320312 46.949219 69.597656 38.476562 71.875 C 38.476562 77.933594 38.476562 83.992188 38.476562 90.234375 C 38.929688 90.492188 39.378906 90.75 39.84375 91.015625 C 40.214844 91.335938 40.214844 91.335938 40.476562 91.648438 C 40.566406 91.753906 40.65625 91.855469 40.75 91.957031 C 41.671875 93.429688 41.703125 94.824219 41.699219 96.519531 C 41.703125 96.746094 41.710938 96.976562 41.714844 97.207031 C 41.714844 97.425781 41.71875 97.648438 41.71875 97.871094 C 41.71875 98.070312 41.71875 98.265625 41.722656 98.472656 C 41.554688 99.242188 41.234375 99.507812 40.625 100 C 39.960938 100.121094 39.960938 100.121094 39.1875 100.121094 C 38.972656 100.125 38.972656 100.125 38.753906 100.125 C 38.273438 100.128906 37.796875 100.125 37.316406 100.125 C 36.972656 100.125 36.628906 100.125 36.289062 100.128906 C 35.355469 100.132812 34.425781 100.128906 33.492188 100.125 C 32.515625 100.121094 31.542969 100.125 30.566406 100.125 C 28.929688 100.125 27.292969 100.121094 25.65625 100.117188 C 23.765625 100.109375 21.871094 100.109375 19.976562 100.113281 C 18.15625 100.117188 16.335938 100.117188 14.515625 100.113281 C 13.742188 100.109375 12.964844 100.109375 12.191406 100.113281 C 11.277344 100.113281 10.367188 100.113281 9.453125 100.105469 C 9.121094 100.105469 8.785156 100.105469 8.449219 100.105469 C 7.992188 100.109375 7.535156 100.105469 7.078125 100.101562 C 6.824219 100.101562 6.566406 100.097656 6.304688 100.097656 C 5.554688 99.984375 5.328125 99.816406 4.882812 99.21875 C 4.601562 98.371094 4.644531 97.554688 4.640625 96.667969 C 4.632812 96.492188 4.628906 96.3125 4.625 96.132812 C 4.617188 94.46875 4.90625 92.867188 5.9375 91.523438 C 6.289062 91.171875 6.601562 91.046875 7.054688 90.851562 C 7.609375 90.507812 7.78125 90.34375 7.957031 89.707031 C 8.011719 88.992188 8.015625 88.285156 8.003906 87.570312 C 8.007812 87.292969 8.007812 87.015625 8.011719 86.738281 C 8.015625 85.972656 8.011719 85.210938 8.003906 84.449219 C 8 83.625 8.003906 82.800781 8.007812 81.980469 C 8.011719 80.550781 8.007812 79.125 8 77.699219 C 7.992188 75.632812 7.992188 73.570312 7.996094 71.503906 C 8 68.148438 8 64.792969 7.992188 61.4375 C 7.984375 58.1875 7.980469 54.933594 7.980469 51.679688 C 7.980469 51.480469 7.980469 51.28125 7.980469 51.074219 C 7.980469 48.890625 7.980469 46.703125 7.980469 44.515625 C 7.980469 44.324219 7.980469 44.132812 7.980469 43.933594 C 7.980469 42.347656 7.980469 42.347656 7.980469 41.625 C 7.984375 39.375 7.980469 37.125 7.976562 34.878906 C 7.972656 33.464844 7.972656 32.050781 7.972656 30.640625 C 7.972656 29.671875 7.96875 28.703125 7.964844 27.730469 C 7.964844 27.140625 7.964844 26.546875 7.964844 25.957031 C 7.964844 25.5625 7.960938 25.167969 7.960938 24.773438 C 7.96875 20.964844 8.667969 17.34375 11.375 14.488281 C 13.964844 12.070312 17.105469 11.238281 20.476562 10.535156 C 20.824219 10.460938 21.167969 10.386719 21.511719 10.3125 C 22.445312 10.113281 23.378906 9.917969 24.3125 9.722656 C 25.308594 9.511719 26.304688 9.300781 27.300781 9.085938 C 29.203125 8.683594 31.101562 8.28125 33.003906 7.878906 C 35.519531 7.347656 38.035156 6.8125 40.550781 6.277344 C 41.167969 6.148438 41.789062 6.015625 42.40625 5.886719 C 42.714844 5.820312 42.714844 5.820312 43.023438 5.753906 C 44.457031 5.449219 45.890625 5.144531 47.324219 4.84375 C 51.058594 4.054688 54.792969 3.257812 58.523438 2.441406 C 59.074219 2.320312 59.625 2.203125 60.175781 2.082031 C 60.53125 2.003906 60.886719 1.925781 61.242188 1.847656 C 61.5 1.792969 61.5 1.792969 61.765625 1.734375 C 62.765625 1.515625 63.765625 1.296875 64.769531 1.074219 C 65.378906 0.9375 65.988281 0.804688 66.597656 0.671875 C 66.875 0.613281 67.15625 0.550781 67.433594 0.488281 C 70.53125 -0.207031 70.53125 -0.207031 72.070312 0 Z M 68.4375 3.980469 C 68.230469 4.023438 68.230469 4.023438 68.019531 4.066406 C 67.546875 4.167969 67.074219 4.265625 66.605469 4.367188 C 66.257812 4.441406 65.914062 4.515625 65.566406 4.585938 C 64.394531 4.835938 63.222656 5.085938 62.046875 5.335938 C 61.847656 5.378906 61.644531 5.421875 61.433594 5.464844 C 59.402344 5.894531 57.371094 6.328125 55.34375 6.761719 C 52.175781 7.433594 49.007812 8.105469 45.835938 8.777344 C 42.753906 9.429688 39.667969 10.085938 36.585938 10.742188 C 34.761719 11.128906 32.933594 11.515625 31.109375 11.902344 C 29.535156 12.234375 27.957031 12.570312 26.378906 12.90625 C 25.5625 13.078125 24.746094 13.253906 23.929688 13.425781 C 23.171875 13.585938 22.414062 13.746094 21.65625 13.90625 C 21.382812 13.964844 21.109375 14.023438 20.832031 14.082031 C 17.628906 14.753906 14.882812 15.601562 12.890625 18.359375 C 11.34375 20.976562 11.46875 23.859375 11.484375 26.796875 C 11.484375 27.132812 11.484375 27.46875 11.488281 27.800781 C 11.488281 29.03125 11.492188 30.261719 11.5 31.492188 C 11.507812 34.25 11.515625 37.003906 11.523438 39.84375 C 19.195312 39.84375 26.863281 39.84375 34.765625 39.84375 C 34.800781 35.5625 34.800781 35.5625 34.824219 31.277344 C 34.832031 30.445312 34.832031 30.445312 34.835938 30.050781 C 34.839844 29.78125 34.84375 29.511719 34.84375 29.242188 C 34.84375 27.308594 34.941406 25.605469 36.195312 24.046875 C 37.292969 23.179688 38.375 22.710938 39.707031 22.347656 C 39.863281 22.304688 40.019531 22.257812 40.179688 22.214844 C 40.695312 22.066406 41.210938 21.925781 41.726562 21.78125 C 42.09375 21.679688 42.460938 21.578125 42.824219 21.472656 C 43.789062 21.203125 44.75 20.933594 45.710938 20.667969 C 46.457031 20.460938 47.199219 20.253906 47.945312 20.046875 C 50.675781 19.28125 53.40625 18.523438 56.140625 17.769531 C 57.058594 17.515625 57.972656 17.257812 58.890625 17.003906 C 59.234375 16.910156 59.574219 16.8125 59.917969 16.71875 C 65.171875 15.492188 65.171875 15.492188 69.140625 12.109375 C 70.503906 9.667969 70.96875 7.332031 70.214844 4.589844 C 70.121094 4.296875 70.027344 4 69.921875 3.710938 C 69.433594 3.710938 68.910156 3.878906 68.4375 3.980469 Z M 75.898438 40.984375 C 75.640625 41.046875 75.640625 41.046875 75.378906 41.113281 C 72.226562 41.886719 69.097656 42.746094 65.964844 43.585938 C 65 43.84375 64.035156 44.101562 63.070312 44.359375 C 61.671875 44.734375 60.273438 45.105469 58.875 45.480469 C 56.695312 46.066406 54.519531 46.648438 52.339844 47.226562 C 51.039062 47.574219 49.738281 47.921875 48.441406 48.269531 C 47.5625 48.503906 46.683594 48.738281 45.804688 48.972656 C 44.980469 49.191406 44.160156 49.410156 43.339844 49.632812 C 43.039062 49.710938 42.738281 49.792969 42.441406 49.871094 C 42.03125 49.980469 41.621094 50.089844 41.210938 50.199219 C 40.984375 50.261719 40.757812 50.320312 40.519531 50.382812 C 39.761719 50.609375 39.023438 50.894531 38.28125 51.171875 C 38.28125 56.777344 38.28125 62.386719 38.28125 68.164062 C 44.203125 66.640625 44.203125 66.640625 50.113281 65.082031 C 50.398438 65.003906 50.6875 64.925781 50.976562 64.851562 C 51.121094 64.8125 51.265625 64.773438 51.417969 64.730469 C 52.039062 64.566406 52.660156 64.398438 53.28125 64.234375 C 55.445312 63.65625 57.605469 63.078125 59.765625 62.5 C 59.929688 62.457031 60.09375 62.410156 60.265625 62.367188 C 70.519531 59.621094 80.765625 56.863281 91.015625 54.101562 C 91.222656 53.378906 91.164062 52.964844 90.957031 52.238281 C 90.898438 52.027344 90.839844 51.816406 90.78125 51.601562 C 90.71875 51.382812 90.652344 51.164062 90.589844 50.941406 C 90.527344 50.726562 90.46875 50.511719 90.40625 50.289062 C 89.722656 47.875 88.808594 45.664062 86.914062 43.945312 C 86.792969 43.824219 86.675781 43.703125 86.550781 43.582031 C 84.523438 41.625 81.808594 40.652344 79.015625 40.527344 C 77.941406 40.566406 76.945312 40.726562 75.898438 40.984375 Z M 11.523438 43.359375 C 11.523438 58.699219 11.523438 74.039062 11.523438 89.84375 C 19.195312 89.84375 26.863281 89.84375 34.765625 89.84375 C 34.765625 74.503906 34.765625 59.164062 34.765625 43.359375 C 27.09375 43.359375 19.425781 43.359375 11.523438 43.359375 Z M 88.867188 58.203125 C 86.863281 58.730469 84.855469 59.257812 82.851562 59.789062 C 81.921875 60.03125 80.992188 60.277344 80.058594 60.523438 C 79.160156 60.757812 78.261719 60.996094 77.367188 61.234375 C 77.023438 61.324219 76.679688 61.414062 76.335938 61.503906 C 75.855469 61.628906 75.378906 61.757812 74.898438 61.882812 C 74.753906 61.921875 74.613281 61.957031 74.464844 61.996094 C 73.679688 62.203125 73.679688 62.203125 73.046875 62.695312 C 73.128906 62.976562 73.214844 63.257812 73.304688 63.539062 C 73.351562 63.695312 73.398438 63.851562 73.449219 64.011719 C 73.648438 64.492188 73.800781 64.726562 74.21875 65.039062 C 74.992188 65.261719 75.519531 65.207031 76.289062 65 C 76.507812 64.945312 76.722656 64.886719 76.941406 64.828125 C 77.289062 64.734375 77.289062 64.734375 77.644531 64.640625 C 77.882812 64.578125 78.125 64.511719 78.371094 64.449219 C 78.878906 64.3125 79.386719 64.175781 79.898438 64.039062 C 80.542969 63.867188 81.1875 63.695312 81.832031 63.523438 C 82.453125 63.359375 83.078125 63.195312 83.699219 63.027344 C 83.925781 62.96875 84.15625 62.90625 84.390625 62.84375 C 86.941406 62.269531 86.941406 62.269531 89.222656 61.097656 C 89.554688 60.304688 89.476562 59.613281 89.257812 58.789062 C 89.0625 58.5 89.0625 58.5 88.867188 58.203125 Z M 8.59375 93.945312 C 8.050781 94.808594 8.203125 95.382812 8.203125 96.484375 C 18.0625 96.484375 27.925781 96.484375 38.085938 96.484375 C 38.25 94.695312 38.25 94.695312 37.730469 93.933594 C 37.058594 93.335938 36.5 93.335938 35.632812 93.332031 C 35.40625 93.332031 35.179688 93.328125 34.949219 93.328125 C 34.578125 93.328125 34.578125 93.328125 34.195312 93.328125 C 33.933594 93.328125 33.667969 93.324219 33.40625 93.324219 C 32.6875 93.324219 31.972656 93.320312 31.253906 93.320312 C 30.808594 93.320312 30.359375 93.320312 29.910156 93.316406 C 28.511719 93.316406 27.109375 93.3125 25.707031 93.3125 C 24.089844 93.3125 22.472656 93.308594 20.855469 93.304688 C 19.605469 93.296875 18.355469 93.296875 17.101562 93.296875 C 16.355469 93.296875 15.609375 93.296875 14.863281 93.292969 C 14.160156 93.289062 13.457031 93.289062 12.753906 93.289062 C 12.375 93.289062 11.996094 93.285156 11.617188 93.285156 C 10.015625 93.273438 10.015625 93.273438 8.59375 93.945312 Z M 8.59375 93.945312 "/>
+<path class="valve_off_hidden" style="stroke:none;fill-rule:nonzero;fill:#2D98D3;fill-opacity:1;" d="M 84.765625 70.3125 C 84.894531 70.3125 85.023438 70.3125 85.15625 70.3125 C 85.457031 70.699219 85.457031 70.699219 85.816406 71.25 C 86.019531 71.558594 86.019531 71.558594 86.222656 71.871094 C 86.367188 72.09375 86.511719 72.320312 86.65625 72.546875 C 86.808594 72.777344 86.957031 73.007812 87.105469 73.238281 C 88.597656 75.546875 90.027344 77.894531 91.40625 80.273438 C 91.53125 80.488281 91.53125 80.488281 91.660156 80.707031 C 93.71875 84.285156 95.554688 88.304688 94.792969 92.5 C 93.949219 95.53125 92.164062 97.433594 89.566406 99.0625 C 88.066406 99.875 86.550781 100.09375 84.863281 100.074219 C 84.691406 100.074219 84.523438 100.078125 84.347656 100.082031 C 81.753906 100.070312 79.601562 99 77.710938 97.257812 C 75.675781 95.128906 74.695312 92.515625 74.742188 89.59375 C 75.246094 83.726562 80.523438 74.554688 84.765625 70.3125 Z M 84.765625 76.5625 C 84.609375 76.792969 84.460938 77.027344 84.316406 77.265625 C 84.222656 77.421875 84.128906 77.574219 84.035156 77.734375 C 83.933594 77.902344 83.832031 78.074219 83.726562 78.246094 C 83.625 78.421875 83.519531 78.597656 83.414062 78.777344 C 79.421875 84.765625 79.421875 84.765625 78.449219 91.53125 C 79.113281 93.585938 80.292969 95.097656 82.226562 96.09375 C 83.8125 96.734375 85.746094 96.765625 87.367188 96.203125 C 89.230469 95.316406 90.472656 93.898438 91.210938 91.992188 C 92.058594 89.445312 90.871094 87.019531 89.761719 84.769531 C 88.335938 81.957031 86.777344 79.140625 84.960938 76.5625 C 84.898438 76.5625 84.832031 76.5625 84.765625 76.5625 Z M 84.765625 76.5625 "/>
+</g>
+</svg>