diff --git a/HMI/US/portrait/diff-eu-version-known-good.txt b/HMI/US/portrait/diff-eu-version-known-good.txt
index 1fad445b..4f080140 100644
--- a/HMI/US/portrait/diff-eu-version-known-good.txt
+++ b/HMI/US/portrait/diff-eu-version-known-good.txt
@@ -384,33 +384,19 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +                                                tsw bDown5,1
 +                                            }
 +                                        }
-+                                        if(type5.txt=="light")
++                                        if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan")
 +                                        {
-+                                            vis bUp5,0
-+                                            vis bStop5,0
-+                                            vis bDown5,0
-+                                            vis btOnOff5,1
-+                                            vis bText5,0
-+                                            vis hSlider5,0
-+                                            vis nNum5,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,"~",32
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff5.val=sys0
-+                                        }
-+                                        if(type5.txt=="switch")
-+                                        {
-+                                            vis bUp5,0
-+                                            vis bStop5,0
-+                                            vis bDown5,0
-+                                            vis btOnOff5,1
-+                                            vis bText5,0
-+                                            vis hSlider5,0
-+                                            vis nNum5,0
-+                                            // get Button State (optional Value)
-+                                            spstr strCommand.txt,tTmp.txt,"~",32
-+                                            covx tTmp.txt,sys0,0,0
-+                                            btOnOff5.val=sys0
++                                          vis bUp5,0
++                                          vis bStop5,0
++                                          vis bDown5,0
++                                          vis btOnOff5,1
++                                          vis bText5,0
++                                          vis hSlider5,0
++                                          vis nNum5,0
++                                          // get Button State (optional Value)
++                                          spstr strCommand.txt,tTmp.txt,"~",32
++                                          covx tTmp.txt,sys0,0,0
++                                          btOnOff5.val=sys0
 +                                        }
 +                                        if(type5.txt=="text")
 +                                        {
diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI
index 40906a45..c9fbe7db 100644
Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ
diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft
index 525a8a70..7007d894 100644
Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ