diff --git a/homeassistant/components/valve/icons.json b/homeassistant/components/valve/icons.json
index 349196658d4..1261d1cc398 100644
--- a/homeassistant/components/valve/icons.json
+++ b/homeassistant/components/valve/icons.json
@@ -1,13 +1,19 @@
 {
   "entity_component": {
     "_": {
-      "default": "mdi:pipe-valve"
+      "default": "mdi:valve-open",
+      "state": {
+        "off": "mdi:valve-closed"
+      }
     },
     "gas": {
       "default": "mdi:meter-gas"
     },
     "water": {
-      "default": "mdi:pipe-valve"
+      "default": "mdi:valve-open",
+      "state": {
+        "off": "mdi:valve-closed"
+      }
     }
   },
   "services": {