diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index d1eb43d21..82073947d 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -119,7 +119,6 @@ enum menuProcSetupItems {
 #if defined(SPLASH)
   ITEM_SETUP_DISABLE_SPLASH,
 #endif
-  ITEM_SETUP_THROTTLE_WARNING,
   ITEM_SETUP_SWITCH_WARNING,
   ITEM_SETUP_MEMORY_WARNING,
   ITEM_SETUP_ALARM_WARNING,
@@ -166,7 +165,7 @@ void menuProcSetup(uint8_t event)
 #define ROTARY_ENCODERS_ZEROS
 #endif
 
-  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+2, {0, 0, 0, AUDIO_ZEROS HAPTIC_ZEROS ARM_ZEROS ROTARY_ENCODERS_ZEROS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, SPLASH_ZEROS 0, 0, 0, 0, FRSKY_ZEROS 0, (uint8_t)-1, 1});
+  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+2, {0, 0, AUDIO_ZEROS HAPTIC_ZEROS ARM_ZEROS ROTARY_ENCODERS_ZEROS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, SPLASH_ZEROS 0, 0, 0, 0, FRSKY_ZEROS 0, (uint8_t)-1, 1});
 
   uint8_t sub = m_posVert - 1;
 
@@ -332,13 +331,6 @@ void menuProcSetup(uint8_t event)
       }
 #endif
 
-      case ITEM_SETUP_THROTTLE_WARNING:
-      {
-        uint8_t b = 1-g_eeGeneral.disableThrottleWarning;
-        g_eeGeneral.disableThrottleWarning = 1-onoffMenuItem( b, y, STR_THROTTLEWARNING, attr, event ) ;
-        break;
-      }
-
       case ITEM_SETUP_SWITCH_WARNING:
         g_eeGeneral.switchWarning = selectMenuItem(y, STR_SWITCHWARNING, STR_WARNSW, g_eeGeneral.switchWarning, -1, 1, attr, event);
         break;
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index c66cb8e2b..2f18035a6 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -536,6 +536,7 @@ enum menuProcModelItems {
   ITEM_MODEL_TRIM_INC,
   ITEM_MODEL_THROTTLE_TRACE,
   ITEM_MODEL_THROTTLE_TRIM,
+  ITEM_MODEL_THROTTLE_WARNING,
   ITEM_MODEL_BEEP_CENTER,
   ITEM_MODEL_PROTOCOL,
   ITEM_MODEL_PROTOCOL_PARAMS
@@ -559,7 +560,7 @@ void menuProcModel(uint8_t event)
   lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2);
 
   uint8_t protocol = g_model.protocol;
-  MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 12 : 11), {0,ZCHAR|(sizeof(g_model.name)-1),2,2,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
+  MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 13 : 12), {0,ZCHAR|(sizeof(g_model.name)-1),2,2,0,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
 
   uint8_t  sub = m_posVert - 1;
 
@@ -645,10 +646,18 @@ void menuProcModel(uint8_t event)
 
       case ITEM_MODEL_THROTTLE_TRIM:
         lcd_putsLeft(y, STR_TTRIM);
-        menu_lcd_onoff(MODEL_PARAM_OFS, y, g_model.thrTrim, attr) ;
-        if (attr) CHECK_INCDEC_MODELVAR(event,g_model.thrTrim,0,1);
+        menu_lcd_onoff(MODEL_PARAM_OFS, y, g_model.disableThrottleWarning, attr) ;
+        if (attr) CHECK_INCDEC_MODELVAR(event,g_model.disableThrottleWarning,0,1);
         break;
 
+      case ITEM_MODEL_THROTTLE_WARNING:
+      {
+        lcd_putsLeft(y, STR_THROTTLEWARNING);
+        menu_lcd_onoff(MODEL_PARAM_OFS, y, !g_model.thrTrim, attr) ;
+        if (attr) g_model.thrTrim = !checkIncDecModel(event, !g_model.thrTrim, 0, 1);
+        break;
+      }
+
       case ITEM_MODEL_BEEP_CENTER:
         lcd_putsLeft(y, STR_BEEPCTR);
         for (uint8_t i=0;i<NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS;i++)
diff --git a/src/myeeprom.h b/src/myeeprom.h
index b90abbfa5..6d31f6655 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -143,7 +143,7 @@ PACK(typedef struct t_EEGeneral {
   int8_t    lightSw;
   TrainerData trainer;
   uint8_t   view;      //index of subview in main scrren
-  uint8_t   disableThrottleWarning:1;
+  uint8_t   spare0:1;
   int8_t    switchWarning:2; // -1=down, 0=off, 1=up
   int8_t    beeperMode:2;
   uint8_t   spare1:1;
@@ -577,7 +577,7 @@ PACK(typedef struct t_ModelData {
   uint8_t   thrTrim:1;            // Enable Throttle Trim
   int8_t    ppmNCH:4;
   uint8_t   trimInc:3;            // Trim Increments
-  uint8_t   spare1:1;
+  uint8_t   disableThrottleWarning:1;
   uint8_t   pulsePol:1;
   uint8_t   extendedLimits:1;
   uint8_t   extendedTrims:1;
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 4b4856062..491d9b142 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -841,7 +841,7 @@ void checkLowEEPROM()
 
 void checkTHR()
 {
-  if(g_eeGeneral.disableThrottleWarning) return;
+  if(g_model.disableThrottleWarning) return;
 
   int thrchn=(2-(stickMode&1));//stickMode=0123 -> thr=2121
 
diff --git a/src/translations/en.h b/src/translations/en.h
index cca0917f4..8b6c77645 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -291,7 +291,7 @@
 #define TR_LIGHTSWITCH  "Light switch"
 #define TR_LIGHTOFFAFTER "Light off after"
 #define TR_SPLASHSCREEN  "Splash screen"
-#define TR_THROTTLEWARNING "Thr Warning"
+#define TR_THROTTLEWARNING "T-Warning"
 #define TR_SWITCHWARNING "Switch Warning"
 #define TR_MEMORYWARNING "Memory Warning"
 #define TR_ALARMWARNING "Alarm Warning"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 4f98f8e9e..d79baa5c6 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -221,6 +221,7 @@
 #define TR_TRIMINC      "Trim Inc"
 #define TR_TTRACE       "T-Trace"
 #define TR_TTRIM        "T-Trim"
+#define TR_THROTTLEWARNING "T-Warning"
 #define TR_BEEPCTR      "Bip Ctr"
 #define TR_PROTO        "Proto"
 #define TR_PPMFRAME     "PPM frame"
@@ -267,9 +268,9 @@
 #define TR_BAR          "Bar"
 #define TR_ALARM        "Alarme"
 #define TR_USRDATA      "UsrData"
-#define TR_BLADES       "Blades"
+#define TR_BLADES       "Helices"
 #define TR_BARS         "Gauges"
-#define TR_DISPLAY      "Display"
+#define TR_DISPLAY      "Affichage"
 #ifdef AUDIO
 #define TR_BEEPERMODE   "Speaker Mode"
 #define TR_BEEPERLEN    "Speaker Length"
@@ -293,7 +294,6 @@
 #define TR_LIGHTSWITCH  "Inter eclairage"
 #define TR_LIGHTOFFAFTER "Duree eclairage"
 #define TR_SPLASHSCREEN  "Ecran d'accueil"
-#define TR_THROTTLEWARNING "Alerte Gaz"
 #define TR_SWITCHWARNING "Alerte Inter"
 #define TR_MEMORYWARNING "Alerte Memoire"
 #define TR_ALARMWARNING "Alerte Alarme"