diff --git a/core_integrations/alarm_control_panel/icon.png b/core_integrations/alarm_control_panel/icon.png
deleted file mode 100644
index d3df5737..00000000
Binary files a/core_integrations/alarm_control_panel/icon.png and /dev/null differ
diff --git a/core_integrations/alarm_control_panel/icon.txt b/core_integrations/alarm_control_panel/icon.txt
new file mode 100644
index 00000000..a1826e0a
--- /dev/null
+++ b/core_integrations/alarm_control_panel/icon.txt
@@ -0,0 +1 @@
+mdi:dialpad
diff --git a/core_integrations/alarm_control_panel/icon@2x.png b/core_integrations/alarm_control_panel/icon@2x.png
deleted file mode 100644
index ae9e5d97..00000000
Binary files a/core_integrations/alarm_control_panel/icon@2x.png and /dev/null differ
diff --git a/core_integrations/binary_sensor/icon.png b/core_integrations/binary_sensor/icon.png
deleted file mode 100644
index 582f569d..00000000
Binary files a/core_integrations/binary_sensor/icon.png and /dev/null differ
diff --git a/core_integrations/binary_sensor/icon.txt b/core_integrations/binary_sensor/icon.txt
new file mode 100644
index 00000000..331905a7
--- /dev/null
+++ b/core_integrations/binary_sensor/icon.txt
@@ -0,0 +1 @@
+mdi:dip-switch
diff --git a/core_integrations/binary_sensor/icon@2x.png b/core_integrations/binary_sensor/icon@2x.png
deleted file mode 100644
index d95c204f..00000000
Binary files a/core_integrations/binary_sensor/icon@2x.png and /dev/null differ
diff --git a/core_integrations/button b/core_integrations/button
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/button
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/button/icon.txt b/core_integrations/button/icon.txt
new file mode 100644
index 00000000..05f566d3
--- /dev/null
+++ b/core_integrations/button/icon.txt
@@ -0,0 +1 @@
+mdi:gesture-tap-button
diff --git a/core_integrations/calendar b/core_integrations/calendar
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/calendar
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/calendar/icon.txt b/core_integrations/calendar/icon.txt
new file mode 100644
index 00000000..766308e7
--- /dev/null
+++ b/core_integrations/calendar/icon.txt
@@ -0,0 +1 @@
+mdi:calendar
diff --git a/core_integrations/climate/icon.png b/core_integrations/climate/icon.png
deleted file mode 100644
index 55859467..00000000
Binary files a/core_integrations/climate/icon.png and /dev/null differ
diff --git a/core_integrations/climate/icon.txt b/core_integrations/climate/icon.txt
new file mode 100644
index 00000000..6120e0bc
--- /dev/null
+++ b/core_integrations/climate/icon.txt
@@ -0,0 +1 @@
+mdi:thermostat
diff --git a/core_integrations/climate/icon@2x.png b/core_integrations/climate/icon@2x.png
deleted file mode 100644
index 1a173ac8..00000000
Binary files a/core_integrations/climate/icon@2x.png and /dev/null differ
diff --git a/core_integrations/cover/icon.png b/core_integrations/cover/icon.png
deleted file mode 100644
index d8a618ba..00000000
Binary files a/core_integrations/cover/icon.png and /dev/null differ
diff --git a/core_integrations/cover/icon.txt b/core_integrations/cover/icon.txt
new file mode 100644
index 00000000..a37c7766
--- /dev/null
+++ b/core_integrations/cover/icon.txt
@@ -0,0 +1 @@
+mdi:blinds
diff --git a/core_integrations/cover/icon@2x.png b/core_integrations/cover/icon@2x.png
deleted file mode 100644
index d819c151..00000000
Binary files a/core_integrations/cover/icon@2x.png and /dev/null differ
diff --git a/core_integrations/diagnostics b/core_integrations/diagnostics
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/diagnostics
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/diagnostics/icon.txt b/core_integrations/diagnostics/icon.txt
new file mode 100644
index 00000000..e38443b0
--- /dev/null
+++ b/core_integrations/diagnostics/icon.txt
@@ -0,0 +1 @@
+mdi:stethoscope
diff --git a/core_integrations/discovery/icon.png b/core_integrations/discovery/icon.png
deleted file mode 100644
index 99576d86..00000000
Binary files a/core_integrations/discovery/icon.png and /dev/null differ
diff --git a/core_integrations/discovery/icon.txt b/core_integrations/discovery/icon.txt
new file mode 100644
index 00000000..9e5b9459
--- /dev/null
+++ b/core_integrations/discovery/icon.txt
@@ -0,0 +1 @@
+mdi:auto-fix
diff --git a/core_integrations/discovery/icon@2x.png b/core_integrations/discovery/icon@2x.png
deleted file mode 100644
index f4c7a2e9..00000000
Binary files a/core_integrations/discovery/icon@2x.png and /dev/null differ
diff --git a/core_integrations/energy b/core_integrations/energy
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/energy
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/energy/icon.txt b/core_integrations/energy/icon.txt
new file mode 100644
index 00000000..9af490f7
--- /dev/null
+++ b/core_integrations/energy/icon.txt
@@ -0,0 +1 @@
+mdi:home-lightning-bolt
diff --git a/core_integrations/fan/icon.png b/core_integrations/fan/icon.png
deleted file mode 100644
index 17b3d4d6..00000000
Binary files a/core_integrations/fan/icon.png and /dev/null differ
diff --git a/core_integrations/fan/icon.txt b/core_integrations/fan/icon.txt
new file mode 100644
index 00000000..6afabad7
--- /dev/null
+++ b/core_integrations/fan/icon.txt
@@ -0,0 +1 @@
+mdi:fan
diff --git a/core_integrations/fan/icon@2x.png b/core_integrations/fan/icon@2x.png
deleted file mode 100644
index 83870dca..00000000
Binary files a/core_integrations/fan/icon@2x.png and /dev/null differ
diff --git a/core_integrations/filter b/core_integrations/filter
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/filter
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/filter/icon.txt b/core_integrations/filter/icon.txt
new file mode 100644
index 00000000..c34f0238
--- /dev/null
+++ b/core_integrations/filter/icon.txt
@@ -0,0 +1 @@
+mdi:filter
diff --git a/core_integrations/geo_location b/core_integrations/geo_location
deleted file mode 120000
index 0f7a1f51..00000000
--- a/core_integrations/geo_location
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant/
\ No newline at end of file
diff --git a/core_integrations/geo_location/icon.txt b/core_integrations/geo_location/icon.txt
new file mode 100644
index 00000000..8875e51d
--- /dev/null
+++ b/core_integrations/geo_location/icon.txt
@@ -0,0 +1 @@
+mdi:map-marker
diff --git a/core_integrations/history/icon.png b/core_integrations/history/icon.png
deleted file mode 100644
index ccfc30cb..00000000
Binary files a/core_integrations/history/icon.png and /dev/null differ
diff --git a/core_integrations/history/icon.txt b/core_integrations/history/icon.txt
new file mode 100644
index 00000000..a02bb711
--- /dev/null
+++ b/core_integrations/history/icon.txt
@@ -0,0 +1 @@
+mdi:history
diff --git a/core_integrations/history/icon@2x.png b/core_integrations/history/icon@2x.png
deleted file mode 100644
index fbb6c5dd..00000000
Binary files a/core_integrations/history/icon@2x.png and /dev/null differ
diff --git a/core_integrations/humidifier/icon.png b/core_integrations/humidifier/icon.png
deleted file mode 100644
index bd4e11ed..00000000
Binary files a/core_integrations/humidifier/icon.png and /dev/null differ
diff --git a/core_integrations/humidifier/icon.txt b/core_integrations/humidifier/icon.txt
new file mode 100644
index 00000000..fa8c9b6e
--- /dev/null
+++ b/core_integrations/humidifier/icon.txt
@@ -0,0 +1 @@
+mdi:water-percent
diff --git a/core_integrations/humidifier/icon@2x.png b/core_integrations/humidifier/icon@2x.png
deleted file mode 100644
index 1710014f..00000000
Binary files a/core_integrations/humidifier/icon@2x.png and /dev/null differ
diff --git a/core_integrations/icon.txt b/core_integrations/icon.txt
new file mode 100644
index 00000000..25c8fb7f
--- /dev/null
+++ b/core_integrations/icon.txt
@@ -0,0 +1 @@
+mdi:lan
diff --git a/core_integrations/light/icon.png b/core_integrations/light/icon.png
deleted file mode 100644
index b5493b9a..00000000
Binary files a/core_integrations/light/icon.png and /dev/null differ
diff --git a/core_integrations/light/icon.txt b/core_integrations/light/icon.txt
new file mode 100644
index 00000000..88d5eb46
--- /dev/null
+++ b/core_integrations/light/icon.txt
@@ -0,0 +1 @@
+mdi:lightbulb
diff --git a/core_integrations/light/icon@2x.png b/core_integrations/light/icon@2x.png
deleted file mode 100644
index 03c329d8..00000000
Binary files a/core_integrations/light/icon@2x.png and /dev/null differ
diff --git a/core_integrations/lock/icon.png b/core_integrations/lock/icon.png
deleted file mode 100644
index 662f1fcd..00000000
Binary files a/core_integrations/lock/icon.png and /dev/null differ
diff --git a/core_integrations/lock/icon.txt b/core_integrations/lock/icon.txt
new file mode 100644
index 00000000..435b2b38
--- /dev/null
+++ b/core_integrations/lock/icon.txt
@@ -0,0 +1 @@
+mdi:lock
diff --git a/core_integrations/lock/icon@2x.png b/core_integrations/lock/icon@2x.png
deleted file mode 100644
index 5832a494..00000000
Binary files a/core_integrations/lock/icon@2x.png and /dev/null differ
diff --git a/core_integrations/map/icon.png b/core_integrations/map/icon.png
deleted file mode 100644
index 51bd43f6..00000000
Binary files a/core_integrations/map/icon.png and /dev/null differ
diff --git a/core_integrations/map/icon.txt b/core_integrations/map/icon.txt
new file mode 100644
index 00000000..4daea16a
--- /dev/null
+++ b/core_integrations/map/icon.txt
@@ -0,0 +1 @@
+mdi:comment-account
diff --git a/core_integrations/map/icon@2x.png b/core_integrations/map/icon@2x.png
deleted file mode 100644
index a72e39a9..00000000
Binary files a/core_integrations/map/icon@2x.png and /dev/null differ
diff --git a/core_integrations/mobile_app/icon.png b/core_integrations/mobile_app/icon.png
deleted file mode 100644
index c5e986d9..00000000
Binary files a/core_integrations/mobile_app/icon.png and /dev/null differ
diff --git a/core_integrations/mobile_app/icon.txt b/core_integrations/mobile_app/icon.txt
new file mode 100644
index 00000000..925d75b9
--- /dev/null
+++ b/core_integrations/mobile_app/icon.txt
@@ -0,0 +1 @@
+mdi:cellphone
diff --git a/core_integrations/mobile_app/icon@2x.png b/core_integrations/mobile_app/icon@2x.png
deleted file mode 100644
index 507c6f61..00000000
Binary files a/core_integrations/mobile_app/icon@2x.png and /dev/null differ
diff --git a/core_integrations/network b/core_integrations/network
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/network
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/remote/icon.png b/core_integrations/remote/icon.png
deleted file mode 100644
index 20e328ac..00000000
Binary files a/core_integrations/remote/icon.png and /dev/null differ
diff --git a/core_integrations/remote/icon.txt b/core_integrations/remote/icon.txt
new file mode 100644
index 00000000..efae1ef0
--- /dev/null
+++ b/core_integrations/remote/icon.txt
@@ -0,0 +1 @@
+mdi:remote
diff --git a/core_integrations/remote/icon@2x.png b/core_integrations/remote/icon@2x.png
deleted file mode 100644
index 0bcb6f74..00000000
Binary files a/core_integrations/remote/icon@2x.png and /dev/null differ
diff --git a/core_integrations/scene/icon.png b/core_integrations/scene/icon.png
deleted file mode 100644
index 0b195f59..00000000
Binary files a/core_integrations/scene/icon.png and /dev/null differ
diff --git a/core_integrations/scene/icon.txt b/core_integrations/scene/icon.txt
new file mode 100644
index 00000000..fef3ba46
--- /dev/null
+++ b/core_integrations/scene/icon.txt
@@ -0,0 +1 @@
+mdi:palette
diff --git a/core_integrations/scene/icon@2x.png b/core_integrations/scene/icon@2x.png
deleted file mode 100644
index e9eb676d..00000000
Binary files a/core_integrations/scene/icon@2x.png and /dev/null differ
diff --git a/core_integrations/season b/core_integrations/season
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/season
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/season/icon.txt b/core_integrations/season/icon.txt
new file mode 100644
index 00000000..dbe77ac9
--- /dev/null
+++ b/core_integrations/season/icon.txt
@@ -0,0 +1 @@
+mdi:sun-snowflake
diff --git a/core_integrations/select/icon.png b/core_integrations/select/icon.png
deleted file mode 100644
index d8b573c5..00000000
Binary files a/core_integrations/select/icon.png and /dev/null differ
diff --git a/core_integrations/select/icon.txt b/core_integrations/select/icon.txt
new file mode 100644
index 00000000..e5efb738
--- /dev/null
+++ b/core_integrations/select/icon.txt
@@ -0,0 +1 @@
+mdi:form-dropdown
diff --git a/core_integrations/select/icon@2x.png b/core_integrations/select/icon@2x.png
deleted file mode 100644
index 7da232c5..00000000
Binary files a/core_integrations/select/icon@2x.png and /dev/null differ
diff --git a/core_integrations/siren b/core_integrations/siren
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/siren
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/siren/icon.txt b/core_integrations/siren/icon.txt
new file mode 100644
index 00000000..d8071e58
--- /dev/null
+++ b/core_integrations/siren/icon.txt
@@ -0,0 +1 @@
+mdi:alarm-light
diff --git a/core_integrations/sql/icon.png b/core_integrations/sql/icon.png
deleted file mode 100644
index 474df456..00000000
Binary files a/core_integrations/sql/icon.png and /dev/null differ
diff --git a/core_integrations/sql/icon.txt b/core_integrations/sql/icon.txt
new file mode 100644
index 00000000..9f5bd549
--- /dev/null
+++ b/core_integrations/sql/icon.txt
@@ -0,0 +1 @@
+mdi:database
diff --git a/core_integrations/sql/icon@2x.png b/core_integrations/sql/icon@2x.png
deleted file mode 100644
index b7c25642..00000000
Binary files a/core_integrations/sql/icon@2x.png and /dev/null differ
diff --git a/core_integrations/stream b/core_integrations/stream
index 11224b9f..5f839334 120000
--- a/core_integrations/stream
+++ b/core_integrations/stream
@@ -1 +1 @@
-_homeassistant
\ No newline at end of file
+camera
\ No newline at end of file
diff --git a/core_integrations/stt/icon.png b/core_integrations/stt/icon.png
deleted file mode 100644
index 526e6e0d..00000000
Binary files a/core_integrations/stt/icon.png and /dev/null differ
diff --git a/core_integrations/stt/icon.txt b/core_integrations/stt/icon.txt
new file mode 100644
index 00000000..bae0f75b
--- /dev/null
+++ b/core_integrations/stt/icon.txt
@@ -0,0 +1 @@
+mdi:comment-text
diff --git a/core_integrations/stt/icon@2x.png b/core_integrations/stt/icon@2x.png
deleted file mode 100644
index 09eb6af8..00000000
Binary files a/core_integrations/stt/icon@2x.png and /dev/null differ
diff --git a/core_integrations/sun/icon.png b/core_integrations/sun/icon.png
deleted file mode 100644
index cdcb69b8..00000000
Binary files a/core_integrations/sun/icon.png and /dev/null differ
diff --git a/core_integrations/sun/icon.txt b/core_integrations/sun/icon.txt
new file mode 100644
index 00000000..e12a7b87
--- /dev/null
+++ b/core_integrations/sun/icon.txt
@@ -0,0 +1 @@
+mdi:weather-sunny
diff --git a/core_integrations/sun/icon@2x.png b/core_integrations/sun/icon@2x.png
deleted file mode 100644
index 192e65b7..00000000
Binary files a/core_integrations/sun/icon@2x.png and /dev/null differ
diff --git a/core_integrations/switch/icon.png b/core_integrations/switch/icon.png
deleted file mode 100644
index f08abc0f..00000000
Binary files a/core_integrations/switch/icon.png and /dev/null differ
diff --git a/core_integrations/switch/icon.txt b/core_integrations/switch/icon.txt
new file mode 100644
index 00000000..8467e2d0
--- /dev/null
+++ b/core_integrations/switch/icon.txt
@@ -0,0 +1 @@
+mdi:light-switch
diff --git a/core_integrations/switch/icon@2x.png b/core_integrations/switch/icon@2x.png
deleted file mode 100644
index 015f63ab..00000000
Binary files a/core_integrations/switch/icon@2x.png and /dev/null differ
diff --git a/core_integrations/system_health/icon.png b/core_integrations/system_health/icon.png
deleted file mode 100644
index fdd77678..00000000
Binary files a/core_integrations/system_health/icon.png and /dev/null differ
diff --git a/core_integrations/system_health/icon.txt b/core_integrations/system_health/icon.txt
new file mode 100644
index 00000000..e38443b0
--- /dev/null
+++ b/core_integrations/system_health/icon.txt
@@ -0,0 +1 @@
+mdi:stethoscope
diff --git a/core_integrations/system_health/icon@2x.png b/core_integrations/system_health/icon@2x.png
deleted file mode 100644
index aa3247ae..00000000
Binary files a/core_integrations/system_health/icon@2x.png and /dev/null differ
diff --git a/core_integrations/tag b/core_integrations/tag
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/tag
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/tag/icon.txt b/core_integrations/tag/icon.txt
new file mode 100644
index 00000000..d3c8b549
--- /dev/null
+++ b/core_integrations/tag/icon.txt
@@ -0,0 +1 @@
+mdi:nfc-variant
diff --git a/core_integrations/template/icon.png b/core_integrations/template/icon.png
deleted file mode 100644
index 1ecb66e6..00000000
Binary files a/core_integrations/template/icon.png and /dev/null differ
diff --git a/core_integrations/template/icon.txt b/core_integrations/template/icon.txt
new file mode 100644
index 00000000..0801a66a
--- /dev/null
+++ b/core_integrations/template/icon.txt
@@ -0,0 +1 @@
+mdi:code-braces
diff --git a/core_integrations/template/icon@2x.png b/core_integrations/template/icon@2x.png
deleted file mode 100644
index 40f015ff..00000000
Binary files a/core_integrations/template/icon@2x.png and /dev/null differ
diff --git a/core_integrations/uptime b/core_integrations/uptime
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/uptime
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/uptime/icon.txt b/core_integrations/uptime/icon.txt
new file mode 100644
index 00000000..1287a399
--- /dev/null
+++ b/core_integrations/uptime/icon.txt
@@ -0,0 +1 @@
+mdi:timer
diff --git a/core_integrations/usb b/core_integrations/usb
index 11224b9f..e37ffc7b 120000
--- a/core_integrations/usb
+++ b/core_integrations/usb
@@ -1 +1 @@
-_homeassistant
\ No newline at end of file
+discovery
\ No newline at end of file
diff --git a/core_integrations/vacuum/icon.png b/core_integrations/vacuum/icon.png
deleted file mode 100644
index 66e361eb..00000000
Binary files a/core_integrations/vacuum/icon.png and /dev/null differ
diff --git a/core_integrations/vacuum/icon.txt b/core_integrations/vacuum/icon.txt
new file mode 100644
index 00000000..89a14ba4
--- /dev/null
+++ b/core_integrations/vacuum/icon.txt
@@ -0,0 +1 @@
+mdi:robot-vacuum
diff --git a/core_integrations/vacuum/icon@2x.png b/core_integrations/vacuum/icon@2x.png
deleted file mode 100644
index 0e01d8c0..00000000
Binary files a/core_integrations/vacuum/icon@2x.png and /dev/null differ
diff --git a/core_integrations/wake_on_lan b/core_integrations/wake_on_lan
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/wake_on_lan
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/wake_on_lan/icon.txt b/core_integrations/wake_on_lan/icon.txt
new file mode 100644
index 00000000..b1eca8d0
--- /dev/null
+++ b/core_integrations/wake_on_lan/icon.txt
@@ -0,0 +1 @@
+mdi:sleep-off
diff --git a/core_integrations/weather/icon.png b/core_integrations/weather/icon.png
deleted file mode 100644
index 191a0847..00000000
Binary files a/core_integrations/weather/icon.png and /dev/null differ
diff --git a/core_integrations/weather/icon.txt b/core_integrations/weather/icon.txt
new file mode 100644
index 00000000..4e5e7333
--- /dev/null
+++ b/core_integrations/weather/icon.txt
@@ -0,0 +1 @@
+mdi:weather-partly-cloudy
diff --git a/core_integrations/weather/icon@2x.png b/core_integrations/weather/icon@2x.png
deleted file mode 100644
index 174f7123..00000000
Binary files a/core_integrations/weather/icon@2x.png and /dev/null differ