diff --git a/homeassistant/components/guardian/icons.json b/homeassistant/components/guardian/icons.json
new file mode 100644
index 00000000000..4740366e993
--- /dev/null
+++ b/homeassistant/components/guardian/icons.json
@@ -0,0 +1,25 @@
+{
+  "entity": {
+    "sensor": {
+      "uptime": {
+        "default": "mdi:timer"
+      },
+      "travel_count": {
+        "default": "mdi:counter"
+      }
+    },
+    "switch": {
+      "onboard_access_point": {
+        "default": "mdi:wifi"
+      },
+      "valve_controller": {
+        "default": "mdi:water"
+      }
+    }
+  },
+  "services": {
+    "pair_sensor": "mdi:link-variant",
+    "unpair_sensor": "mdi:link-variant-remove",
+    "upgrade_firmware": "mdi:update"
+  }
+}
diff --git a/homeassistant/components/guardian/sensor.py b/homeassistant/components/guardian/sensor.py
index 64c70b07b83..1941dc54248 100644
--- a/homeassistant/components/guardian/sensor.py
+++ b/homeassistant/components/guardian/sensor.py
@@ -119,7 +119,6 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSensorDescription(
         key=SENSOR_KIND_UPTIME,
         translation_key="uptime",
-        icon="mdi:timer",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfTime.MINUTES,
         api_category=API_SYSTEM_DIAGNOSTICS,
@@ -128,7 +127,6 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSensorDescription(
         key=SENSOR_KIND_TRAVEL_COUNT,
         translation_key="travel_count",
-        icon="mdi:counter",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement="revolutions",
         api_category=API_VALVE_STATUS,
diff --git a/homeassistant/components/guardian/switch.py b/homeassistant/components/guardian/switch.py
index 7db0fde8905..ebe8e5549ce 100644
--- a/homeassistant/components/guardian/switch.py
+++ b/homeassistant/components/guardian/switch.py
@@ -80,7 +80,6 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSwitchDescription(
         key=SWITCH_KIND_ONBOARD_AP,
         translation_key="onboard_access_point",
-        icon="mdi:wifi",
         entity_category=EntityCategory.CONFIG,
         extra_state_attributes_fn=lambda data: {
             ATTR_CONNECTED_CLIENTS: data.get("ap_clients"),
@@ -94,7 +93,6 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSwitchDescription(
         key=SWITCH_KIND_VALVE,
         translation_key="valve_controller",
-        icon="mdi:water",
         api_category=API_VALVE_STATUS,
         extra_state_attributes_fn=lambda data: {
             ATTR_AVG_CURRENT: data["average_current"],