diff --git a/homeassistant/components/yardian/icons.json b/homeassistant/components/yardian/icons.json
index 4a2e52cd0a7e..f32eb422164a 100644
--- a/homeassistant/components/yardian/icons.json
+++ b/homeassistant/components/yardian/icons.json
@@ -8,9 +8,9 @@
         "default": "mdi:pause-circle"
       },
       "watering_running": {
-        "default": "mdi:sprinkler",
+        "default": "mdi:play-circle",
         "state": {
-          "off": "mdi:sprinkler-variant"
+          "off": "mdi:play-circle-outline"
         }
       },
       "zone_enabled": {
@@ -20,6 +20,11 @@
         }
       }
     },
+    "button": {
+      "stop_irrigation": {
+        "default": "mdi:stop-circle-outline"
+      }
+    },
     "sensor": {
       "active_zone_count": {
         "default": "mdi:counter"
@@ -36,13 +41,16 @@
     },
     "switch": {
       "switch": {
-        "default": "mdi:water"
+        "default": "mdi:toggle-switch-variant",
+        "state": {
+          "off": "mdi:toggle-switch-variant-off"
+        }
       }
     }
   },
   "services": {
     "start_irrigation": {
-      "service": "mdi:water"
+      "service": "mdi:play-circle-outline"
     }
   }
 }
diff --git a/homeassistant/components/yardian/strings.json b/homeassistant/components/yardian/strings.json
index 3bd0bd12c28b..49b022ca1e4e 100644
--- a/homeassistant/components/yardian/strings.json
+++ b/homeassistant/components/yardian/strings.json
@@ -29,7 +29,7 @@
         "name": "Standby"
       },
       "watering_running": {
-        "name": "Watering running"
+        "name": "Water running"
       },
       "zone_enabled": {
         "name": "Enabled"
@@ -58,14 +58,14 @@
   },
   "services": {
     "start_irrigation": {
-      "description": "Starts the irrigation.",
+      "description": "Start a zone with a duration.",
       "fields": {
         "duration": {
           "description": "Duration for the target to be turned on.",
           "name": "Duration"
         }
       },
-      "name": "Start irrigation"
+      "name": "Start zone"
     }
   }
 }
diff --git a/tests/components/yardian/snapshots/test_binary_sensor.ambr b/tests/components/yardian/snapshots/test_binary_sensor.ambr
index e00501545b11..61e773a684f8 100644
--- a/tests/components/yardian/snapshots/test_binary_sensor.ambr
+++ b/tests/components/yardian/snapshots/test_binary_sensor.ambr
@@ -99,7 +99,7 @@
     'state': 'off',
   })
 # ---
-# name: test_all_entities[binary_sensor.yardian_smart_sprinkler_watering_running-entry]
+# name: test_all_entities[binary_sensor.yardian_smart_sprinkler_water_running-entry]
   EntityRegistryEntrySnapshot({
     'aliases': list([
       None,
@@ -113,7 +113,7 @@
     'disabled_by': None,
     'domain': 'binary_sensor',
     'entity_category': None,
-    'entity_id': 'binary_sensor.yardian_smart_sprinkler_watering_running',
+    'entity_id': 'binary_sensor.yardian_smart_sprinkler_water_running',
     'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
@@ -121,12 +121,12 @@
     'labels': set({
     }),
     'name': None,
-    'object_id_base': 'Watering running',
+    'object_id_base': 'Water running',
     'options': dict({
     }),
     'original_device_class': <BinarySensorDeviceClass.RUNNING: 'running'>,
     'original_icon': None,
-    'original_name': 'Watering running',
+    'original_name': 'Water running',
     'platform': 'yardian',
     'previous_unique_id': None,
     'suggested_object_id': None,
@@ -136,14 +136,14 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_all_entities[binary_sensor.yardian_smart_sprinkler_watering_running-state]
+# name: test_all_entities[binary_sensor.yardian_smart_sprinkler_water_running-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'running',
-      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Yardian Smart Sprinkler Watering running',
+      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Yardian Smart Sprinkler Water running',
     }),
     'context': <ANY>,
-    'entity_id': 'binary_sensor.yardian_smart_sprinkler_watering_running',
+    'entity_id': 'binary_sensor.yardian_smart_sprinkler_water_running',
     'last_changed': <ANY>,
     'last_reported': <ANY>,
     'last_updated': <ANY>,