diff --git a/radio/src/gui/colorlcd/switch_warn_dialog.cpp b/radio/src/gui/colorlcd/switch_warn_dialog.cpp
new file mode 100644
index 000000000..81bb8675f
--- /dev/null
+++ b/radio/src/gui/colorlcd/switch_warn_dialog.cpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "switch_warn_dialog.h"
+
+bool SwitchWarnDialog::warningInactive()
+{
+  GET_ADC_IF_MIXER_NOT_RUNNING();
+  getMovedSwitch();
+
+  bool warn = false;
+  for (int i = 0; i < NUM_SWITCHES; i++) {
+    if (SWITCH_WARNING_ALLOWED(i)) {
+      unsigned int state = ((states >> (3 * i)) & 0x07);
+      if (state && state - 1 != ((switches_states >> (i * 2)) & 0x03)) {
+        warn = true;
+      }
+    }
+  }
+
+  if (g_model.potsWarnMode) {
+    evalFlightModeMixes(e_perout_mode_normal, 0);
+    bad_pots = 0;
+    for (int i = 0; i < NUM_POTS + NUM_SLIDERS; i++) {
+      if (!IS_POT_SLIDER_AVAILABLE(POT1 + i)) {
+        continue;
+      }
+      if (!(g_model.potsWarnEnabled & (1 << i)) && (abs(g_model.potsWarnPosition[i] - GET_LOWRES_POT_POSITION(i)) > 1)) {
+        warn = true;
+        bad_pots |= (1 << i);
+      }
+    }
+  }
+
+  if (!warn)
+    return true;
+
+  if (last_bad_switches != switches_states || last_bad_pots != bad_pots) {
+    invalidate();
+    if (last_bad_switches == 0xff || last_bad_pots == 0xff) {
+      AUDIO_ERROR_MESSAGE(AU_SWITCH_ALERT);
+    }
+  }
+
+  last_bad_pots = bad_pots;
+  last_bad_switches = switches_states;
+
+  return false;
+}
+
+void SwitchWarnDialog::paint(BitmapBuffer * dc)
+{
+  if (!running)
+    return;
+
+  FullScreenDialog::paint(dc);
+
+  coord_t x = ALERT_MESSAGE_LEFT;
+  coord_t y = ALERT_MESSAGE_TOP; // ALERT_FRAME_TOP + ALERT_FRAME_PADDING + ALERT_TITLE_LINE_HEIGHT * 3;
+
+  for (int i = 0; i < NUM_SWITCHES; ++i) {
+    if (SWITCH_WARNING_ALLOWED(i)) {
+      unsigned int state = ((g_model.switchWarningState >> (3 * i)) & 0x07);
+      if (state && state - 1 != ((switches_states >> (i * 2)) & 0x03)) {
+        if (y < LCD_H) {
+#if LCD_W > LCD_H
+          x = drawSwitch(dc, x, y, SWSRC_FIRST_SWITCH + i * 3 + state - 1, FONT(BOLD));
+          x += 5;
+#else
+          y += 35;
+#endif
+        }
+        else {
+          dc->drawText(x, y, "...", FONT(BOLD));
+          break;
+        }
+      }
+    }
+  }
+
+  if (g_model.potsWarnMode) {
+    for (int i = 0; i < NUM_POTS + NUM_SLIDERS; i++) {
+      if (!IS_POT_SLIDER_AVAILABLE(POT1 + i)) {
+        continue;
+      }
+      if (!(g_model.potsWarnEnabled & (1 << i))) {
+        if (abs(g_model.potsWarnPosition[i] - GET_LOWRES_POT_POSITION(i)) > 1) {
+          if (y < LCD_H) {
+            char s[8];
+            // TODO add an helper
+            strncpy(s, &STR_VSRCRAW[1 + (NUM_STICKS + 1 + i) * STR_VSRCRAW[0]], STR_VSRCRAW[0]);
+            s[int(STR_VSRCRAW[0])] = '\0';
+            dc->drawText(x, y, s, ALARM_COLOR | FONT(XL));
+            y += 35;
+          }
+          else {
+            dc->drawText(x, y, "...", ALARM_COLOR | FONT(XL));
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/radio/src/gui/colorlcd/switch_warn_dialog.h b/radio/src/gui/colorlcd/switch_warn_dialog.h
new file mode 100644
index 000000000..bf529a8e0
--- /dev/null
+++ b/radio/src/gui/colorlcd/switch_warn_dialog.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _SWITCH_WARN_DIALOG_H_
+#define _SWITCH_WARN_DIALOG_H_
+
+#include "fullscreen_dialog.h"
+#include "mainwindow.h"
+#include "opentx.h"
+#include "gridlayout.h"
+
+class SwitchWarnDialog: public FullScreenDialog {
+  public:
+    SwitchWarnDialog():
+      FullScreenDialog(WARNING_TYPE_ALERT, STR_SWITCHWARN)
+    {
+      last_bad_switches = 0xff;
+      states = g_model.switchWarningState;
+      bad_pots = 0;
+      last_bad_pots = 0xff;
+      setCloseCondition(std::bind(&SwitchWarnDialog::warningInactive, this));
+    }
+
+#if defined(DEBUG_WINDOWS)
+    std::string getName() override
+    {
+      return "SwitchWarnDialog";
+    }
+#endif
+
+    void paint(BitmapBuffer * dc) override;
+
+  protected:
+    swarnstate_t last_bad_switches;
+    swarnstate_t states;
+    uint8_t bad_pots;
+    uint8_t last_bad_pots;
+    bool warningInactive();
+};
+
+#endif