diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI
index d9440c6..0de07ab 100644
Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ
diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft
index 4859e00..c8dd6b4 100644
Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ
diff --git a/advanced/hmi/nspanel_CJK_eu_code/boot.txt b/advanced/hmi/nspanel_CJK_eu_code/boot.txt
index 67902b2..8355425 100644
--- a/advanced/hmi/nspanel_CJK_eu_code/boot.txt
+++ b/advanced/hmi/nspanel_CJK_eu_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.2.4
+        Text               : 4.2.5dev
         Max. Text Size     : 9
     
 Text esph_version
diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI
index 21a9b57..a728a5b 100644
Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ
diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft
index 03fddf4..dde9911 100644
Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ
diff --git a/advanced/hmi/nspanel_CJK_us_code/boot.txt b/advanced/hmi/nspanel_CJK_us_code/boot.txt
index 34e18cf..29627bb 100644
--- a/advanced/hmi/nspanel_CJK_us_code/boot.txt
+++ b/advanced/hmi/nspanel_CJK_us_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.2.4
+        Text               : 4.2.5dev
         Max. Text Size     : 9
     
     Events
diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI
index d8a0891..3a807a1 100644
Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ
diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft
index 1d17078..9958928 100644
Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ
diff --git a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt
index 67902b2..8355425 100644
--- a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt
+++ b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.2.4
+        Text               : 4.2.5dev
         Max. Text Size     : 9
     
 Text esph_version
diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI
index 50a925d..5cd81b2 100644
Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ
diff --git a/advanced/hmi/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt
index 67902b2..8355425 100644
--- a/advanced/hmi/nspanel_eu_code/boot.txt
+++ b/advanced/hmi/nspanel_eu_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.2.4
+        Text               : 4.2.5dev
         Max. Text Size     : 9
     
 Text esph_version
diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI
index 2735cca..53741d6 100644
Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ
diff --git a/advanced/hmi/nspanel_us_code/boot.txt b/advanced/hmi/nspanel_us_code/boot.txt
index 34e18cf..29627bb 100644
--- a/advanced/hmi/nspanel_us_code/boot.txt
+++ b/advanced/hmi/nspanel_us_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.2.4
+        Text               : 4.2.5dev
         Max. Text Size     : 9
     
     Events
diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI
index 72aad06..cd2722a 100644
Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ
diff --git a/advanced/hmi/nspanel_us_land_code/boot.txt b/advanced/hmi/nspanel_us_land_code/boot.txt
index 67902b2..8355425 100644
--- a/advanced/hmi/nspanel_us_land_code/boot.txt
+++ b/advanced/hmi/nspanel_us_land_code/boot.txt
@@ -102,7 +102,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : on press and release
         Associated Keyboard: none
-        Text               : 4.2.4
+        Text               : 4.2.5dev
         Max. Text Size     : 9
     
 Text esph_version
diff --git a/dev/ui/eu/pics/19.png b/dev/ui/eu/pics/19.png
index 68b3274..03fb75f 100644
Binary files a/dev/ui/eu/pics/19.png and b/dev/ui/eu/pics/19.png differ
diff --git a/dev/ui/eu/pics/20.png b/dev/ui/eu/pics/20.png
index 7767d0f..e9eb44c 100644
Binary files a/dev/ui/eu/pics/20.png and b/dev/ui/eu/pics/20.png differ
diff --git a/dev/ui/eu/pics/28.png b/dev/ui/eu/pics/28.png
index de2187c..b327162 100644
Binary files a/dev/ui/eu/pics/28.png and b/dev/ui/eu/pics/28.png differ
diff --git a/dev/ui/eu/pics/29.png b/dev/ui/eu/pics/29.png
index b4b9418..5e3ec77 100644
Binary files a/dev/ui/eu/pics/29.png and b/dev/ui/eu/pics/29.png differ
diff --git a/dev/ui/eu/pics/NSPanel - EU.pptx b/dev/ui/eu/pics/NSPanel - EU.pptx
index 8663357..e89ea4d 100644
Binary files a/dev/ui/eu/pics/NSPanel - EU.pptx and b/dev/ui/eu/pics/NSPanel - EU.pptx differ
diff --git a/dev/ui/us/pics/NSPanel - US.pptx b/dev/ui/us/pics/NSPanel - US.pptx
index a4d1fee..baa032a 100644
Binary files a/dev/ui/us/pics/NSPanel - US.pptx and b/dev/ui/us/pics/NSPanel - US.pptx differ
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index ea701b8..0a98b6f 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -6660,7 +6660,7 @@ variables:
       FAN_ONLY: 64
     states:
       "on": ["on", "open", "opening", "true", "True", true, True, "playing", "heat", "cold", "dry", "armed_home", "armed_away", "armed_vacation", "armed_custom_bypass", "triggered", "pending", "arming", 1]
-      "off": ["off", "closed", "closing", "false", "False", false, False, "standby", "paused", "idle", "disarmed", "disarming", 0]
+      "off": ["off", "closed", "closing", "false", "False", false, False, "standby", "paused", "idle", "disarmed", "disarming"]
       unknown: ["unknown", "unavailable", None, none, ""]
       climate:
         "on": ["heat_cool", "heat", "heating", "cold", "cooling", "dry", "drying", "fan", "fan_only", "auto"]
@@ -8848,6 +8848,45 @@ action:
                                   if nspanel_event is defined and nspanel_event.entity is defined
                                   else (trigger.entity_id if trigger.entity_id is defined else trigger.event.data.entity_id)
                                 }}
+                              entity_device_class: '{{ state_attr(cover_entity, "device_class") | default("") }}'
+                              cover_icons:
+                                open: >
+                                  {{
+                                    all_icons[device_class_icons.cover[entity_device_class + "-open"]]
+                                    if
+                                      entity_device_class is defined and
+                                      entity_device_class is string and
+                                      entity_device_class | length > 0 and
+                                      (entity_device_class+"-open") in device_class_icons.cover and
+                                      device_class_icons.cover[entity_device_class+"-open"] in all_icons
+                                    else all_icons[device_class_icons.cover["shutter-open"]]
+                                  }}
+                                close: >
+                                  {{
+                                    all_icons[device_class_icons.cover[entity_device_class + "-close"]]
+                                    if
+                                      entity_device_class is defined and
+                                      entity_device_class is string and
+                                      entity_device_class | length > 0 and
+                                      (entity_device_class+"-close") in device_class_icons.cover and
+                                      device_class_icons.cover[entity_device_class+"-close"] in all_icons
+                                    else all_icons[device_class_icons.cover["shutter-close"]]
+                                  }}
+
+                          ##### Cover Open/close Icons #####
+                          - service: '{{ nextion.command.text_printf }}'
+                            data:
+                              component: cover.cover_open
+                              val: '{{ cover_icons.open }}'
+                            continue_on_error: true
+                          - *delay-default
+                          - service: '{{ nextion.command.text_printf }}'
+                            data:
+                              component: cover.cover_close
+                              val: '{{ cover_icons.close }}'
+                            continue_on_error: true
+                          - *delay-default
+
                           ##### COVER State
                           - service: '{{ nextion.command.value }}'
                             data:
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index 36f6273..7df2a18 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
index 1f20d8b..cbbeb1f 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ
diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft
index 8a0ed2a..4fb687e 100644
Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ