diff --git a/homeassistant/components/elgato/icons.json b/homeassistant/components/elgato/icons.json
new file mode 100644
index 00000000000..1b5eaf3763a
--- /dev/null
+++ b/homeassistant/components/elgato/icons.json
@@ -0,0 +1,15 @@
+{
+  "entity": {
+    "switch": {
+      "bypass": {
+        "default": "mdi:battery-off-outline"
+      },
+      "energy_saving": {
+        "default": "mdi:leaf"
+      }
+    }
+  },
+  "services": {
+    "identify": "mdi:crosshairs-question"
+  }
+}
diff --git a/homeassistant/components/elgato/switch.py b/homeassistant/components/elgato/switch.py
index d1f370547a4..1396d74e0ce 100644
--- a/homeassistant/components/elgato/switch.py
+++ b/homeassistant/components/elgato/switch.py
@@ -32,7 +32,6 @@ SWITCHES = [
     ElgatoSwitchEntityDescription(
         key="bypass",
         translation_key="bypass",
-        icon="mdi:battery-off-outline",
         entity_category=EntityCategory.CONFIG,
         has_fn=lambda x: x.battery is not None,
         is_on_fn=lambda x: x.settings.battery.bypass if x.settings.battery else None,
@@ -41,7 +40,6 @@ SWITCHES = [
     ElgatoSwitchEntityDescription(
         key="energy_saving",
         translation_key="energy_saving",
-        icon="mdi:leaf",
         entity_category=EntityCategory.CONFIG,
         has_fn=lambda x: x.battery is not None,
         is_on_fn=lambda x: (
diff --git a/tests/components/elgato/snapshots/test_switch.ambr b/tests/components/elgato/snapshots/test_switch.ambr
index 962563599f6..3b31b7bca14 100644
--- a/tests/components/elgato/snapshots/test_switch.ambr
+++ b/tests/components/elgato/snapshots/test_switch.ambr
@@ -3,7 +3,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'friendly_name': 'Frenck Energy saving',
-      'icon': 'mdi:leaf',
     }),
     'context': <ANY>,
     'entity_id': 'switch.frenck_energy_saving',
@@ -35,7 +34,7 @@
     'options': dict({
     }),
     'original_device_class': None,
-    'original_icon': 'mdi:leaf',
+    'original_icon': None,
     'original_name': 'Energy saving',
     'platform': 'elgato',
     'previous_unique_id': None,
@@ -83,7 +82,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'friendly_name': 'Frenck Studio mode',
-      'icon': 'mdi:battery-off-outline',
     }),
     'context': <ANY>,
     'entity_id': 'switch.frenck_studio_mode',
@@ -115,7 +113,7 @@
     'options': dict({
     }),
     'original_device_class': None,
-    'original_icon': 'mdi:battery-off-outline',
+    'original_icon': None,
     'original_name': 'Studio mode',
     'platform': 'elgato',
     'previous_unique_id': None,