diff --git a/core_integrations/air_quality/icon.png b/core_integrations/air_quality/icon.png
deleted file mode 100644
index 67290c40..00000000
Binary files a/core_integrations/air_quality/icon.png and /dev/null differ
diff --git a/core_integrations/air_quality/icon.txt b/core_integrations/air_quality/icon.txt
new file mode 100644
index 00000000..a951ca7a
--- /dev/null
+++ b/core_integrations/air_quality/icon.txt
@@ -0,0 +1 @@
+mdi:weather-windy-variant
diff --git a/core_integrations/air_quality/icon@2x.png b/core_integrations/air_quality/icon@2x.png
deleted file mode 100644
index 50242df1..00000000
Binary files a/core_integrations/air_quality/icon@2x.png and /dev/null differ
diff --git a/core_integrations/alert/icon.png b/core_integrations/alert/icon.png
deleted file mode 100644
index c4784431..00000000
Binary files a/core_integrations/alert/icon.png and /dev/null differ
diff --git a/core_integrations/alert/icon.txt b/core_integrations/alert/icon.txt
new file mode 100644
index 00000000..b747b3ee
--- /dev/null
+++ b/core_integrations/alert/icon.txt
@@ -0,0 +1 @@
+mdi:alert
diff --git a/core_integrations/alert/icon@2x.png b/core_integrations/alert/icon@2x.png
deleted file mode 100644
index 22205753..00000000
Binary files a/core_integrations/alert/icon@2x.png and /dev/null differ
diff --git a/core_integrations/blueprint b/core_integrations/blueprint
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/blueprint
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/blueprint/icon.txt b/core_integrations/blueprint/icon.txt
new file mode 100644
index 00000000..c0616622
--- /dev/null
+++ b/core_integrations/blueprint/icon.txt
@@ -0,0 +1 @@
+mdi:palette-swatch
diff --git a/core_integrations/browser/icon.png b/core_integrations/browser/icon.png
deleted file mode 100644
index 819bfe14..00000000
Binary files a/core_integrations/browser/icon.png and /dev/null differ
diff --git a/core_integrations/browser/icon.txt b/core_integrations/browser/icon.txt
new file mode 100644
index 00000000..3645a7bf
--- /dev/null
+++ b/core_integrations/browser/icon.txt
@@ -0,0 +1 @@
+mdi:web
diff --git a/core_integrations/browser/icon@2x.png b/core_integrations/browser/icon@2x.png
deleted file mode 100644
index 33c2090f..00000000
Binary files a/core_integrations/browser/icon@2x.png and /dev/null differ
diff --git a/core_integrations/cert_expiry/icon.png b/core_integrations/cert_expiry/icon.png
deleted file mode 100644
index d143bd1f..00000000
Binary files a/core_integrations/cert_expiry/icon.png and /dev/null differ
diff --git a/core_integrations/cert_expiry/icon.txt b/core_integrations/cert_expiry/icon.txt
new file mode 100644
index 00000000..ee022161
--- /dev/null
+++ b/core_integrations/cert_expiry/icon.txt
@@ -0,0 +1 @@
+mdi:certificate
diff --git a/core_integrations/cert_expiry/icon@2x.png b/core_integrations/cert_expiry/icon@2x.png
deleted file mode 100644
index 104d88df..00000000
Binary files a/core_integrations/cert_expiry/icon@2x.png and /dev/null differ
diff --git a/core_integrations/conversation/icon.png b/core_integrations/conversation/icon.png
deleted file mode 100644
index 077abfd0..00000000
Binary files a/core_integrations/conversation/icon.png and /dev/null differ
diff --git a/core_integrations/conversation/icon.txt b/core_integrations/conversation/icon.txt
new file mode 100644
index 00000000..3dc2f2e3
--- /dev/null
+++ b/core_integrations/conversation/icon.txt
@@ -0,0 +1 @@
+mdi:text-to-speech
diff --git a/core_integrations/conversation/icon@2x.png b/core_integrations/conversation/icon@2x.png
deleted file mode 100644
index 65f545b6..00000000
Binary files a/core_integrations/conversation/icon@2x.png and /dev/null differ
diff --git a/core_integrations/default_config/icon.png b/core_integrations/default_config/icon.png
deleted file mode 100644
index fe731d1b..00000000
Binary files a/core_integrations/default_config/icon.png and /dev/null differ
diff --git a/core_integrations/default_config/icon.txt b/core_integrations/default_config/icon.txt
new file mode 100644
index 00000000..47c0572a
--- /dev/null
+++ b/core_integrations/default_config/icon.txt
@@ -0,0 +1 @@
+mdi:clipboard-check
diff --git a/core_integrations/default_config/icon@2x.png b/core_integrations/default_config/icon@2x.png
deleted file mode 100644
index 51a0cb11..00000000
Binary files a/core_integrations/default_config/icon@2x.png and /dev/null differ
diff --git a/core_integrations/demo/icon.png b/core_integrations/demo/icon.png
deleted file mode 100644
index f61003ec..00000000
Binary files a/core_integrations/demo/icon.png and /dev/null differ
diff --git a/core_integrations/demo/icon.txt b/core_integrations/demo/icon.txt
new file mode 100644
index 00000000..e09b7ea7
--- /dev/null
+++ b/core_integrations/demo/icon.txt
@@ -0,0 +1 @@
+mdi:monitor-dashboard
diff --git a/core_integrations/demo/icon@2x.png b/core_integrations/demo/icon@2x.png
deleted file mode 100644
index 17bf54f2..00000000
Binary files a/core_integrations/demo/icon@2x.png and /dev/null differ
diff --git a/core_integrations/downloader/icon.png b/core_integrations/downloader/icon.png
deleted file mode 100644
index 4107c557..00000000
Binary files a/core_integrations/downloader/icon.png and /dev/null differ
diff --git a/core_integrations/downloader/icon.txt b/core_integrations/downloader/icon.txt
new file mode 100644
index 00000000..1a56ad41
--- /dev/null
+++ b/core_integrations/downloader/icon.txt
@@ -0,0 +1 @@
+mdi:cloud-download
diff --git a/core_integrations/downloader/icon@2x.png b/core_integrations/downloader/icon@2x.png
deleted file mode 100644
index 15766bed..00000000
Binary files a/core_integrations/downloader/icon@2x.png and /dev/null differ
diff --git a/core_integrations/flux b/core_integrations/flux
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/flux
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/flux/icon.txt b/core_integrations/flux/icon.txt
new file mode 100644
index 00000000..aad478e8
--- /dev/null
+++ b/core_integrations/flux/icon.txt
@@ -0,0 +1 @@
+mdi:lightbulb-auto
diff --git a/core_integrations/generic_hygrostat/icon.png b/core_integrations/generic_hygrostat/icon.png
deleted file mode 100644
index abd7c7be..00000000
Binary files a/core_integrations/generic_hygrostat/icon.png and /dev/null differ
diff --git a/core_integrations/generic_hygrostat/icon.txt b/core_integrations/generic_hygrostat/icon.txt
new file mode 100644
index 00000000..c6e424cf
--- /dev/null
+++ b/core_integrations/generic_hygrostat/icon.txt
@@ -0,0 +1 @@
+mdi:air-humidifier
diff --git a/core_integrations/generic_hygrostat/icon@2x.png b/core_integrations/generic_hygrostat/icon@2x.png
deleted file mode 100644
index 14e56ec9..00000000
Binary files a/core_integrations/generic_hygrostat/icon@2x.png and /dev/null differ
diff --git a/core_integrations/generic_thermostat b/core_integrations/generic_thermostat
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/generic_thermostat
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/generic_thermostat/icon.txt b/core_integrations/generic_thermostat/icon.txt
new file mode 100644
index 00000000..6120e0bc
--- /dev/null
+++ b/core_integrations/generic_thermostat/icon.txt
@@ -0,0 +1 @@
+mdi:thermostat
diff --git a/core_integrations/hassio b/core_integrations/hassio
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/hassio
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/hassio/icon.txt b/core_integrations/hassio/icon.txt
new file mode 100644
index 00000000..96f0653e
--- /dev/null
+++ b/core_integrations/hassio/icon.txt
@@ -0,0 +1 @@
+mdi:binoculars
diff --git a/core_integrations/history_stats/icon.png b/core_integrations/history_stats/icon.png
deleted file mode 100644
index 6c65c4fc..00000000
Binary files a/core_integrations/history_stats/icon.png and /dev/null differ
diff --git a/core_integrations/history_stats/icon.txt b/core_integrations/history_stats/icon.txt
new file mode 100644
index 00000000..3ec81c39
--- /dev/null
+++ b/core_integrations/history_stats/icon.txt
@@ -0,0 +1 @@
+mdi:chart-line
diff --git a/core_integrations/history_stats/icon@2x.png b/core_integrations/history_stats/icon@2x.png
deleted file mode 100644
index c3e578db..00000000
Binary files a/core_integrations/history_stats/icon@2x.png and /dev/null differ
diff --git a/core_integrations/image_processing b/core_integrations/image_processing
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/image_processing
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/image_processing/icon.txt b/core_integrations/image_processing/icon.txt
new file mode 100644
index 00000000..a13ea8e9
--- /dev/null
+++ b/core_integrations/image_processing/icon.txt
@@ -0,0 +1 @@
+mdi:image-search
diff --git a/core_integrations/intent_script b/core_integrations/intent_script
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/intent_script
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/intent_script/icon.txt b/core_integrations/intent_script/icon.txt
new file mode 100644
index 00000000..74ee39c3
--- /dev/null
+++ b/core_integrations/intent_script/icon.txt
@@ -0,0 +1 @@
+mdi:forum-outline
diff --git a/core_integrations/local_ip/icon.png b/core_integrations/local_ip/icon.png
deleted file mode 100644
index 6fce4555..00000000
Binary files a/core_integrations/local_ip/icon.png and /dev/null differ
diff --git a/core_integrations/local_ip/icon.txt b/core_integrations/local_ip/icon.txt
new file mode 100644
index 00000000..380972c0
--- /dev/null
+++ b/core_integrations/local_ip/icon.txt
@@ -0,0 +1 @@
+mdi:ip-network
diff --git a/core_integrations/local_ip/icon@2x.png b/core_integrations/local_ip/icon@2x.png
deleted file mode 100644
index 4b4c7151..00000000
Binary files a/core_integrations/local_ip/icon@2x.png and /dev/null differ
diff --git a/core_integrations/logbook/icon.png b/core_integrations/logbook/icon.png
deleted file mode 100644
index 6d4a2855..00000000
Binary files a/core_integrations/logbook/icon.png and /dev/null differ
diff --git a/core_integrations/logbook/icon.txt b/core_integrations/logbook/icon.txt
new file mode 100644
index 00000000..c9c1a150
--- /dev/null
+++ b/core_integrations/logbook/icon.txt
@@ -0,0 +1 @@
+mdi:format-list-bulleted-type
diff --git a/core_integrations/logbook/icon@2x.png b/core_integrations/logbook/icon@2x.png
deleted file mode 100644
index c7d84db0..00000000
Binary files a/core_integrations/logbook/icon@2x.png and /dev/null differ
diff --git a/core_integrations/mailbox b/core_integrations/mailbox
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/mailbox
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/mailbox/icon.txt b/core_integrations/mailbox/icon.txt
new file mode 100644
index 00000000..53e3714a
--- /dev/null
+++ b/core_integrations/mailbox/icon.txt
@@ -0,0 +1 @@
+mdi:at
diff --git a/core_integrations/media_extractor b/core_integrations/media_extractor
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/media_extractor
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/media_extractor/icon.txt b/core_integrations/media_extractor/icon.txt
new file mode 100644
index 00000000..1a56ad41
--- /dev/null
+++ b/core_integrations/media_extractor/icon.txt
@@ -0,0 +1 @@
+mdi:cloud-download
diff --git a/core_integrations/mold_indicator b/core_integrations/mold_indicator
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/mold_indicator
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/mold_indicator/icon.txt b/core_integrations/mold_indicator/icon.txt
new file mode 100644
index 00000000..30bfc4cc
--- /dev/null
+++ b/core_integrations/mold_indicator/icon.txt
@@ -0,0 +1 @@
+mdi:water-percent-alert
diff --git a/core_integrations/my b/core_integrations/my
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/my
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/my/icon.txt b/core_integrations/my/icon.txt
new file mode 100644
index 00000000..6534bacf
--- /dev/null
+++ b/core_integrations/my/icon.txt
@@ -0,0 +1 @@
+mdi:account-heart
diff --git a/core_integrations/network/icon.txt b/core_integrations/network/icon.txt
new file mode 100644
index 00000000..25c8fb7f
--- /dev/null
+++ b/core_integrations/network/icon.txt
@@ -0,0 +1 @@
+mdi:lan
diff --git a/core_integrations/panel_custom b/core_integrations/panel_custom
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/panel_custom
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/panel_custom/icon.txt b/core_integrations/panel_custom/icon.txt
new file mode 100644
index 00000000..5cfde4ef
--- /dev/null
+++ b/core_integrations/panel_custom/icon.txt
@@ -0,0 +1 @@
+mdi:view-dashboard-edit
diff --git a/core_integrations/panel_iframe b/core_integrations/panel_iframe
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/panel_iframe
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/panel_iframe/icon.txt b/core_integrations/panel_iframe/icon.txt
new file mode 100644
index 00000000..5de53e8e
--- /dev/null
+++ b/core_integrations/panel_iframe/icon.txt
@@ -0,0 +1 @@
+mdi:application
diff --git a/core_integrations/ping b/core_integrations/ping
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/ping
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/ping/icon.txt b/core_integrations/ping/icon.txt
new file mode 100644
index 00000000..120af390
--- /dev/null
+++ b/core_integrations/ping/icon.txt
@@ -0,0 +1 @@
+mdi:table-tennis
diff --git a/core_integrations/plant/icon.png b/core_integrations/plant/icon.png
deleted file mode 100644
index f1690dc8..00000000
Binary files a/core_integrations/plant/icon.png and /dev/null differ
diff --git a/core_integrations/plant/icon.txt b/core_integrations/plant/icon.txt
new file mode 100644
index 00000000..fedd181d
--- /dev/null
+++ b/core_integrations/plant/icon.txt
@@ -0,0 +1 @@
+mdi:flower
diff --git a/core_integrations/plant/icon@2x.png b/core_integrations/plant/icon@2x.png
deleted file mode 100644
index e69ea075..00000000
Binary files a/core_integrations/plant/icon@2x.png and /dev/null differ
diff --git a/core_integrations/profiler b/core_integrations/profiler
deleted file mode 120000
index 0f7a1f51..00000000
--- a/core_integrations/profiler
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant/
\ No newline at end of file
diff --git a/core_integrations/profiler/icon.txt b/core_integrations/profiler/icon.txt
new file mode 100644
index 00000000..7f2edd90
--- /dev/null
+++ b/core_integrations/profiler/icon.txt
@@ -0,0 +1 @@
+mdi:bug
diff --git a/core_integrations/proximity/icon.png b/core_integrations/proximity/icon.png
deleted file mode 100644
index 8cfcb398..00000000
Binary files a/core_integrations/proximity/icon.png and /dev/null differ
diff --git a/core_integrations/proximity/icon.txt b/core_integrations/proximity/icon.txt
new file mode 100644
index 00000000..1a922f15
--- /dev/null
+++ b/core_integrations/proximity/icon.txt
@@ -0,0 +1 @@
+mdi:compass-outline
diff --git a/core_integrations/proximity/icon@2x.png b/core_integrations/proximity/icon@2x.png
deleted file mode 100644
index 645f73d0..00000000
Binary files a/core_integrations/proximity/icon@2x.png and /dev/null differ
diff --git a/core_integrations/python_script/icon.png b/core_integrations/python_script/icon.png
deleted file mode 100644
index 93851d54..00000000
Binary files a/core_integrations/python_script/icon.png and /dev/null differ
diff --git a/core_integrations/python_script/icon.txt b/core_integrations/python_script/icon.txt
new file mode 100644
index 00000000..dac600ff
--- /dev/null
+++ b/core_integrations/python_script/icon.txt
@@ -0,0 +1 @@
+mdi:language-python
diff --git a/core_integrations/python_script/icon@2x.png b/core_integrations/python_script/icon@2x.png
deleted file mode 100644
index 7ef3052b..00000000
Binary files a/core_integrations/python_script/icon@2x.png and /dev/null differ
diff --git a/core_integrations/qrcode/icon.png b/core_integrations/qrcode/icon.png
deleted file mode 100644
index 830e2ffe..00000000
Binary files a/core_integrations/qrcode/icon.png and /dev/null differ
diff --git a/core_integrations/qrcode/icon.txt b/core_integrations/qrcode/icon.txt
new file mode 100644
index 00000000..fb541eea
--- /dev/null
+++ b/core_integrations/qrcode/icon.txt
@@ -0,0 +1 @@
+mdi:qrcode
diff --git a/core_integrations/qrcode/icon@2x.png b/core_integrations/qrcode/icon@2x.png
deleted file mode 100644
index 8aeafade..00000000
Binary files a/core_integrations/qrcode/icon@2x.png and /dev/null differ
diff --git a/core_integrations/random/icon.png b/core_integrations/random/icon.png
deleted file mode 100644
index 7f56c0fd..00000000
Binary files a/core_integrations/random/icon.png and /dev/null differ
diff --git a/core_integrations/random/icon.txt b/core_integrations/random/icon.txt
new file mode 100644
index 00000000..7cf83eb8
--- /dev/null
+++ b/core_integrations/random/icon.txt
@@ -0,0 +1 @@
+mdi:dice-multiple
diff --git a/core_integrations/random/icon@2x.png b/core_integrations/random/icon@2x.png
deleted file mode 100644
index e097b598..00000000
Binary files a/core_integrations/random/icon@2x.png and /dev/null differ
diff --git a/core_integrations/safe_mode b/core_integrations/safe_mode
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/safe_mode
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/safe_mode/icon.txt b/core_integrations/safe_mode/icon.txt
new file mode 100644
index 00000000..a8fd0b62
--- /dev/null
+++ b/core_integrations/safe_mode/icon.txt
@@ -0,0 +1 @@
+mdi:hospital-box
diff --git a/core_integrations/scrape b/core_integrations/scrape
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/scrape
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/scrape/icon.txt b/core_integrations/scrape/icon.txt
new file mode 100644
index 00000000..673c7b26
--- /dev/null
+++ b/core_integrations/scrape/icon.txt
@@ -0,0 +1 @@
+mdi:search-web
diff --git a/core_integrations/serial/icon.png b/core_integrations/serial/icon.png
deleted file mode 100644
index d73fb440..00000000
Binary files a/core_integrations/serial/icon.png and /dev/null differ
diff --git a/core_integrations/serial/icon.txt b/core_integrations/serial/icon.txt
new file mode 100644
index 00000000..44dd2d69
--- /dev/null
+++ b/core_integrations/serial/icon.txt
@@ -0,0 +1 @@
+mdi:serial-port
diff --git a/core_integrations/serial/icon@2x.png b/core_integrations/serial/icon@2x.png
deleted file mode 100644
index 9c31cae6..00000000
Binary files a/core_integrations/serial/icon@2x.png and /dev/null differ
diff --git a/core_integrations/shell_command/icon.png b/core_integrations/shell_command/icon.png
deleted file mode 100644
index 1bbc9a3f..00000000
Binary files a/core_integrations/shell_command/icon.png and /dev/null differ
diff --git a/core_integrations/shell_command/icon.txt b/core_integrations/shell_command/icon.txt
new file mode 100644
index 00000000..c491ca24
--- /dev/null
+++ b/core_integrations/shell_command/icon.txt
@@ -0,0 +1 @@
+mdi:bash
diff --git a/core_integrations/shell_command/icon@2x.png b/core_integrations/shell_command/icon@2x.png
deleted file mode 100644
index ab4ff608..00000000
Binary files a/core_integrations/shell_command/icon@2x.png and /dev/null differ
diff --git a/core_integrations/shopping_list/icon.png b/core_integrations/shopping_list/icon.png
deleted file mode 100644
index 7dcd399e..00000000
Binary files a/core_integrations/shopping_list/icon.png and /dev/null differ
diff --git a/core_integrations/shopping_list/icon.txt b/core_integrations/shopping_list/icon.txt
new file mode 100644
index 00000000..f5d447e3
--- /dev/null
+++ b/core_integrations/shopping_list/icon.txt
@@ -0,0 +1 @@
+mdi:format-list-checks
diff --git a/core_integrations/shopping_list/icon@2x.png b/core_integrations/shopping_list/icon@2x.png
deleted file mode 100644
index a0ddde9e..00000000
Binary files a/core_integrations/shopping_list/icon@2x.png and /dev/null differ
diff --git a/core_integrations/smtp/icon.png b/core_integrations/smtp/icon.png
deleted file mode 100644
index 75a4c3f9..00000000
Binary files a/core_integrations/smtp/icon.png and /dev/null differ
diff --git a/core_integrations/smtp/icon.txt b/core_integrations/smtp/icon.txt
new file mode 100644
index 00000000..53e3714a
--- /dev/null
+++ b/core_integrations/smtp/icon.txt
@@ -0,0 +1 @@
+mdi:at
diff --git a/core_integrations/smtp/icon@2x.png b/core_integrations/smtp/icon@2x.png
deleted file mode 100644
index ec513dc6..00000000
Binary files a/core_integrations/smtp/icon@2x.png and /dev/null differ
diff --git a/core_integrations/statistics b/core_integrations/statistics
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/statistics
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/statistics/icon.txt b/core_integrations/statistics/icon.txt
new file mode 100644
index 00000000..bbeff7d5
--- /dev/null
+++ b/core_integrations/statistics/icon.txt
@@ -0,0 +1 @@
+mdi:calculator
diff --git a/core_integrations/systemmonitor b/core_integrations/systemmonitor
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/systemmonitor
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/systemmonitor/icon.txt b/core_integrations/systemmonitor/icon.txt
new file mode 100644
index 00000000..dad6fed2
--- /dev/null
+++ b/core_integrations/systemmonitor/icon.txt
@@ -0,0 +1 @@
+mdi:speedometer
diff --git a/core_integrations/time_date b/core_integrations/time_date
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/time_date
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/time_date/icon.txt b/core_integrations/time_date/icon.txt
new file mode 100644
index 00000000..f05840d2
--- /dev/null
+++ b/core_integrations/time_date/icon.txt
@@ -0,0 +1 @@
+mdi:calendar-clock
diff --git a/core_integrations/trend b/core_integrations/trend
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/trend
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/trend/icon.txt b/core_integrations/trend/icon.txt
new file mode 100644
index 00000000..4bb58ad5
--- /dev/null
+++ b/core_integrations/trend/icon.txt
@@ -0,0 +1 @@
+mdi:trending-up
diff --git a/core_integrations/universal b/core_integrations/universal
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/universal
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/universal/icon.txt b/core_integrations/universal/icon.txt
new file mode 100644
index 00000000..347e2c1e
--- /dev/null
+++ b/core_integrations/universal/icon.txt
@@ -0,0 +1 @@
+mdi:audio-video
diff --git a/core_integrations/water_heater b/core_integrations/water_heater
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/water_heater
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/water_heater/icon.txt b/core_integrations/water_heater/icon.txt
new file mode 100644
index 00000000..51030f2b
--- /dev/null
+++ b/core_integrations/water_heater/icon.txt
@@ -0,0 +1 @@
+mdi:water-boiler
diff --git a/core_integrations/workday b/core_integrations/workday
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/workday
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/workday/icon.txt b/core_integrations/workday/icon.txt
new file mode 100644
index 00000000..614f931f
--- /dev/null
+++ b/core_integrations/workday/icon.txt
@@ -0,0 +1 @@
+mdi:briefcase
diff --git a/core_integrations/worldclock b/core_integrations/worldclock
deleted file mode 120000
index 11224b9f..00000000
--- a/core_integrations/worldclock
+++ /dev/null
@@ -1 +0,0 @@
-_homeassistant
\ No newline at end of file
diff --git a/core_integrations/worldclock/icon.txt b/core_integrations/worldclock/icon.txt
new file mode 100644
index 00000000..2744d44f
--- /dev/null
+++ b/core_integrations/worldclock/icon.txt
@@ -0,0 +1 @@
+mdi:map-clock