diff --git a/companion/src/simulation/simulateduiwidgetBoxer.cpp b/companion/src/simulation/simulateduiwidgetBoxer.cpp
index d5b2a88ff..4d7debed7 100644
--- a/companion/src/simulation/simulateduiwidgetBoxer.cpp
+++ b/companion/src/simulation/simulateduiwidgetBoxer.cpp
@@ -25,10 +25,10 @@ SimulatedUIWidgetBoxer::SimulatedUIWidgetBoxer(SimulatorInterface *simulator, QW
   act = new RadioUiAction(13, QList<int>() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE);
   addRadioWidget(ui->leftbuttons->addArea(QRect(72, 149, 62, 24), "Boxer/left-tele.png", act));
 
-  act = new RadioUiAction(4, QList<int>() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN);
+  act = new RadioUiAction(5, QList<int>() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN);
   addRadioWidget(ui->leftbuttons->addArea(QRect(72, 79, 62, 24), "Boxer/left-pagedn.png", act));
 
-  act = new RadioUiAction(5, QList<int>() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP);
+  act = new RadioUiAction(4, QList<int>() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP);
   addRadioWidget(ui->leftbuttons->addArea(QRect(72, 114, 62, 24), "Boxer/left-pageup.png", act));
 
   act = new RadioUiAction(1, QList<int>() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT);
diff --git a/radio/src/gui/common/stdlcd/popups.cpp b/radio/src/gui/common/stdlcd/popups.cpp
index d3e52ea4b..dc9973a7d 100644
--- a/radio/src/gui/common/stdlcd/popups.cpp
+++ b/radio/src/gui/common/stdlcd/popups.cpp
@@ -97,7 +97,8 @@ const char * runPopupMenu(event_t event)
   event_t eventTemp = event;
 
 #if defined(ROTARY_ENCODER_NAVIGATION) && !defined(COLORLCD)
-  if (g_eeGeneral.rotEncMode >= ROTARY_ENCODER_MODE_INVERT_BOTH) {
+  if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT ||
+      g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) {
     if (eventTemp == EVT_ROTARY_LEFT) {
       eventTemp = EVT_ROTARY_RIGHT;
     } else if (eventTemp == EVT_ROTARY_RIGHT) {
diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp
index 4f51bc44b..e89741b62 100644
--- a/radio/src/targets/simu/opentxsimulator.cpp
+++ b/radio/src/targets/simu/opentxsimulator.cpp
@@ -301,7 +301,8 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
 #if defined(ROTARY_ENCODER_NAVIGATION) && !defined(USE_HATS_AS_KEYS)
   static uint32_t last_tick = 0;
   if (steps != 0) {
-    if (g_eeGeneral.rotEncMode >= ROTARY_ENCODER_MODE_INVERT_BOTH) steps *= -1;
+    if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_BOTH)
+      steps *= -1;
     rotencValue += steps * ROTARY_ENCODER_GRANULARITY;
     // TODO: set rotencDt
     uint32_t now = RTOS_GET_MS();
diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h
index 98bc3e933..c891a94b7 100644
--- a/radio/src/translations/cn.h
+++ b/radio/src/translations/cn.h
@@ -176,7 +176,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "正常","反向"
 #else
-  #define TR_ROTARY_ENC_OPT         "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "正常","反向","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h
index 93c6d032a..d5eb7a25a 100644
--- a/radio/src/translations/cz.h
+++ b/radio/src/translations/cz.h
@@ -188,7 +188,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Invertován"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Invertován","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Invertován","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h
index 0b240db3c..39a94442f 100644
--- a/radio/src/translations/da.h
+++ b/radio/src/translations/da.h
@@ -183,7 +183,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT            "Normal","Invers"
 #else
-  #define TR_ROTARY_ENC_OPT            "Normal","Invers","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT            "Normal","Invers","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h
index e2db8d6f7..d54259231 100644
--- a/radio/src/translations/de.h
+++ b/radio/src/translations/de.h
@@ -178,7 +178,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
index d421b543a..4d28b442d 100644
--- a/radio/src/translations/en.h
+++ b/radio/src/translations/en.h
@@ -180,7 +180,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h
index b448f2036..195d328de 100644
--- a/radio/src/translations/es.h
+++ b/radio/src/translations/es.h
@@ -176,7 +176,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h
index 7929138a7..d74fd8455 100644
--- a/radio/src/translations/fi.h
+++ b/radio/src/translations/fi.h
@@ -187,7 +187,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h
index e40594fec..7cad39c58 100644
--- a/radio/src/translations/fr.h
+++ b/radio/src/translations/fr.h
@@ -185,7 +185,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inversé"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inversé","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inversé","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h
index feafb6541..48500923c 100644
--- a/radio/src/translations/he.h
+++ b/radio/src/translations/he.h
@@ -184,7 +184,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "רגיל","הפוך"
 #else
-  #define TR_ROTARY_ENC_OPT         "רגיל","הפוך","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "רגיל","הפוך","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h
index 3ba933997..c83b3ad0d 100644
--- a/radio/src/translations/it.h
+++ b/radio/src/translations/it.h
@@ -181,7 +181,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT            "Normale","Invertito"
 #else
-  #define TR_ROTARY_ENC_OPT            "Normale","Invertito","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT            "Normale","Invertito","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h
index 358a8003b..2524fc6f1 100644
--- a/radio/src/translations/jp.h
+++ b/radio/src/translations/jp.h
@@ -180,7 +180,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "標準","リバース"
 #else
-  #define TR_ROTARY_ENC_OPT         "標準","リバース","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "標準","リバース","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h
index 814610358..d0213307c 100644
--- a/radio/src/translations/nl.h
+++ b/radio/src/translations/nl.h
@@ -177,7 +177,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h
index 1072b62d4..d903d9ea4 100644
--- a/radio/src/translations/pl.h
+++ b/radio/src/translations/pl.h
@@ -176,7 +176,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT  "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT  "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT  "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h
index be4e353d5..f1fc03580 100644
--- a/radio/src/translations/pt.h
+++ b/radio/src/translations/pt.h
@@ -183,7 +183,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Invert"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Invert","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT         "Normal","Invert","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h
index 6c1ed3fc4..b50c269e8 100644
--- a/radio/src/translations/ru.h
+++ b/radio/src/translations/ru.h
@@ -182,7 +182,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT            "Норм","Перевер"
 #else
-  #define TR_ROTARY_ENC_OPT            "Норм","Перевер","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT            "Норм","Перевер","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h
index a6c70cee1..6319faaa1 100644
--- a/radio/src/translations/se.h
+++ b/radio/src/translations/se.h
@@ -173,7 +173,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT             "Normal","Inverterad"
 #else
-  #define TR_ROTARY_ENC_OPT             "Normal","Inverterad","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT             "Normal","Inverterad","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #define TR_ON_ONE_SWITCHES              "PÅ","Ett"
diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h
index 657c8ccfb..ee15a11d7 100644
--- a/radio/src/translations/tw.h
+++ b/radio/src/translations/tw.h
@@ -181,7 +181,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT          "正常","反向"
 #else
-  #define TR_ROTARY_ENC_OPT          "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
+  #define TR_ROTARY_ENC_OPT          "正常","反向","V-I H-N","V-I H-A","V-N E-I"
 #endif
 
 #if defined(IMU)