From 9ecaa10e51a50cb033d5e1042dda5999fb582ea9 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 14 Jul 2020 22:17:14 +0200
Subject: [PATCH] Adjust icons for MDI bump (#37730)

---
 homeassistant/components/apcupsd/sensor.py    | 12 +++---
 homeassistant/components/brother/const.py     |  2 +-
 homeassistant/components/co2signal/sensor.py  |  2 +-
 homeassistant/components/coinbase/sensor.py   |  2 +-
 homeassistant/components/config/__init__.py   |  2 +-
 homeassistant/components/ebox/sensor.py       |  2 +-
 homeassistant/components/ebusd/const.py       | 28 ++++++-------
 homeassistant/components/fido/sensor.py       |  4 +-
 homeassistant/components/foobot/sensor.py     |  6 +--
 homeassistant/components/geizhals/sensor.py   |  2 +-
 homeassistant/components/github/sensor.py     |  2 +-
 homeassistant/components/gitter/sensor.py     |  2 +-
 homeassistant/components/guardian/sensor.py   |  2 +-
 homeassistant/components/habitica/__init__.py |  2 +-
 .../components/homekit_controller/sensor.py   |  2 +-
 homeassistant/components/huawei_lte/sensor.py |  4 +-
 homeassistant/components/juicenet/sensor.py   |  2 +-
 homeassistant/components/lastfm/sensor.py     |  2 +-
 homeassistant/components/netatmo/sensor.py    |  2 +-
 homeassistant/components/nut/const.py         | 40 ++++++++++++++-----
 homeassistant/components/openuv/sensor.py     | 12 +++---
 homeassistant/components/ps4/media_player.py  |  2 +-
 homeassistant/components/sleepiq/sensor.py    |  2 +-
 homeassistant/components/travisci/sensor.py   |  6 +--
 homeassistant/components/vilfo/const.py       |  2 +-
 homeassistant/components/withings/common.py   |  2 +-
 homeassistant/components/xbox_live/sensor.py  |  2 +-
 tests/components/brother/test_sensor.py       |  2 +-
 28 files changed, 84 insertions(+), 68 deletions(-)

diff --git a/homeassistant/components/apcupsd/sensor.py b/homeassistant/components/apcupsd/sensor.py
index 3a8619a092f..26eb86c7e64 100644
--- a/homeassistant/components/apcupsd/sensor.py
+++ b/homeassistant/components/apcupsd/sensor.py
@@ -36,13 +36,13 @@ SENSOR_TYPES = {
     "battv": ["Battery Voltage", VOLT, "mdi:flash"],
     "bcharge": ["Battery", UNIT_PERCENTAGE, "mdi:battery"],
     "cable": ["Cable Type", "", "mdi:ethernet-cable"],
-    "cumonbatt": ["Total Time on Battery", "", "mdi:timer"],
+    "cumonbatt": ["Total Time on Battery", "", "mdi:timer-outline"],
     "date": ["Status Date", "", "mdi:calendar-clock"],
     "dipsw": ["Dip Switch Settings", "", "mdi:information-outline"],
     "dlowbatt": ["Low Battery Signal", "", "mdi:clock-alert"],
     "driver": ["Driver", "", "mdi:information-outline"],
-    "dshutd": ["Shutdown Delay", "", "mdi:timer"],
-    "dwake": ["Wake Delay", "", "mdi:timer"],
+    "dshutd": ["Shutdown Delay", "", "mdi:timer-outline"],
+    "dwake": ["Wake Delay", "", "mdi:timer-outline"],
     "endapc": ["Date and Time", "", "mdi:calendar-clock"],
     "extbatts": ["External Batteries", "", "mdi:information-outline"],
     "firmware": ["Firmware Version", "", "mdi:information-outline"],
@@ -60,10 +60,10 @@ SENSOR_TYPES = {
     "mandate": ["Manufacture Date", "", "mdi:calendar"],
     "masterupd": ["Master Update", "", "mdi:information-outline"],
     "maxlinev": ["Input Voltage High", VOLT, "mdi:flash"],
-    "maxtime": ["Battery Timeout", "", "mdi:timer-off"],
+    "maxtime": ["Battery Timeout", "", "mdi:timer-off-outline"],
     "mbattchg": ["Battery Shutdown", UNIT_PERCENTAGE, "mdi:battery-alert"],
     "minlinev": ["Input Voltage Low", VOLT, "mdi:flash"],
-    "mintimel": ["Shutdown Time", "", "mdi:timer"],
+    "mintimel": ["Shutdown Time", "", "mdi:timer-outline"],
     "model": ["Model", "", "mdi:information-outline"],
     "nombattv": ["Battery Nominal Voltage", VOLT, "mdi:flash"],
     "nominv": ["Nominal Input Voltage", VOLT, "mdi:flash"],
@@ -85,7 +85,7 @@ SENSOR_TYPES = {
     "status": ["Status", "", "mdi:information-outline"],
     "stesti": ["Self Test Interval", "", "mdi:information-outline"],
     "timeleft": ["Time Left", "", "mdi:clock-alert"],
-    "tonbatt": ["Time on Battery", "", "mdi:timer"],
+    "tonbatt": ["Time on Battery", "", "mdi:timer-outline"],
     "upsmode": ["Mode", "", "mdi:information-outline"],
     "upsname": ["Name", "", "mdi:information-outline"],
     "version": ["Daemon Info", "", "mdi:information-outline"],
diff --git a/homeassistant/components/brother/const.py b/homeassistant/components/brother/const.py
index d5bceaa2653..55c9989d60c 100644
--- a/homeassistant/components/brother/const.py
+++ b/homeassistant/components/brother/const.py
@@ -163,7 +163,7 @@ SENSOR_TYPES = {
         ATTR_UNIT: UNIT_PERCENTAGE,
     },
     ATTR_UPTIME: {
-        ATTR_ICON: "mdi:timer",
+        ATTR_ICON: "mdi:timer-outline",
         ATTR_LABEL: ATTR_UPTIME.title(),
         ATTR_UNIT: TIME_DAYS,
     },
diff --git a/homeassistant/components/co2signal/sensor.py b/homeassistant/components/co2signal/sensor.py
index d7f78f9c362..a61615d0e23 100644
--- a/homeassistant/components/co2signal/sensor.py
+++ b/homeassistant/components/co2signal/sensor.py
@@ -78,7 +78,7 @@ class CO2Sensor(Entity):
     @property
     def icon(self):
         """Icon to use in the frontend, if any."""
-        return "mdi:periodic-table-co2"
+        return "mdi:molecule-co2"
 
     @property
     def state(self):
diff --git a/homeassistant/components/coinbase/sensor.py b/homeassistant/components/coinbase/sensor.py
index 973c3d39159..f191bb778f4 100644
--- a/homeassistant/components/coinbase/sensor.py
+++ b/homeassistant/components/coinbase/sensor.py
@@ -12,7 +12,7 @@ CURRENCY_ICONS = {
     "USD": "mdi:currency-usd",
 }
 
-DEFAULT_COIN_ICON = "mdi:coin"
+DEFAULT_COIN_ICON = "mdi:currency-usd-circle"
 
 ATTRIBUTION = "Data provided by coinbase.com"
 
diff --git a/homeassistant/components/config/__init__.py b/homeassistant/components/config/__init__.py
index d7a257b1d9b..54482ffa34a 100644
--- a/homeassistant/components/config/__init__.py
+++ b/homeassistant/components/config/__init__.py
@@ -40,7 +40,7 @@ ACTION_DELETE = "delete"
 async def async_setup(hass, config):
     """Set up the config component."""
     hass.components.frontend.async_register_built_in_panel(
-        "config", "config", "hass:settings", require_admin=True
+        "config", "config", "hass:cog", require_admin=True
     )
 
     async def setup_panel(panel_name):
diff --git a/homeassistant/components/ebox/sensor.py b/homeassistant/components/ebox/sensor.py
index dc150109cf7..a8032a4f78a 100644
--- a/homeassistant/components/ebox/sensor.py
+++ b/homeassistant/components/ebox/sensor.py
@@ -37,7 +37,7 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
 
 SENSOR_TYPES = {
     "usage": ["Usage", UNIT_PERCENTAGE, "mdi:percent"],
-    "balance": ["Balance", PRICE, "mdi:square-inc-cash"],
+    "balance": ["Balance", PRICE, "mdi:cash-usd"],
     "limit": ["Data limit", DATA_GIGABITS, "mdi:download"],
     "days_left": ["Days left", TIME_DAYS, "mdi:calendar-today"],
     "before_offpeak_download": [
diff --git a/homeassistant/components/ebusd/const.py b/homeassistant/components/ebusd/const.py
index 6e3e25bc756..c15cf8d4eaf 100644
--- a/homeassistant/components/ebusd/const.py
+++ b/homeassistant/components/ebusd/const.py
@@ -41,13 +41,13 @@ SENSOR_TYPES = {
         "HolidayTemperature": ["HolidayTemp", TEMP_CELSIUS, "mdi:thermometer", 0],
         "HWTemperatureDesired": ["HwcTempDesired", TEMP_CELSIUS, "mdi:thermometer", 0],
         "HWActualTemperature": ["HwcStorageTemp", TEMP_CELSIUS, "mdi:thermometer", 0],
-        "HWTimerMonday": ["hwcTimer.Monday", None, "mdi:timer", 1],
-        "HWTimerTuesday": ["hwcTimer.Tuesday", None, "mdi:timer", 1],
-        "HWTimerWednesday": ["hwcTimer.Wednesday", None, "mdi:timer", 1],
-        "HWTimerThursday": ["hwcTimer.Thursday", None, "mdi:timer", 1],
-        "HWTimerFriday": ["hwcTimer.Friday", None, "mdi:timer", 1],
-        "HWTimerSaturday": ["hwcTimer.Saturday", None, "mdi:timer", 1],
-        "HWTimerSunday": ["hwcTimer.Sunday", None, "mdi:timer", 1],
+        "HWTimerMonday": ["hwcTimer.Monday", None, "mdi:timer-outline", 1],
+        "HWTimerTuesday": ["hwcTimer.Tuesday", None, "mdi:timer-outline", 1],
+        "HWTimerWednesday": ["hwcTimer.Wednesday", None, "mdi:timer-outline", 1],
+        "HWTimerThursday": ["hwcTimer.Thursday", None, "mdi:timer-outline", 1],
+        "HWTimerFriday": ["hwcTimer.Friday", None, "mdi:timer-outline", 1],
+        "HWTimerSaturday": ["hwcTimer.Saturday", None, "mdi:timer-outline", 1],
+        "HWTimerSunday": ["hwcTimer.Sunday", None, "mdi:timer-outline", 1],
         "HWOperativeMode": ["HwcOpMode", None, "mdi:math-compass", 3],
         "WaterPressure": ["WaterPressure", PRESSURE_BAR, "mdi:water-pump", 0],
         "Zone1RoomZoneMapping": ["z1RoomZoneMapping", None, "mdi:label", 0],
@@ -66,13 +66,13 @@ SENSOR_TYPES = {
             "mdi:thermometer",
             0,
         ],
-        "Zone1TimerMonday": ["z1Timer.Monday", None, "mdi:timer", 1],
-        "Zone1TimerTuesday": ["z1Timer.Tuesday", None, "mdi:timer", 1],
-        "Zone1TimerWednesday": ["z1Timer.Wednesday", None, "mdi:timer", 1],
-        "Zone1TimerThursday": ["z1Timer.Thursday", None, "mdi:timer", 1],
-        "Zone1TimerFriday": ["z1Timer.Friday", None, "mdi:timer", 1],
-        "Zone1TimerSaturday": ["z1Timer.Saturday", None, "mdi:timer", 1],
-        "Zone1TimerSunday": ["z1Timer.Sunday", None, "mdi:timer", 1],
+        "Zone1TimerMonday": ["z1Timer.Monday", None, "mdi:timer-outline", 1],
+        "Zone1TimerTuesday": ["z1Timer.Tuesday", None, "mdi:timer-outline", 1],
+        "Zone1TimerWednesday": ["z1Timer.Wednesday", None, "mdi:timer-outline", 1],
+        "Zone1TimerThursday": ["z1Timer.Thursday", None, "mdi:timer-outline", 1],
+        "Zone1TimerFriday": ["z1Timer.Friday", None, "mdi:timer-outline", 1],
+        "Zone1TimerSaturday": ["z1Timer.Saturday", None, "mdi:timer-outline", 1],
+        "Zone1TimerSunday": ["z1Timer.Sunday", None, "mdi:timer-outline", 1],
         "Zone1OperativeMode": ["z1OpMode", None, "mdi:math-compass", 3],
         "ContinuosHeating": ["ContinuosHeating", TEMP_CELSIUS, "mdi:weather-snowy", 0],
         "PowerEnergyConsumptionLastMonth": [
diff --git a/homeassistant/components/fido/sensor.py b/homeassistant/components/fido/sensor.py
index 951d13dadb4..22522d1ab74 100644
--- a/homeassistant/components/fido/sensor.py
+++ b/homeassistant/components/fido/sensor.py
@@ -35,8 +35,8 @@ REQUESTS_TIMEOUT = 15
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
 
 SENSOR_TYPES = {
-    "fido_dollar": ["Fido dollar", PRICE, "mdi:square-inc-cash"],
-    "balance": ["Balance", PRICE, "mdi:square-inc-cash"],
+    "fido_dollar": ["Fido dollar", PRICE, "mdi:cash-usd"],
+    "balance": ["Balance", PRICE, "mdi:cash-usd"],
     "data_used": ["Data used", DATA_KILOBITS, "mdi:download"],
     "data_limit": ["Data limit", DATA_KILOBITS, "mdi:download"],
     "data_remaining": ["Data remaining", DATA_KILOBITS, "mdi:download"],
diff --git a/homeassistant/components/foobot/sensor.py b/homeassistant/components/foobot/sensor.py
index b685d42acf6..b1d6fefaa3d 100644
--- a/homeassistant/components/foobot/sensor.py
+++ b/homeassistant/components/foobot/sensor.py
@@ -39,11 +39,7 @@ SENSOR_TYPES = {
     "pm": [ATTR_PM2_5, CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, "mdi:cloud"],
     "tmp": [ATTR_TEMPERATURE, TEMP_CELSIUS, "mdi:thermometer"],
     "hum": [ATTR_HUMIDITY, UNIT_PERCENTAGE, "mdi:water-percent"],
-    "co2": [
-        ATTR_CARBON_DIOXIDE,
-        CONCENTRATION_PARTS_PER_MILLION,
-        "mdi:periodic-table-co2",
-    ],
+    "co2": [ATTR_CARBON_DIOXIDE, CONCENTRATION_PARTS_PER_MILLION, "mdi:molecule-co2"],
     "voc": [
         ATTR_VOLATILE_ORGANIC_COMPOUNDS,
         CONCENTRATION_PARTS_PER_BILLION,
diff --git a/homeassistant/components/geizhals/sensor.py b/homeassistant/components/geizhals/sensor.py
index 9d5605cc404..0d83921cb2f 100644
--- a/homeassistant/components/geizhals/sensor.py
+++ b/homeassistant/components/geizhals/sensor.py
@@ -17,7 +17,7 @@ CONF_DESCRIPTION = "description"
 CONF_PRODUCT_ID = "product_id"
 CONF_LOCALE = "locale"
 
-ICON = "mdi:coin"
+ICON = "mdi:currency-usd-circle"
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=120)
 
diff --git a/homeassistant/components/github/sensor.py b/homeassistant/components/github/sensor.py
index dcd81dc68df..312e726b91d 100644
--- a/homeassistant/components/github/sensor.py
+++ b/homeassistant/components/github/sensor.py
@@ -149,7 +149,7 @@ class GitHubSensor(Entity):
     @property
     def icon(self):
         """Return the icon to use in the frontend."""
-        return "mdi:github-circle"
+        return "mdi:github"
 
     def update(self):
         """Collect updated data from GitHub API."""
diff --git a/homeassistant/components/gitter/sensor.py b/homeassistant/components/gitter/sensor.py
index 4f1eeca7d71..ee71599d9fc 100644
--- a/homeassistant/components/gitter/sensor.py
+++ b/homeassistant/components/gitter/sensor.py
@@ -19,7 +19,7 @@ ATTR_USERNAME = "username"
 DEFAULT_NAME = "Gitter messages"
 DEFAULT_ROOM = "home-assistant/home-assistant"
 
-ICON = "mdi:message-settings-variant"
+ICON = "mdi:message-cog"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
diff --git a/homeassistant/components/guardian/sensor.py b/homeassistant/components/guardian/sensor.py
index ed22fc2e73a..eadfd2b946f 100644
--- a/homeassistant/components/guardian/sensor.py
+++ b/homeassistant/components/guardian/sensor.py
@@ -27,7 +27,7 @@ SENSORS = [
         None,
         TEMP_FAHRENHEIT,
     ),
-    (SENSOR_KIND_UPTIME, "Uptime", None, "mdi:timer", TIME_MINUTES),
+    (SENSOR_KIND_UPTIME, "Uptime", None, "mdi:timer-outline", TIME_MINUTES),
 ]
 
 
diff --git a/homeassistant/components/habitica/__init__.py b/homeassistant/components/habitica/__init__.py
index 78c47bf9635..ac504821b35 100644
--- a/homeassistant/components/habitica/__init__.py
+++ b/homeassistant/components/habitica/__init__.py
@@ -33,7 +33,7 @@ SENSORS_TYPES = {
     "exp": ST("EXP", "mdi:star", "EXP", ["stats", "exp"]),
     "toNextLevel": ST("Next Lvl", "mdi:star", "EXP", ["stats", "toNextLevel"]),
     "lvl": ST("Lvl", "mdi:arrow-up-bold-circle-outline", "Lvl", ["stats", "lvl"]),
-    "gp": ST("Gold", "mdi:coin", "Gold", ["stats", "gp"]),
+    "gp": ST("Gold", "mdi:currency-usd-circle", "Gold", ["stats", "gp"]),
     "class": ST("Class", "mdi:sword", "", ["stats", "class"]),
 }
 
diff --git a/homeassistant/components/homekit_controller/sensor.py b/homeassistant/components/homekit_controller/sensor.py
index 87f47e72023..d1da2363843 100644
--- a/homeassistant/components/homekit_controller/sensor.py
+++ b/homeassistant/components/homekit_controller/sensor.py
@@ -17,7 +17,7 @@ from . import KNOWN_DEVICES, HomeKitEntity
 HUMIDITY_ICON = "mdi:water-percent"
 TEMP_C_ICON = "mdi:thermometer"
 BRIGHTNESS_ICON = "mdi:brightness-6"
-CO2_ICON = "mdi:periodic-table-co2"
+CO2_ICON = "mdi:molecule-co2"
 
 UNIT_LUX = "lux"
 
diff --git a/homeassistant/components/huawei_lte/sensor.py b/homeassistant/components/huawei_lte/sensor.py
index 018e5236c74..247fb3b6bdc 100644
--- a/homeassistant/components/huawei_lte/sensor.py
+++ b/homeassistant/components/huawei_lte/sensor.py
@@ -156,7 +156,7 @@ SENSOR_META = {
         exclude=re.compile(r"^showtraffic$", re.IGNORECASE)
     ),
     (KEY_MONITORING_TRAFFIC_STATISTICS, "CurrentConnectTime"): dict(
-        name="Current connection duration", unit=TIME_SECONDS, icon="mdi:timer"
+        name="Current connection duration", unit=TIME_SECONDS, icon="mdi:timer-outline"
     ),
     (KEY_MONITORING_TRAFFIC_STATISTICS, "CurrentDownload"): dict(
         name="Current connection download", unit=DATA_BYTES, icon="mdi:download"
@@ -165,7 +165,7 @@ SENSOR_META = {
         name="Current connection upload", unit=DATA_BYTES, icon="mdi:upload"
     ),
     (KEY_MONITORING_TRAFFIC_STATISTICS, "TotalConnectTime"): dict(
-        name="Total connected duration", unit=TIME_SECONDS, icon="mdi:timer"
+        name="Total connected duration", unit=TIME_SECONDS, icon="mdi:timer-outline"
     ),
     (KEY_MONITORING_TRAFFIC_STATISTICS, "TotalDownload"): dict(
         name="Total download", unit=DATA_BYTES, icon="mdi:download"
diff --git a/homeassistant/components/juicenet/sensor.py b/homeassistant/components/juicenet/sensor.py
index c5d37cb8180..b6704516e3b 100644
--- a/homeassistant/components/juicenet/sensor.py
+++ b/homeassistant/components/juicenet/sensor.py
@@ -75,7 +75,7 @@ class JuiceNetSensorDevice(JuiceNetDevice, Entity):
         elif self.type == "watts":
             icon = "mdi:flash"
         elif self.type == "charge_time":
-            icon = "mdi:timer"
+            icon = "mdi:timer-outline"
         elif self.type == "energy_added":
             icon = "mdi:flash"
         return icon
diff --git a/homeassistant/components/lastfm/sensor.py b/homeassistant/components/lastfm/sensor.py
index 4783457112c..56124e2c0fe 100644
--- a/homeassistant/components/lastfm/sensor.py
+++ b/homeassistant/components/lastfm/sensor.py
@@ -23,7 +23,7 @@ STATE_NOT_SCROBBLING = "Not Scrobbling"
 
 CONF_USERS = "users"
 
-ICON = "mdi:lastfm"
+ICON = "mdi:radio-fm"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
diff --git a/homeassistant/components/netatmo/sensor.py b/homeassistant/components/netatmo/sensor.py
index d022b1061ac..b3c2cb79675 100644
--- a/homeassistant/components/netatmo/sensor.py
+++ b/homeassistant/components/netatmo/sensor.py
@@ -66,7 +66,7 @@ SENSOR_TYPES = {
         "mdi:thermometer",
         DEVICE_CLASS_TEMPERATURE,
     ],
-    "co2": ["CO2", CONCENTRATION_PARTS_PER_MILLION, "mdi:periodic-table-co2", None],
+    "co2": ["CO2", CONCENTRATION_PARTS_PER_MILLION, "mdi:molecule-co2", None],
     "pressure": ["Pressure", "mbar", "mdi:gauge", None],
     "noise": ["Noise", "dB", "mdi:volume-high", None],
     "humidity": [
diff --git a/homeassistant/components/nut/const.py b/homeassistant/components/nut/const.py
index 47959108a2c..020ee7aea4a 100644
--- a/homeassistant/components/nut/const.py
+++ b/homeassistant/components/nut/const.py
@@ -51,13 +51,28 @@ SENSOR_TYPES = {
     "ups.load": ["Load", UNIT_PERCENTAGE, "mdi:gauge", None],
     "ups.load.high": ["Overload Setting", UNIT_PERCENTAGE, "mdi:gauge", None],
     "ups.id": ["System identifier", "", "mdi:information-outline", None],
-    "ups.delay.start": ["Load Restart Delay", TIME_SECONDS, "mdi:timer", None],
-    "ups.delay.reboot": ["UPS Reboot Delay", TIME_SECONDS, "mdi:timer", None],
-    "ups.delay.shutdown": ["UPS Shutdown Delay", TIME_SECONDS, "mdi:timer", None],
-    "ups.timer.start": ["Load Start Timer", TIME_SECONDS, "mdi:timer", None],
-    "ups.timer.reboot": ["Load Reboot Timer", TIME_SECONDS, "mdi:timer", None],
-    "ups.timer.shutdown": ["Load Shutdown Timer", TIME_SECONDS, "mdi:timer", None],
-    "ups.test.interval": ["Self-Test Interval", TIME_SECONDS, "mdi:timer", None],
+    "ups.delay.start": ["Load Restart Delay", TIME_SECONDS, "mdi:timer-outline", None],
+    "ups.delay.reboot": ["UPS Reboot Delay", TIME_SECONDS, "mdi:timer-outline", None],
+    "ups.delay.shutdown": [
+        "UPS Shutdown Delay",
+        TIME_SECONDS,
+        "mdi:timer-outline",
+        None,
+    ],
+    "ups.timer.start": ["Load Start Timer", TIME_SECONDS, "mdi:timer-outline", None],
+    "ups.timer.reboot": ["Load Reboot Timer", TIME_SECONDS, "mdi:timer-outline", None],
+    "ups.timer.shutdown": [
+        "Load Shutdown Timer",
+        TIME_SECONDS,
+        "mdi:timer-outline",
+        None,
+    ],
+    "ups.test.interval": [
+        "Self-Test Interval",
+        TIME_SECONDS,
+        "mdi:timer-outline",
+        None,
+    ],
     "ups.test.result": ["Self-Test Result", "", "mdi:information-outline", None],
     "ups.test.date": ["Self-Test Date", "", "mdi:calendar", None],
     "ups.display.language": ["Language", "", "mdi:information-outline", None],
@@ -127,12 +142,17 @@ SENSOR_TYPES = {
         "mdi:thermometer",
         DEVICE_CLASS_TEMPERATURE,
     ],
-    "battery.runtime": ["Battery Runtime", TIME_SECONDS, "mdi:timer", None],
-    "battery.runtime.low": ["Low Battery Runtime", TIME_SECONDS, "mdi:timer", None],
+    "battery.runtime": ["Battery Runtime", TIME_SECONDS, "mdi:timer-outline", None],
+    "battery.runtime.low": [
+        "Low Battery Runtime",
+        TIME_SECONDS,
+        "mdi:timer-outline",
+        None,
+    ],
     "battery.runtime.restart": [
         "Minimum Battery Runtime to Start",
         TIME_SECONDS,
-        "mdi:timer",
+        "mdi:timer-outline",
         None,
     ],
     "battery.alarm.threshold": [
diff --git a/homeassistant/components/openuv/sensor.py b/homeassistant/components/openuv/sensor.py
index ec6e75d0e17..781f40d75b1 100644
--- a/homeassistant/components/openuv/sensor.py
+++ b/homeassistant/components/openuv/sensor.py
@@ -48,32 +48,32 @@ SENSORS = {
     TYPE_MAX_UV_INDEX: ("Max UV Index", "mdi:weather-sunny", UV_INDEX),
     TYPE_SAFE_EXPOSURE_TIME_1: (
         "Skin Type 1 Safe Exposure Time",
-        "mdi:timer",
+        "mdi:timer-outline",
         TIME_MINUTES,
     ),
     TYPE_SAFE_EXPOSURE_TIME_2: (
         "Skin Type 2 Safe Exposure Time",
-        "mdi:timer",
+        "mdi:timer-outline",
         TIME_MINUTES,
     ),
     TYPE_SAFE_EXPOSURE_TIME_3: (
         "Skin Type 3 Safe Exposure Time",
-        "mdi:timer",
+        "mdi:timer-outline",
         TIME_MINUTES,
     ),
     TYPE_SAFE_EXPOSURE_TIME_4: (
         "Skin Type 4 Safe Exposure Time",
-        "mdi:timer",
+        "mdi:timer-outline",
         TIME_MINUTES,
     ),
     TYPE_SAFE_EXPOSURE_TIME_5: (
         "Skin Type 5 Safe Exposure Time",
-        "mdi:timer",
+        "mdi:timer-outline",
         TIME_MINUTES,
     ),
     TYPE_SAFE_EXPOSURE_TIME_6: (
         "Skin Type 6 Safe Exposure Time",
-        "mdi:timer",
+        "mdi:timer-outline",
         TIME_MINUTES,
     ),
 }
diff --git a/homeassistant/components/ps4/media_player.py b/homeassistant/components/ps4/media_player.py
index 3ecd268f92b..8ef9413edbf 100644
--- a/homeassistant/components/ps4/media_player.py
+++ b/homeassistant/components/ps4/media_player.py
@@ -49,7 +49,7 @@ SUPPORT_PS4 = (
     | SUPPORT_SELECT_SOURCE
 )
 
-ICON = "mdi:playstation"
+ICON = "mdi:sony-playstation"
 MEDIA_IMAGE_DEFAULT = None
 
 DEFAULT_RETRIES = 2
diff --git a/homeassistant/components/sleepiq/sensor.py b/homeassistant/components/sleepiq/sensor.py
index b4c3054268d..ae48c059bb8 100644
--- a/homeassistant/components/sleepiq/sensor.py
+++ b/homeassistant/components/sleepiq/sensor.py
@@ -2,7 +2,7 @@
 from . import SleepIQSensor
 from .const import DOMAIN, SENSOR_TYPES, SIDES, SLEEP_NUMBER
 
-ICON = "mdi:hotel"
+ICON = "mdi:bed"
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
diff --git a/homeassistant/components/travisci/sensor.py b/homeassistant/components/travisci/sensor.py
index c2ce599f5c3..8a548d8cb6b 100644
--- a/homeassistant/components/travisci/sensor.py
+++ b/homeassistant/components/travisci/sensor.py
@@ -30,12 +30,12 @@ SCAN_INTERVAL = timedelta(seconds=30)
 
 # sensor_type [ description, unit, icon ]
 SENSOR_TYPES = {
-    "last_build_id": ["Last Build ID", "", "mdi:account-card-details"],
+    "last_build_id": ["Last Build ID", "", "mdi:card-account-details"],
     "last_build_duration": ["Last Build Duration", TIME_SECONDS, "mdi:timelapse"],
     "last_build_finished_at": ["Last Build Finished At", "", "mdi:timetable"],
     "last_build_started_at": ["Last Build Started At", "", "mdi:timetable"],
-    "last_build_state": ["Last Build State", "", "mdi:github-circle"],
-    "state": ["State", "", "mdi:github-circle"],
+    "last_build_state": ["Last Build State", "", "mdi:github"],
+    "state": ["State", "", "mdi:github"],
 }
 
 NOTIFICATION_ID = "travisci"
diff --git a/homeassistant/components/vilfo/const.py b/homeassistant/components/vilfo/const.py
index 0c6414ce99a..658d77e1fbc 100644
--- a/homeassistant/components/vilfo/const.py
+++ b/homeassistant/components/vilfo/const.py
@@ -27,7 +27,7 @@ SENSOR_TYPES = {
     },
     ATTR_BOOT_TIME: {
         ATTR_LABEL: "Boot time",
-        ATTR_ICON: "mdi:timer",
+        ATTR_ICON: "mdi:timer-outline",
         ATTR_API_DATA_FIELD: ATTR_API_DATA_FIELD_BOOT_TIME,
         ATTR_DEVICE_CLASS: DEVICE_CLASS_TIMESTAMP,
     },
diff --git a/homeassistant/components/withings/common.py b/homeassistant/components/withings/common.py
index d63cdffcca6..0e2ff7c164f 100644
--- a/homeassistant/components/withings/common.py
+++ b/homeassistant/components/withings/common.py
@@ -450,7 +450,7 @@ WITHINGS_ATTRIBUTES = [
         NotifyAppli.BED_IN,
         "In bed",
         "",
-        "mdi:hotel",
+        "mdi:bed",
         BINARY_SENSOR_DOMAIN,
         True,
         UpdateType.WEBHOOK,
diff --git a/homeassistant/components/xbox_live/sensor.py b/homeassistant/components/xbox_live/sensor.py
index 41ebf69126a..ed5abe74bb6 100644
--- a/homeassistant/components/xbox_live/sensor.py
+++ b/homeassistant/components/xbox_live/sensor.py
@@ -16,7 +16,7 @@ _LOGGER = logging.getLogger(__name__)
 
 CONF_XUID = "xuid"
 
-ICON = "mdi:xbox"
+ICON = "mdi:microsoft-xbox"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
diff --git a/tests/components/brother/test_sensor.py b/tests/components/brother/test_sensor.py
index 8e1d52fd2a8..aeff5a3697d 100644
--- a/tests/components/brother/test_sensor.py
+++ b/tests/components/brother/test_sensor.py
@@ -208,7 +208,7 @@ async def test_sensors(hass):
 
     state = hass.states.get("sensor.hl_l2340dw_uptime")
     assert state
-    assert state.attributes.get(ATTR_ICON) == "mdi:timer"
+    assert state.attributes.get(ATTR_ICON) == "mdi:timer-outline"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TIME_DAYS
     assert state.state == "48"