diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index db3c4b13..263e17f1 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-09-17 17:53:21.343850547 +0000
+--- HMI/n2t-out/Program.s.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/landscape/n2t-out/Program.s.txt	2022-09-17 19:57:24.536216256 +0000
 @@ -14,6 +14,3 @@
      //color vars
      int defaultFontColor=65535
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
 -    lcd_dev fffb 0002 0000 0020
 -    page pageStartup
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/landscape/n2t-out/cardEntities.txt	2022-09-17 17:53:21.347850562 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/landscape/n2t-out/cardEntities.txt	2022-09-17 19:57:24.536216256 +0000
 @@ -786,7 +786,7 @@
          Send Component ID                   : disabled
          State                               : unpressed
@@ -49,8 +49,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
          Touch Press Event
 Only in HMI/n2t-out: cardPower.txt
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-09-17 17:53:21.347850562 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-09-17 19:57:24.536216256 +0000
 @@ -177,7 +177,7 @@
              recmod=1
              bauds=115200
@@ -61,8 +61,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
              btlen tSend.txt,sys0
              crcrest 1,0xffff // reset CRC
 diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
---- HMI/n2t-out/pageTest.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/landscape/n2t-out/pageTest.txt	2022-09-17 17:53:21.347850562 +0000
+--- HMI/n2t-out/pageTest.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/landscape/n2t-out/pageTest.txt	2022-09-17 19:57:24.536216256 +0000
 @@ -13,36 +13,6 @@
      Events
          Preinitialize Event
diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
index 42538623..f633ff32 100644
--- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
@@ -1912,6 +1912,7 @@ Hotspot m2
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=tIcon3.txt
             if(type3.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity3.txt
@@ -1947,6 +1948,7 @@ Hotspot m1
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=tIcon2.txt
             if(type2.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity2.txt
@@ -1982,6 +1984,7 @@ Hotspot m0
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=tIcon1.txt
             if(type1.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity1.txt
@@ -2017,6 +2020,7 @@ Hotspot m3
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=tIcon4.txt
             if(type4.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity4.txt
diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
index cdfec361..3665beea 100644
--- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
@@ -608,6 +608,7 @@ Button bEntity1
             tTmp.txt=type1.txt
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=bEntity1.txt
             if(type1.txt=="shutter")
             {
                 page popupShutter
@@ -666,6 +667,7 @@ Button bEntity2
             tTmp.txt=type2.txt
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=bEntity2.txt
             if(type2.txt=="shutter")
             {
                 page popupShutter
@@ -724,6 +726,7 @@ Button bEntity3
             tTmp.txt=type3.txt
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=bEntity3.txt
             if(type3.txt=="shutter")
             {
                 page popupShutter
@@ -782,6 +785,7 @@ Button bEntity4
             tTmp.txt=type4.txt
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=bEntity4.txt
             if(type4.txt=="shutter")
             {
                 page popupShutter
@@ -840,6 +844,7 @@ Button bEntity5
             tTmp.txt=type5.txt
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=bEntity5.txt
             if(type5.txt=="shutter")
             {
                 page popupShutter
@@ -898,6 +903,7 @@ Button bEntity6
             tTmp.txt=type6.txt
             pageIcons.tTmp1.txt=tEntity6.txt
             pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp3.txt=bEntity6.txt
             if(type6.txt=="shutter")
             {
                 page popupShutter
diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
index 3e89be76..9629ffb3 100644
--- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
+++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
@@ -3,7 +3,7 @@ Program.s
 	11   Line(s) of event code
 	11   Unique line(s) of event code
 pageIcons
-	6    Component(s)
+	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 popupNotify
@@ -14,10 +14,6 @@ pageStartup
 	19   Component(s)
 	167  Line(s) of event code
 	122  Unique line(s) of event code
-popupShutter
-	25   Component(s)
-	388  Line(s) of event code
-	211  Unique line(s) of event code
 cardMedia
 	34   Component(s)
 	389  Line(s) of event code
@@ -30,14 +26,18 @@ cardQR
 	32   Component(s)
 	404  Line(s) of event code
 	235  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	386  Line(s) of event code
-	211  Unique line(s) of event code
+popupShutter
+	25   Component(s)
+	389  Line(s) of event code
+	212  Unique line(s) of event code
 pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
+cardGrid
+	42   Component(s)
+	469  Line(s) of event code
+	278  Unique line(s) of event code
 screensaver
 	38   Component(s)
 	341  Line(s) of event code
@@ -46,21 +46,21 @@ cardThermo
 	52   Component(s)
 	580  Line(s) of event code
 	303  Unique line(s) of event code
-cardGrid
-	42   Component(s)
-	463  Line(s) of event code
-	272  Unique line(s) of event code
-cardEntities
-	65   Component(s)
-	1128 Line(s) of event code
-	515  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	387  Line(s) of event code
+	212  Unique line(s) of event code
 cardAlarm
 	40   Component(s)
 	422  Line(s) of event code
 	255  Unique line(s) of event code
+cardEntities
+	65   Component(s)
+	1132 Line(s) of event code
+	519  Unique line(s) of event code
 
 Total
 	14   Page(s)
-	438  Component(s)
-	5261 Line(s) of event code
-	1405 Unique line(s) of event code
+	439  Component(s)
+	5273 Line(s) of event code
+	1416 Unique line(s) of event code
diff --git a/HMI/US/landscape/n2t-out-visual/pageIcons.txt b/HMI/US/landscape/n2t-out-visual/pageIcons.txt
index 4753b885..9c8aed93 100644
--- a/HMI/US/landscape/n2t-out-visual/pageIcons.txt
+++ b/HMI/US/landscape/n2t-out-visual/pageIcons.txt
@@ -92,6 +92,36 @@ Text tTmp2
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tTmp3
+    Attributes
+        ID                                  : 6
+        Scope                               : global
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 302
+        y coordinate                        : 152
+        Width                               : 146
+        Height                              : 69
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 1
+        Back. Color                         : 65535
+        Font Color                          : 0
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt
index 87855eae..5e15a479 100644
--- a/HMI/US/landscape/n2t-out-visual/popupLight.txt
+++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt
@@ -25,6 +25,7 @@ Page popupLight
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tTmp,0
diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt
index c18cfac4..3a06d14f 100644
--- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt
+++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt
@@ -25,6 +25,7 @@ Page popupShutter
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tPosHeading,0
diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt
index 2309a1b7..c6e48de5 100644
--- a/HMI/US/landscape/n2t-out/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out/cardEntities.txt
@@ -1014,6 +1014,7 @@ Hotspot m2
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=tIcon3.txt
             if(type3.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity3.txt
@@ -1040,6 +1041,7 @@ Hotspot m1
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=tIcon2.txt
             if(type2.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity2.txt
@@ -1066,6 +1068,7 @@ Hotspot m0
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=tIcon1.txt
             if(type1.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity1.txt
@@ -1092,6 +1095,7 @@ Hotspot m3
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=tIcon4.txt
             if(type4.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity4.txt
diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt
index 521664fb..6e87d7b0 100644
--- a/HMI/US/landscape/n2t-out/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out/cardGrid.txt
@@ -310,6 +310,7 @@ Button bEntity1
             tTmp.txt=type1.txt
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=bEntity1.txt
             if(type1.txt=="shutter")
             {
                 page popupShutter
@@ -346,6 +347,7 @@ Button bEntity2
             tTmp.txt=type2.txt
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=bEntity2.txt
             if(type2.txt=="shutter")
             {
                 page popupShutter
@@ -382,6 +384,7 @@ Button bEntity3
             tTmp.txt=type3.txt
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=bEntity3.txt
             if(type3.txt=="shutter")
             {
                 page popupShutter
@@ -418,6 +421,7 @@ Button bEntity4
             tTmp.txt=type4.txt
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=bEntity4.txt
             if(type4.txt=="shutter")
             {
                 page popupShutter
@@ -454,6 +458,7 @@ Button bEntity5
             tTmp.txt=type5.txt
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=bEntity5.txt
             if(type5.txt=="shutter")
             {
                 page popupShutter
@@ -490,6 +495,7 @@ Button bEntity6
             tTmp.txt=type6.txt
             pageIcons.tTmp1.txt=tEntity6.txt
             pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp3.txt=bEntity6.txt
             if(type6.txt=="shutter")
             {
                 page popupShutter
diff --git a/HMI/US/landscape/n2t-out/pageIcons.txt b/HMI/US/landscape/n2t-out/pageIcons.txt
index cc5100ac..5228463c 100644
--- a/HMI/US/landscape/n2t-out/pageIcons.txt
+++ b/HMI/US/landscape/n2t-out/pageIcons.txt
@@ -42,6 +42,16 @@ Text tTmp2
         Text                                : 
         Max. Text Size                      : 80
     
+Text tTmp3
+    Attributes
+        Scope                               : global
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
 Picture p0
     Attributes
         Scope                               : local
diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt
index 718398aa..c91f7ac8 100644
--- a/HMI/US/landscape/n2t-out/popupLight.txt
+++ b/HMI/US/landscape/n2t-out/popupLight.txt
@@ -17,6 +17,7 @@ Page popupLight
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tTmp,0
diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt
index b11f46c0..b6179e35 100644
--- a/HMI/US/landscape/n2t-out/popupShutter.txt
+++ b/HMI/US/landscape/n2t-out/popupShutter.txt
@@ -17,6 +17,7 @@ Page popupShutter
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tPosHeading,0
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index b5b47b47..eeb44909 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-09-17 17:53:20.875848746 +0000
+--- HMI/n2t-out/Program.s.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-09-17 19:57:24.072211415 +0000
 @@ -14,6 +14,6 @@
      //color vars
      int defaultFontColor=65535
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-09-17 17:53:20.875848746 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-09-17 19:57:24.072211415 +0000
 @@ -65,6 +65,16 @@
              vis nNum4,0
              vis bPrev,0
@@ -268,7 +268,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Hotspot mSpecial
      Attributes
          Scope                               : local
-@@ -1107,6 +1313,32 @@
+@@ -1111,6 +1317,33 @@
                  page popupFan
              }
          
@@ -283,6 +283,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
 +        Touch Press Event
 +            pageIcons.tTmp1.txt=tEntity5.txt
 +            pageIcons.tTmp2.txt=entn5.txt
++            pageIcons.tTmp3.txt=tIcon5.txt
 +            if(type5.txt=="shutter")
 +            {
 +                //popupShutter.tHeading.txt=tEntity5.txt
@@ -301,7 +302,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
  Hotspot mSwipeNext
      Attributes
          Scope                               : local
-@@ -1826,6 +2058,155 @@
+@@ -1830,6 +2063,155 @@
                                              covx tTmp.txt,sys0,0,0
                                              hSlider4.maxval=sys0
                                          }
@@ -459,8 +460,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
                                      {
 Only in HMI/n2t-out: cardPower.txt
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-09-17 17:53:20.875848746 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-09-17 19:57:24.072211415 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled
@@ -480,8 +481,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
              btlen tSend.txt,sys0
              crcrest 1,0xffff // reset CRC
 diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
---- HMI/n2t-out/pageTest.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/portrait/n2t-out/pageTest.txt	2022-09-17 17:53:20.875848746 +0000
+--- HMI/n2t-out/pageTest.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt	2022-09-17 19:57:24.072211415 +0000
 @@ -13,36 +13,6 @@
      Events
          Preinitialize Event
@@ -617,8 +618,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
 -            }
 -        
 diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
---- HMI/n2t-out/popupFan.txt	2022-09-17 17:53:20.407846944 +0000
-+++ HMI/US/portrait/n2t-out/popupFan.txt	2022-09-17 17:53:20.875848746 +0000
+--- HMI/n2t-out/popupFan.txt	2022-09-17 19:57:23.628206782 +0000
++++ HMI/US/portrait/n2t-out/popupFan.txt	2022-09-17 19:57:24.072211415 +0000
 @@ -81,23 +81,23 @@
          Scope: local
          Value: 0
diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
index 082f3f1a..68dbc789 100644
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,12 +1,12 @@
-+++ HMI/US/portrait/diff-eu-version.txt	2022-09-17 17:53:20.887848792 +0000
-+--- HMI/n2t-out/Program.s.txt	2022-09-17 17:53:20.407846944 +0000
-++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-09-17 17:53:20.875848746 +0000
++++ HMI/US/portrait/diff-eu-version.txt	2022-09-17 19:57:24.084211540 +0000
++--- HMI/n2t-out/Program.s.txt	2022-09-17 19:57:23.628206782 +0000
+++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-09-17 19:57:24.072211415 +0000
 +@@ -14,6 +14,6 @@
 +     //color vars
 +     int defaultFontColor=65535
 +     int defaultBcoColor=6371
-+--- HMI/n2t-out/cardEntities.txt	2022-09-17 17:53:20.407846944 +0000
-++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-09-17 17:53:20.875848746 +0000
++--- HMI/n2t-out/cardEntities.txt	2022-09-17 19:57:23.628206782 +0000
+++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-09-17 19:57:24.072211415 +0000
 +@@ -65,6 +65,16 @@
 +             vis bPrev,0
 +             vis bNext,0
@@ -22,9 +22,10 @@
 +@@ -878,6 +957,106 @@
 ++        Max. Text Size                      : 45
 +@@ -986,6 +1165,33 @@
-+@@ -1107,6 +1313,32 @@
++@@ -1111,6 +1317,33 @@
 +                 page popupFan
-+@@ -1826,6 +2058,155 @@
+++            pageIcons.tTmp3.txt=tIcon5.txt
++@@ -1830,6 +2063,155 @@
 ++                                            vis bUp5,0
 ++                                            vis bStop5,0
 ++                                            vis bDown5,0
@@ -37,11 +38,11 @@
 ++                                            covx tTmp.txt,sys0,0,0
 ++                                            btOnOff5.val=sys0
 +Only in HMI/n2t-out: cardPower.txt
-+--- HMI/n2t-out/pageStartup.txt	2022-09-17 17:53:20.407846944 +0000
-++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-09-17 17:53:20.875848746 +0000
++--- HMI/n2t-out/pageStartup.txt	2022-09-17 19:57:23.628206782 +0000
+++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-09-17 19:57:24.072211415 +0000
 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
-+--- HMI/n2t-out/pageTest.txt	2022-09-17 17:53:20.407846944 +0000
-++++ HMI/US/portrait/n2t-out/pageTest.txt	2022-09-17 17:53:20.875848746 +0000
++--- HMI/n2t-out/pageTest.txt	2022-09-17 19:57:23.628206782 +0000
+++++ HMI/US/portrait/n2t-out/pageTest.txt	2022-09-17 19:57:24.072211415 +0000
 +@@ -13,36 +13,6 @@
 +     Events
 +         Preinitialize Event
@@ -177,8 +178,8 @@
 +-            }
 +-        
 +diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
-+--- HMI/n2t-out/popupFan.txt	2022-09-17 17:53:20.407846944 +0000
-++++ HMI/US/portrait/n2t-out/popupFan.txt	2022-09-17 17:53:20.875848746 +0000
++--- HMI/n2t-out/popupFan.txt	2022-09-17 19:57:23.628206782 +0000
+++++ HMI/US/portrait/n2t-out/popupFan.txt	2022-09-17 19:57:24.072211415 +0000
 +@@ -81,23 +81,23 @@
 +         Scope: local
 +         Value: 0
diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt
index 1a92f5af..9542040c 100644
--- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt
@@ -2302,6 +2302,7 @@ Hotspot m2
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=tIcon3.txt
             if(type3.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity3.txt
@@ -2337,6 +2338,7 @@ Hotspot m1
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=tIcon2.txt
             if(type2.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity2.txt
@@ -2372,6 +2374,7 @@ Hotspot m0
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=tIcon1.txt
             if(type1.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity1.txt
@@ -2407,6 +2410,7 @@ Hotspot m3
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=tIcon4.txt
             if(type4.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity4.txt
@@ -2442,6 +2446,7 @@ Hotspot m4
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=tIcon5.txt
             if(type5.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity5.txt
diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt
index f1073b63..f7c48888 100644
--- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt
@@ -608,6 +608,7 @@ Button bEntity1
             tTmp.txt=type1.txt
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=bEntity1.txt
             if(type1.txt=="shutter")
             {
                 page popupShutter
@@ -666,6 +667,7 @@ Button bEntity2
             tTmp.txt=type2.txt
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=bEntity2.txt
             if(type2.txt=="shutter")
             {
                 page popupShutter
@@ -724,6 +726,7 @@ Button bEntity3
             tTmp.txt=type3.txt
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=bEntity3.txt
             if(type3.txt=="shutter")
             {
                 page popupShutter
@@ -782,6 +785,7 @@ Button bEntity4
             tTmp.txt=type4.txt
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=bEntity4.txt
             if(type4.txt=="shutter")
             {
                 page popupShutter
@@ -840,6 +844,7 @@ Button bEntity5
             tTmp.txt=type5.txt
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=bEntity5.txt
             if(type5.txt=="shutter")
             {
                 page popupShutter
@@ -898,6 +903,7 @@ Button bEntity6
             tTmp.txt=type6.txt
             pageIcons.tTmp1.txt=tEntity6.txt
             pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp3.txt=bEntity6.txt
             if(type6.txt=="shutter")
             {
                 page popupShutter
diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
index 1444821d..826da527 100644
--- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
+++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
@@ -3,7 +3,7 @@ Program.s
 	12   Line(s) of event code
 	12   Unique line(s) of event code
 pageIcons
-	6    Component(s)
+	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 pageTest
@@ -14,10 +14,10 @@ popupNotify
 	17   Component(s)
 	226  Line(s) of event code
 	143  Unique line(s) of event code
-popupShutter
-	25   Component(s)
-	388  Line(s) of event code
-	211  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	387  Line(s) of event code
+	212  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	167  Line(s) of event code
@@ -26,18 +26,18 @@ cardMedia
 	34   Component(s)
 	389  Line(s) of event code
 	210  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	386  Line(s) of event code
-	211  Unique line(s) of event code
 popupFan
 	27   Component(s)
 	342  Line(s) of event code
 	199  Unique line(s) of event code
+popupShutter
+	25   Component(s)
+	389  Line(s) of event code
+	212  Unique line(s) of event code
 cardGrid
 	42   Component(s)
-	463  Line(s) of event code
-	272  Unique line(s) of event code
+	469  Line(s) of event code
+	278  Unique line(s) of event code
 cardQR
 	32   Component(s)
 	404  Line(s) of event code
@@ -56,11 +56,11 @@ cardThermo
 	303  Unique line(s) of event code
 cardEntities
 	77   Component(s)
-	1349 Line(s) of event code
-	600  Unique line(s) of event code
+	1354 Line(s) of event code
+	605  Unique line(s) of event code
 
 Total
 	14   Page(s)
-	450  Component(s)
-	5483 Line(s) of event code
-	1478 Unique line(s) of event code
+	451  Component(s)
+	5496 Line(s) of event code
+	1490 Unique line(s) of event code
diff --git a/HMI/US/portrait/n2t-out-visual/pageIcons.txt b/HMI/US/portrait/n2t-out-visual/pageIcons.txt
index 40ece9c0..d02c241b 100644
--- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt
+++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt
@@ -92,6 +92,36 @@ Text tTmp2
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tTmp3
+    Attributes
+        ID                                  : 6
+        Scope                               : global
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 86
+        y coordinate                        : 143
+        Width                               : 146
+        Height                              : 69
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 1
+        Back. Color                         : 65535
+        Font Color                          : 0
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt
index 1433c6c7..fea9713b 100644
--- a/HMI/US/portrait/n2t-out-visual/popupLight.txt
+++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt
@@ -25,6 +25,7 @@ Page popupLight
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tTmp,0
diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt
index 36222b73..e416fc63 100644
--- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt
+++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt
@@ -25,6 +25,7 @@ Page popupShutter
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tPosHeading,0
diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt
index a2edac8f..ad433d8a 100644
--- a/HMI/US/portrait/n2t-out/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out/cardEntities.txt
@@ -1220,6 +1220,7 @@ Hotspot m2
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=tIcon3.txt
             if(type3.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity3.txt
@@ -1246,6 +1247,7 @@ Hotspot m1
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=tIcon2.txt
             if(type2.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity2.txt
@@ -1272,6 +1274,7 @@ Hotspot m0
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=tIcon1.txt
             if(type1.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity1.txt
@@ -1298,6 +1301,7 @@ Hotspot m3
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=tIcon4.txt
             if(type4.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity4.txt
@@ -1324,6 +1328,7 @@ Hotspot m4
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=tIcon5.txt
             if(type5.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity5.txt
diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt
index 521664fb..6e87d7b0 100644
--- a/HMI/US/portrait/n2t-out/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out/cardGrid.txt
@@ -310,6 +310,7 @@ Button bEntity1
             tTmp.txt=type1.txt
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=bEntity1.txt
             if(type1.txt=="shutter")
             {
                 page popupShutter
@@ -346,6 +347,7 @@ Button bEntity2
             tTmp.txt=type2.txt
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=bEntity2.txt
             if(type2.txt=="shutter")
             {
                 page popupShutter
@@ -382,6 +384,7 @@ Button bEntity3
             tTmp.txt=type3.txt
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=bEntity3.txt
             if(type3.txt=="shutter")
             {
                 page popupShutter
@@ -418,6 +421,7 @@ Button bEntity4
             tTmp.txt=type4.txt
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=bEntity4.txt
             if(type4.txt=="shutter")
             {
                 page popupShutter
@@ -454,6 +458,7 @@ Button bEntity5
             tTmp.txt=type5.txt
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=bEntity5.txt
             if(type5.txt=="shutter")
             {
                 page popupShutter
@@ -490,6 +495,7 @@ Button bEntity6
             tTmp.txt=type6.txt
             pageIcons.tTmp1.txt=tEntity6.txt
             pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp3.txt=bEntity6.txt
             if(type6.txt=="shutter")
             {
                 page popupShutter
diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt
index f6b260cf..a1081fbb 100644
--- a/HMI/US/portrait/n2t-out/pageIcons.txt
+++ b/HMI/US/portrait/n2t-out/pageIcons.txt
@@ -42,6 +42,16 @@ Text tTmp2
         Text                                : 
         Max. Text Size                      : 80
     
+Text tTmp3
+    Attributes
+        Scope                               : global
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
 Picture p0
     Attributes
         Scope                               : local
diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt
index 718398aa..c91f7ac8 100644
--- a/HMI/US/portrait/n2t-out/popupLight.txt
+++ b/HMI/US/portrait/n2t-out/popupLight.txt
@@ -17,6 +17,7 @@ Page popupLight
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tTmp,0
diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt
index b11f46c0..b6179e35 100644
--- a/HMI/US/portrait/n2t-out/popupShutter.txt
+++ b/HMI/US/portrait/n2t-out/popupShutter.txt
@@ -17,6 +17,7 @@ Page popupShutter
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tPosHeading,0
diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt
index fc803591..9cfcd63d 100644
--- a/HMI/n2t-out-visual/cardEntities.txt
+++ b/HMI/n2t-out-visual/cardEntities.txt
@@ -1912,6 +1912,7 @@ Hotspot m2
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=tIcon3.txt
             if(type3.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity3.txt
@@ -1947,6 +1948,7 @@ Hotspot m1
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=tIcon2.txt
             if(type2.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity2.txt
@@ -1982,6 +1984,7 @@ Hotspot m0
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=tIcon1.txt
             if(type1.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity1.txt
@@ -2017,6 +2020,7 @@ Hotspot m3
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=tIcon4.txt
             if(type4.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity4.txt
diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt
index abdac93d..580082c2 100644
--- a/HMI/n2t-out-visual/cardGrid.txt
+++ b/HMI/n2t-out-visual/cardGrid.txt
@@ -608,6 +608,7 @@ Button bEntity1
             tTmp.txt=type1.txt
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=bEntity1.txt
             if(type1.txt=="shutter")
             {
                 page popupShutter
@@ -636,7 +637,7 @@ Button bEntity2
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Opacity                             : 127
-        x coordinate                        : 153
+        x coordinate                        : 152
         y coordinate                        : 75
         Width                               : 140
         Height                              : 80
@@ -666,6 +667,7 @@ Button bEntity2
             tTmp.txt=type2.txt
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=bEntity2.txt
             if(type2.txt=="shutter")
             {
                 page popupShutter
@@ -724,6 +726,7 @@ Button bEntity3
             tTmp.txt=type3.txt
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=bEntity3.txt
             if(type3.txt=="shutter")
             {
                 page popupShutter
@@ -782,6 +785,7 @@ Button bEntity4
             tTmp.txt=type4.txt
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=bEntity4.txt
             if(type4.txt=="shutter")
             {
                 page popupShutter
@@ -840,6 +844,7 @@ Button bEntity5
             tTmp.txt=type5.txt
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=bEntity5.txt
             if(type5.txt=="shutter")
             {
                 page popupShutter
@@ -898,6 +903,7 @@ Button bEntity6
             tTmp.txt=type6.txt
             pageIcons.tTmp1.txt=tEntity6.txt
             pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp3.txt=bEntity6.txt
             if(type6.txt=="shutter")
             {
                 page popupShutter
diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt
index 6c9c7cdb..e35a02a9 100644
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -3,7 +3,7 @@ Program.s
 	13   Line(s) of event code
 	13   Unique line(s) of event code
 pageIcons
-	6    Component(s)
+	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
 popupFan
@@ -18,18 +18,18 @@ pageStartup
 	19   Component(s)
 	167  Line(s) of event code
 	122  Unique line(s) of event code
-popupShutter
-	25   Component(s)
-	388  Line(s) of event code
-	211  Unique line(s) of event code
-popupLight
-	27   Component(s)
-	386  Line(s) of event code
-	211  Unique line(s) of event code
 cardGrid
 	42   Component(s)
-	463  Line(s) of event code
-	272  Unique line(s) of event code
+	469  Line(s) of event code
+	278  Unique line(s) of event code
+popupLight
+	27   Component(s)
+	387  Line(s) of event code
+	212  Unique line(s) of event code
+popupShutter
+	25   Component(s)
+	389  Line(s) of event code
+	212  Unique line(s) of event code
 cardMedia
 	34   Component(s)
 	389  Line(s) of event code
@@ -60,11 +60,11 @@ cardThermo
 	303  Unique line(s) of event code
 cardEntities
 	65   Component(s)
-	1128 Line(s) of event code
-	515  Unique line(s) of event code
+	1132 Line(s) of event code
+	519  Unique line(s) of event code
 
 Total
 	15   Page(s)
-	492  Component(s)
-	5701 Line(s) of event code
-	1546 Unique line(s) of event code
+	493  Component(s)
+	5713 Line(s) of event code
+	1557 Unique line(s) of event code
diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt
index 4753b885..e32041af 100644
--- a/HMI/n2t-out-visual/pageIcons.txt
+++ b/HMI/n2t-out-visual/pageIcons.txt
@@ -92,6 +92,36 @@ Text tTmp2
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0
     
+Text tTmp3
+    Attributes
+        ID                                  : 6
+        Scope                               : global
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 302
+        y coordinate                        : 154
+        Width                               : 146
+        Height                              : 69
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : flat
+        Associated Keyboard                 : none
+        Font ID                             : 1
+        Back. Color                         : 65535
+        Font Color                          : 0
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        Input Type                          : character
+        Text                                : 
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
 Picture p0
     Attributes
         ID                                  : 1
diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt
index f1d85bc3..83ef21d6 100644
--- a/HMI/n2t-out-visual/popupLight.txt
+++ b/HMI/n2t-out-visual/popupLight.txt
@@ -25,6 +25,7 @@ Page popupLight
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tTmp,0
diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt
index dd96ab63..67be626e 100644
--- a/HMI/n2t-out-visual/popupShutter.txt
+++ b/HMI/n2t-out-visual/popupShutter.txt
@@ -25,6 +25,7 @@ Page popupShutter
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tPosHeading,0
diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt
index 174b4fe5..c4f7532e 100644
--- a/HMI/n2t-out/cardEntities.txt
+++ b/HMI/n2t-out/cardEntities.txt
@@ -1014,6 +1014,7 @@ Hotspot m2
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=tIcon3.txt
             if(type3.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity3.txt
@@ -1040,6 +1041,7 @@ Hotspot m1
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=tIcon2.txt
             if(type2.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity2.txt
@@ -1066,6 +1068,7 @@ Hotspot m0
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=tIcon1.txt
             if(type1.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity1.txt
@@ -1092,6 +1095,7 @@ Hotspot m3
         Touch Press Event
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=tIcon4.txt
             if(type4.txt=="shutter")
             {
                 //popupShutter.tHeading.txt=tEntity4.txt
diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt
index 521664fb..6e87d7b0 100644
--- a/HMI/n2t-out/cardGrid.txt
+++ b/HMI/n2t-out/cardGrid.txt
@@ -310,6 +310,7 @@ Button bEntity1
             tTmp.txt=type1.txt
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
+            pageIcons.tTmp3.txt=bEntity1.txt
             if(type1.txt=="shutter")
             {
                 page popupShutter
@@ -346,6 +347,7 @@ Button bEntity2
             tTmp.txt=type2.txt
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
+            pageIcons.tTmp3.txt=bEntity2.txt
             if(type2.txt=="shutter")
             {
                 page popupShutter
@@ -382,6 +384,7 @@ Button bEntity3
             tTmp.txt=type3.txt
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
+            pageIcons.tTmp3.txt=bEntity3.txt
             if(type3.txt=="shutter")
             {
                 page popupShutter
@@ -418,6 +421,7 @@ Button bEntity4
             tTmp.txt=type4.txt
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
+            pageIcons.tTmp3.txt=bEntity4.txt
             if(type4.txt=="shutter")
             {
                 page popupShutter
@@ -454,6 +458,7 @@ Button bEntity5
             tTmp.txt=type5.txt
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
+            pageIcons.tTmp3.txt=bEntity5.txt
             if(type5.txt=="shutter")
             {
                 page popupShutter
@@ -490,6 +495,7 @@ Button bEntity6
             tTmp.txt=type6.txt
             pageIcons.tTmp1.txt=tEntity6.txt
             pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp3.txt=bEntity6.txt
             if(type6.txt=="shutter")
             {
                 page popupShutter
diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt
index cc5100ac..5228463c 100644
--- a/HMI/n2t-out/pageIcons.txt
+++ b/HMI/n2t-out/pageIcons.txt
@@ -42,6 +42,16 @@ Text tTmp2
         Text                                : 
         Max. Text Size                      : 80
     
+Text tTmp3
+    Attributes
+        Scope                               : global
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Associated Keyboard                 : none
+        Text                                : 
+        Max. Text Size                      : 10
+    
 Picture p0
     Attributes
         Scope                               : local
diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt
index 718398aa..c91f7ac8 100644
--- a/HMI/n2t-out/popupLight.txt
+++ b/HMI/n2t-out/popupLight.txt
@@ -17,6 +17,7 @@ Page popupLight
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tTmp,0
diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt
index b11f46c0..b6179e35 100644
--- a/HMI/n2t-out/popupShutter.txt
+++ b/HMI/n2t-out/popupShutter.txt
@@ -17,6 +17,7 @@ Page popupShutter
             tEntity.txt=pageIcons.tTmp1.txt
             //get entity id
             entn.txt=pageIcons.tTmp2.txt
+            tIcon1.txt=pageIcons.tTmp3.txt
             vis p0,0
             vis tSend,0
             vis tPosHeading,0