diff --git a/custom_components/hon/binary_sensor.py b/custom_components/hon/binary_sensor.py
index dcbf52d..5efd147 100644
--- a/custom_components/hon/binary_sensor.py
+++ b/custom_components/hon/binary_sensor.py
@@ -27,15 +27,22 @@ BINARY_SENSORS: dict[str, tuple[HonBinarySensorEntityDescription, ...]] = {
     "WM": (
         HonBinarySensorEntityDescription(
             key="attributes.lastConnEvent.category",
-            name="Connection",
+            name="Remote Control",
             device_class=BinarySensorDeviceClass.CONNECTIVITY,
             on_value="CONNECTED",
+            icon="mdi:remote"
         ),
         HonBinarySensorEntityDescription(
             key="doorLockStatus",
+            name="Door Lock",
+            device_class=BinarySensorDeviceClass.LOCK,
+            on_value="0",
+        ),
+        HonBinarySensorEntityDescription(
+            key="doorStatus",
             name="Door",
             device_class=BinarySensorDeviceClass.DOOR,
-            on_value="0",
+            on_value="1",
         ),
     ),
     "TD": (
diff --git a/custom_components/hon/sensor.py b/custom_components/hon/sensor.py
index fed894b..f948d09 100644
--- a/custom_components/hon/sensor.py
+++ b/custom_components/hon/sensor.py
@@ -85,7 +85,7 @@ SENSORS: dict[str, tuple[SensorEntityDescription, ...]] = {
         SensorEntityDescription(
             key="spinSpeed",
             name="Spin Speed",
-            icon="mdi:timer",
+            icon="mdi:speedometer",
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfTime.MINUTES,
         ),