From 18526559a03fcaa29c9055815ba33edb176d358d Mon Sep 17 00:00:00 2001
From: NovapaX <maarten@maartenenliesbeth.nl>
Date: Wed, 18 Apr 2018 16:39:42 +0200
Subject: [PATCH 1/3] renaming icons

---
 homeassistant/components/hdmi_cec.py           | 2 +-
 homeassistant/components/vacuum/__init__.py    | 2 +-
 homeassistant/components/vacuum/dyson.py       | 2 +-
 homeassistant/components/vacuum/neato.py       | 2 +-
 homeassistant/components/vacuum/roomba.py      | 2 +-
 homeassistant/components/vacuum/xiaomi_miio.py | 2 +-
 tests/components/vacuum/test_dyson.py          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/hdmi_cec.py b/homeassistant/components/hdmi_cec.py
index 8e2464d0922b64..b5d64f48dc757c 100644
--- a/homeassistant/components/hdmi_cec.py
+++ b/homeassistant/components/hdmi_cec.py
@@ -35,7 +35,7 @@
 ICON_UNKNOWN = 'mdi:help'
 ICON_AUDIO = 'mdi:speaker'
 ICON_PLAYER = 'mdi:play'
-ICON_TUNER = 'mdi:nest-thermostat'
+ICON_TUNER = 'mdi:radio'
 ICON_RECORDER = 'mdi:microphone'
 ICON_TV = 'mdi:television'
 ICONS_BY_TYPE = {
diff --git a/homeassistant/components/vacuum/__init__.py b/homeassistant/components/vacuum/__init__.py
index d403a776ddfe67..f6e73fd691b399 100644
--- a/homeassistant/components/vacuum/__init__.py
+++ b/homeassistant/components/vacuum/__init__.py
@@ -76,7 +76,7 @@
 }
 
 DEFAULT_NAME = 'Vacuum cleaner robot'
-DEFAULT_ICON = 'mdi:roomba'
+DEFAULT_ICON = 'mdi:robot-vacuum'
 
 SUPPORT_TURN_ON = 1
 SUPPORT_TURN_OFF = 2
diff --git a/homeassistant/components/vacuum/dyson.py b/homeassistant/components/vacuum/dyson.py
index aa05d004a35fe0..0354ab35b6c5aa 100644
--- a/homeassistant/components/vacuum/dyson.py
+++ b/homeassistant/components/vacuum/dyson.py
@@ -24,7 +24,7 @@
 
 DYSON_360_EYE_DEVICES = "dyson_360_eye_devices"
 
-ICON = 'mdi:roomba'
+ICON = 'mdi:robot-vacuum'
 
 SUPPORT_DYSON = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PAUSE | \
                 SUPPORT_RETURN_HOME | SUPPORT_FAN_SPEED | SUPPORT_STATUS | \
diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py
index 2a4eb2d5e7f3d9..200c4f2a732fb4 100644
--- a/homeassistant/components/vacuum/neato.py
+++ b/homeassistant/components/vacuum/neato.py
@@ -24,7 +24,7 @@
                  SUPPORT_STOP | SUPPORT_TURN_OFF | SUPPORT_TURN_ON | \
                  SUPPORT_STATUS | SUPPORT_MAP
 
-ICON = 'mdi:roomba'
+ICON = 'mdi:robot-vacuum'
 
 ATTR_CLEAN_START = 'clean_start'
 ATTR_CLEAN_STOP = 'clean_stop'
diff --git a/homeassistant/components/vacuum/roomba.py b/homeassistant/components/vacuum/roomba.py
index b983b20bd0c426..f0ffe47a03e44f 100644
--- a/homeassistant/components/vacuum/roomba.py
+++ b/homeassistant/components/vacuum/roomba.py
@@ -43,7 +43,7 @@
 DEFAULT_CONTINUOUS = True
 DEFAULT_NAME = 'Roomba'
 
-ICON = 'mdi:roomba'
+ICON = 'mdi:robot-vacuum'
 PLATFORM = 'roomba'
 
 FAN_SPEED_AUTOMATIC = 'Automatic'
diff --git a/homeassistant/components/vacuum/xiaomi_miio.py b/homeassistant/components/vacuum/xiaomi_miio.py
index b2451ed495cc13..367891d49d5500 100644
--- a/homeassistant/components/vacuum/xiaomi_miio.py
+++ b/homeassistant/components/vacuum/xiaomi_miio.py
@@ -24,7 +24,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = 'Xiaomi Vacuum cleaner'
-ICON = 'mdi:roomba'
+ICON = 'mdi:robot-vacuum'
 DATA_KEY = 'vacuum.xiaomi_miio'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
diff --git a/tests/components/vacuum/test_dyson.py b/tests/components/vacuum/test_dyson.py
index 186a2271a73f33..d15c7a1682a94b 100644
--- a/tests/components/vacuum/test_dyson.py
+++ b/tests/components/vacuum/test_dyson.py
@@ -118,7 +118,7 @@ def test_properties(self):
         component3 = Dyson360EyeDevice(device3)
         self.assertEqual(component.name, "Device_Vacuum")
         self.assertTrue(component.is_on)
-        self.assertEqual(component.icon, "mdi:roomba")
+        self.assertEqual(component.icon, "mdi:robot-vacuum")
         self.assertEqual(component.status, "Cleaning")
         self.assertEqual(component2.status, "Unknown")
         self.assertEqual(component.battery_level, 85)

From f99707a0fc80c0f1bcfaadfbaf420d67a1b05c06 Mon Sep 17 00:00:00 2001
From: NovapaX <maarten@maartenenliesbeth.nl>
Date: Wed, 18 Apr 2018 20:40:00 +0200
Subject: [PATCH 2/3] remove mdi:robot-vacuum

---
 homeassistant/components/vacuum/__init__.py    | 1 -
 homeassistant/components/vacuum/dyson.py       | 8 --------
 homeassistant/components/vacuum/neato.py       | 7 -------
 homeassistant/components/vacuum/roomba.py      | 6 ------
 homeassistant/components/vacuum/xiaomi_miio.py | 7 -------
 tests/components/vacuum/test_dyson.py          | 1 -
 6 files changed, 30 deletions(-)

diff --git a/homeassistant/components/vacuum/__init__.py b/homeassistant/components/vacuum/__init__.py
index f6e73fd691b399..1b7d5685231602 100644
--- a/homeassistant/components/vacuum/__init__.py
+++ b/homeassistant/components/vacuum/__init__.py
@@ -76,7 +76,6 @@
 }
 
 DEFAULT_NAME = 'Vacuum cleaner robot'
-DEFAULT_ICON = 'mdi:robot-vacuum'
 
 SUPPORT_TURN_ON = 1
 SUPPORT_TURN_OFF = 2
diff --git a/homeassistant/components/vacuum/dyson.py b/homeassistant/components/vacuum/dyson.py
index 0354ab35b6c5aa..d423a8dacf51d5 100644
--- a/homeassistant/components/vacuum/dyson.py
+++ b/homeassistant/components/vacuum/dyson.py
@@ -24,8 +24,6 @@
 
 DYSON_360_EYE_DEVICES = "dyson_360_eye_devices"
 
-ICON = 'mdi:robot-vacuum'
-
 SUPPORT_DYSON = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PAUSE | \
                 SUPPORT_RETURN_HOME | SUPPORT_FAN_SPEED | SUPPORT_STATUS | \
                 SUPPORT_BATTERY | SUPPORT_STOP
@@ -56,7 +54,6 @@ def __init__(self, device):
         """Dyson 360 Eye robot vacuum device."""
         _LOGGER.debug("Creating device %s", device.name)
         self._device = device
-        self._icon = ICON
 
     @asyncio.coroutine
     def async_added_to_hass(self):
@@ -82,11 +79,6 @@ def name(self):
         """Return the name of the device."""
         return self._device.name
 
-    @property
-    def icon(self):
-        """Return the icon to use for device."""
-        return self._icon
-
     @property
     def status(self):
         """Return the status of the vacuum cleaner."""
diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py
index 200c4f2a732fb4..9eba34cea321b3 100644
--- a/homeassistant/components/vacuum/neato.py
+++ b/homeassistant/components/vacuum/neato.py
@@ -24,8 +24,6 @@
                  SUPPORT_STOP | SUPPORT_TURN_OFF | SUPPORT_TURN_ON | \
                  SUPPORT_STATUS | SUPPORT_MAP
 
-ICON = 'mdi:robot-vacuum'
-
 ATTR_CLEAN_START = 'clean_start'
 ATTR_CLEAN_STOP = 'clean_stop'
 ATTR_CLEAN_AREA = 'clean_area'
@@ -131,11 +129,6 @@ def name(self):
         """Return the name of the device."""
         return self._name
 
-    @property
-    def icon(self):
-        """Return the icon to use for device."""
-        return ICON
-
     @property
     def supported_features(self):
         """Flag vacuum cleaner robot features that are supported."""
diff --git a/homeassistant/components/vacuum/roomba.py b/homeassistant/components/vacuum/roomba.py
index f0ffe47a03e44f..44d22e03f41624 100644
--- a/homeassistant/components/vacuum/roomba.py
+++ b/homeassistant/components/vacuum/roomba.py
@@ -43,7 +43,6 @@
 DEFAULT_CONTINUOUS = True
 DEFAULT_NAME = 'Roomba'
 
-ICON = 'mdi:robot-vacuum'
 PLATFORM = 'roomba'
 
 FAN_SPEED_AUTOMATIC = 'Automatic'
@@ -165,11 +164,6 @@ def name(self):
         """Return the name of the device."""
         return self._name
 
-    @property
-    def icon(self):
-        """Return the icon to use for device."""
-        return ICON
-
     @property
     def device_state_attributes(self):
         """Return the state attributes of the device."""
diff --git a/homeassistant/components/vacuum/xiaomi_miio.py b/homeassistant/components/vacuum/xiaomi_miio.py
index 367891d49d5500..620014a1baee71 100644
--- a/homeassistant/components/vacuum/xiaomi_miio.py
+++ b/homeassistant/components/vacuum/xiaomi_miio.py
@@ -24,7 +24,6 @@
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = 'Xiaomi Vacuum cleaner'
-ICON = 'mdi:robot-vacuum'
 DATA_KEY = 'vacuum.xiaomi_miio'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -142,7 +141,6 @@ class MiroboVacuum(VacuumDevice):
     def __init__(self, name, vacuum):
         """Initialize the Xiaomi vacuum cleaner robot handler."""
         self._name = name
-        self._icon = ICON
         self._vacuum = vacuum
 
         self.vacuum_state = None
@@ -158,11 +156,6 @@ def name(self):
         """Return the name of the device."""
         return self._name
 
-    @property
-    def icon(self):
-        """Return the icon to use for device."""
-        return self._icon
-
     @property
     def status(self):
         """Return the status of the vacuum cleaner."""
diff --git a/tests/components/vacuum/test_dyson.py b/tests/components/vacuum/test_dyson.py
index d15c7a1682a94b..8a4e6d57b91540 100644
--- a/tests/components/vacuum/test_dyson.py
+++ b/tests/components/vacuum/test_dyson.py
@@ -118,7 +118,6 @@ def test_properties(self):
         component3 = Dyson360EyeDevice(device3)
         self.assertEqual(component.name, "Device_Vacuum")
         self.assertTrue(component.is_on)
-        self.assertEqual(component.icon, "mdi:robot-vacuum")
         self.assertEqual(component.status, "Cleaning")
         self.assertEqual(component2.status, "Unknown")
         self.assertEqual(component.battery_level, 85)

From 10d4fd447a989d57bc180971dcb82029de3a1bcc Mon Sep 17 00:00:00 2001
From: NovapaX <maarten@maartenenliesbeth.nl>
Date: Wed, 18 Apr 2018 21:03:25 +0200
Subject: [PATCH 3/3] fix other vacuums

---
 homeassistant/components/vacuum/demo.py | 7 +------
 homeassistant/components/vacuum/mqtt.py | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/vacuum/demo.py b/homeassistant/components/vacuum/demo.py
index 668e3ca37e6e0d..bd501167ffa8d7 100644
--- a/homeassistant/components/vacuum/demo.py
+++ b/homeassistant/components/vacuum/demo.py
@@ -7,7 +7,7 @@
 import logging
 
 from homeassistant.components.vacuum import (
-    ATTR_CLEANED_AREA, DEFAULT_ICON, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT,
+    ATTR_CLEANED_AREA, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT,
     SUPPORT_FAN_SPEED, SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME,
     SUPPORT_SEND_COMMAND, SUPPORT_STATUS, SUPPORT_STOP, SUPPORT_TURN_OFF,
     SUPPORT_TURN_ON, VacuumDevice)
@@ -66,11 +66,6 @@ def name(self):
         """Return the name of the vacuum."""
         return self._name
 
-    @property
-    def icon(self):
-        """Return the icon for the vacuum."""
-        return DEFAULT_ICON
-
     @property
     def should_poll(self):
         """No polling needed for a demo vacuum."""
diff --git a/homeassistant/components/vacuum/mqtt.py b/homeassistant/components/vacuum/mqtt.py
index f4c640f1fc73c1..ef3bb0f636b7ef 100644
--- a/homeassistant/components/vacuum/mqtt.py
+++ b/homeassistant/components/vacuum/mqtt.py
@@ -12,7 +12,7 @@
 import homeassistant.components.mqtt as mqtt
 from homeassistant.components.mqtt import MqttAvailability
 from homeassistant.components.vacuum import (
-    DEFAULT_ICON, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED,
+    SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED,
     SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, SUPPORT_SEND_COMMAND,
     SUPPORT_STATUS, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
     VacuumDevice)
@@ -340,11 +340,6 @@ def name(self):
         """Return the name of the vacuum."""
         return self._name
 
-    @property
-    def icon(self):
-        """Return the icon for the vacuum."""
-        return DEFAULT_ICON
-
     @property
     def should_poll(self):
         """No polling needed for an MQTT vacuum."""