diff --git a/pilot-v2/config.yaml b/pilot-v2/config.yaml
index c01dfa9..64b39cd 100644
--- a/pilot-v2/config.yaml
+++ b/pilot-v2/config.yaml
@@ -46,17 +46,17 @@ features:
         unique_id: "$hostname_pilot_v2_cpu_usage"
         unit: "%"
         device_class: ""
-        icon: "mdi:application"
+        icon: "mdi:apps"
         state_class: "measurement"
       pilot_v2_mem_used_mb:
         enabled: true
         discovery_enabled: true
         interval_s: 10
         name: "Pilot V2 Memory Used"
-        unique_id: "$hostname_pilot_v2_mem_used"
+        unique_id: "$hostname_pilot_v2_mem_used_mb"
         unit: "MB"
         device_class: ""
-        icon: "mdi:application"
+        icon: "mdi:memory"
         state_class: "measurement"
       cpu_temp_c:
         enabled: true
@@ -86,7 +86,7 @@ features:
         unique_id: "$hostname_gpu_usage"
         unit: "%"
         device_class: ""
-        icon: "mdi:gpu"
+        icon: "mdi:expansion-card"
         state_class: "measurement"
       gpu0_usage:
         enabled: true
@@ -96,7 +96,7 @@ features:
         unique_id: "$hostname_gpu0_usage"
         unit: "%"
         device_class: ""
-        icon: "mdi:gpu"
+        icon: "mdi:expansion-card"
         state_class: "measurement"
       gpu1_usage:
         enabled: true
@@ -106,7 +106,7 @@ features:
         unique_id: "$hostname_gpu1_usage"
         unit: "%"
         device_class: ""
-        icon: "mdi:gpu"
+        icon: "mdi:expansion-card"
         state_class: "measurement"
       gpu0_temp_c:
         enabled: true
@@ -156,7 +156,7 @@ features:
         unique_id: "$hostname_amd_gpu_usage"
         unit: "%"
         device_class: ""
-        icon: "mdi:gpu"
+        icon: "mdi:expansion-card"
         state_class: "measurement"
       amd_gpu_temp_c:
         enabled: true
@@ -236,7 +236,7 @@ features:
         unique_id: "$hostname_ip"
         unit: ""
         device_class: ""
-        icon: "mdi:ip"
+        icon: "mdi:ip-network"
         state_class: ""
       battery_level:
         enabled: true
@@ -286,7 +286,7 @@ features:
         unique_id: "$hostname_os_version"
         unit: ""
         device_class: ""
-        icon: "mdi:desktop-classic"
+        icon: "mdi:monitor"
         state_class: ""
   commands:
     enabled: true