diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI
index a1b0f79a..a286715d 100644
Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ
diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft
index 5e0f94d2..c5d16b38 100644
Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ
diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI
index 95f4ea07..73a6e26b 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 472e45f8..e66d6d0c 100644
Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ
diff --git a/HMI/code_gen/pages/shared.py b/HMI/code_gen/pages/shared.py
index e0d61ece..c2fac27a 100644
--- a/HMI/code_gen/pages/shared.py
+++ b/HMI/code_gen/pages/shared.py
@@ -146,25 +146,33 @@ navigation = """
               if(tTmp.txt=="0")
               {
                 vis bPrev,0
+                tsw mSwipePrev,0
+                tsw mSwipeUp,0
               }
               if(tTmp.txt=="1")
               {
                 vis bPrev,1
+                tsw mSwipePrev,1
+                tsw mSwipeUp,0
                 bPrev.txt=""
               }
               if(tTmp.txt=="2")
               {
                 vis bPrev,1
+                tsw mSwipePrev,0
+                tsw mSwipeUp,1
                 bPrev.txt=""
               }       
               spstr tId.txt,tTmp.txt,"|",1
               if(tTmp.txt=="0")
               {
                 vis bNext,0
+                tsw mSwipeNext,0
               }
               if(tTmp.txt=="1")
               {
                 vis bNext,1
+                tsw mSwipeNext,1
                 bNext.txt=""
               }
 """
\ No newline at end of file
diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index 9c7fe855..d5e2f799 100644
Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ