diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt
index b66f4585..5b61c83e 100644
--- a/HMI/n2t-out/nspanel_Stats.txt
+++ b/HMI/n2t-out/nspanel_Stats.txt
@@ -26,10 +26,6 @@ popupShutter
 	19   Component(s)
 	148  Line(s) of event code
 	84   Unique line(s) of event code
-popupLight
-	27   Component(s)
-	290  Line(s) of event code
-	149  Unique line(s) of event code
 pageSwipeTest
 	18   Component(s)
 	62   Line(s) of event code
@@ -46,6 +42,10 @@ pageStartup
 	19   Component(s)
 	140  Line(s) of event code
 	107  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	297  Line(s) of event code
+	154  Unique line(s) of event code
 cardAlarm
 	28   Component(s)
 	159  Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
 Total
 	13   Page(s)
 	302  Component(s)
-	2664 Line(s) of event code
-	689  Unique line(s) of event code
+	2671 Line(s) of event code
+	693  Unique line(s) of event code
diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt
index 4b8885b3..5574ee30 100644
--- a/HMI/n2t-out/popupLight.txt
+++ b/HMI/n2t-out/popupLight.txt
@@ -849,12 +849,21 @@ Timer tmSerial
                                     spstr strCommand.txt,tInstruction.txt,",",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
-                                        // get Button State
+                                        // change icon
                                         spstr strCommand.txt,tTmp.txt,",",1
                                         covx tTmp.txt,sys0,0,0
+                                        substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
+                                        vis tIcon1,1
+                                        // change icon color
+                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        covx tTmp.txt,sys0,0,0
+                                        tIcon1.pco=sys0
+                                        // get Button State
+                                        spstr strCommand.txt,tTmp.txt,",",3
+                                        covx tTmp.txt,sys0,0,0
                                         btOnOff1.val=sys0
                                         // get Brightness value
-                                        spstr strCommand.txt,tTmp.txt,",",2
+                                        spstr strCommand.txt,tTmp.txt,",",4
                                         if(tTmp.txt=="disable")
                                         {
                                             vis t1,0
@@ -873,7 +882,7 @@ Timer tmSerial
                                         if(mode.val==1)
                                         {
                                             // get ColorTemp value
-                                            spstr strCommand.txt,tTmp.txt,",",3
+                                            spstr strCommand.txt,tTmp.txt,",",5
                                             if(tTmp.txt=="unknown")
                                             {
                                                 click bColor,1
@@ -895,7 +904,7 @@ Timer tmSerial
                                             }
                                         }
                                         // get ColorWheel value
-                                        spstr strCommand.txt,tTmp.txt,",",4
+                                        spstr strCommand.txt,tTmp.txt,",",6
                                         if(tTmp.txt!="disable")
                                         {
                                             vis bColor,1