diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json
index f622c05e..6b5e3a35 100644
--- a/Translations/translation_BG.json
+++ b/Translations/translation_BG.json
@@ -21,10 +21,13 @@
 		"TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ",
 		"SolderingAdvancedPowerPrompt": "Захранване: ",
 		"OffString": "Изкл.",
-		"ResetOKMessage": "Нулиране завършено",
 		"YourGainMessage": "Усилване:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": [
+			"Нулиране",
+			"завършено"
+		],
 		"SettingsResetMessage": [
 			"Настройките бяха",
 			"нулирани!"
diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json
index 43aa36f6..8aed567d 100644
--- a/Translations/translation_CS.json
+++ b/Translations/translation_CS.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "HROT NEPŘIPOJEN",
 		"SolderingAdvancedPowerPrompt": "Ohřev: ",
 		"OffString": "Vyp",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Zisk:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Tov. nas. obnov.",
 			""
diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json
index aac0b919..ea13608b 100644
--- a/Translations/translation_DA.json
+++ b/Translations/translation_DA.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json
index eeca28ea..1226dfad 100644
--- a/Translations/translation_DE.json
+++ b/Translations/translation_DE.json
@@ -22,10 +22,10 @@
 		"TipDisconnectedString": "Spitze fehlt",
 		"SolderingAdvancedPowerPrompt": "Leistung: ",
 		"OffString": "Aus",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Dein Faktor:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Einstellungen",
 			"zurückgesetzt!"
diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json
index 096a5c6e..51d79ea0 100644
--- a/Translations/translation_EN.json
+++ b/Translations/translation_EN.json
@@ -22,10 +22,10 @@
 		"TipDisconnectedString": "NO TIP",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json
index 22b441c0..f4ff297e 100644
--- a/Translations/translation_ES.json
+++ b/Translations/translation_ES.json
@@ -21,11 +21,11 @@
 		"TipDisconnectedString": "NO HAY PUNTA",
 		"SolderingAdvancedPowerPrompt": "Potencia: ",
 		"OffString": " No",
-		"ResetOKMessage": "Hecho.       ",
 		"YourGainMessage": "Gananc.:",
 		"SettingsResetMessage": "Ajustes borrados"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Hecho.",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json
index d6eafde1..d263d7ec 100644
--- a/Translations/translation_FI.json
+++ b/Translations/translation_FI.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "KÄRKI ON IRTI",
 		"SolderingAdvancedPowerPrompt": "Teho: ",
 		"OffString": "OFF",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json
index 337ffe9b..3d171913 100644
--- a/Translations/translation_FR.json
+++ b/Translations/translation_FR.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
 		"SolderingAdvancedPowerPrompt": "Puissance : ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Gain : "
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Réglage",
 			"réinit. !"
diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json
index 286776ba..28816082 100644
--- a/Translations/translation_HR.json
+++ b/Translations/translation_HR.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json
index 2366c047..26f2e21d 100644
--- a/Translations/translation_HU.json
+++ b/Translations/translation_HU.json
@@ -21,10 +21,13 @@
 		"TipDisconnectedString": "PÁKA LEVÉVE",
 		"SolderingAdvancedPowerPrompt": "Telj: ",
 		"OffString": "Ki",
-		"ResetOKMessage": "Törlés OK",
 		"YourGainMessage": "Erősítés:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": [
+			"Törlés OK",
+			""
+		],
 		"SettingsResetMessage": [
 			"Beállítások",
 			"törölve!"
diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json
index 6f16d4e5..7e090e82 100644
--- a/Translations/translation_IT.json
+++ b/Translations/translation_IT.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "PUNTA ASSENTE",
 		"SolderingAdvancedPowerPrompt": "Potenz:",
 		"OffString": "OFF",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Guad.: "
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Reset effettuato",
 			""
diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json
index 4a4da44b..ae84c9d3 100644
--- a/Translations/translation_LT.json
+++ b/Translations/translation_LT.json
@@ -21,10 +21,13 @@
 		"TipDisconnectedString": "NĖRA ANTGALIO",
 		"SolderingAdvancedPowerPrompt": "Galia: ",
 		"OffString": "Išj",
-		"ResetOKMessage": "Atstatytas OK",
 		"YourGainMessage": "Greitis:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": [
+			"Atstatytas OK",
+			""
+		],
 		"SettingsResetMessage": [
 			"Nust. atstatyti!",
 			""
diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json
index d7d0018b..72f34da5 100644
--- a/Translations/translation_NL.json
+++ b/Translations/translation_NL.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "PUNT LOSGEKOPPELT",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
 		"OffString": "Uit",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Niveau:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Instellingen",
 			"zijn gereset!"
diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json
index 14ab1080..e4c0c10c 100644
--- a/Translations/translation_NL_BE.json
+++ b/Translations/translation_NL_BE.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "Punt ONTKOPPELD",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
 		"OffString": "Uit",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_NO.json b/Translations/translation_NO.json
index f16812cd..4e4b3d38 100644
--- a/Translations/translation_NO.json
+++ b/Translations/translation_NO.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "SPISS FRAKOBLET",
 		"SolderingAdvancedPowerPrompt": "Effekt: ",
 		"OffString": "Av",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
index aff5590b..52783d1a 100644
--- a/Translations/translation_PL.json
+++ b/Translations/translation_PL.json
@@ -22,10 +22,10 @@
 		"TipDisconnectedString": "GROT ODŁĄCZONY",
 		"SolderingAdvancedPowerPrompt": "Moc: ",
 		"OffString": "Wył",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Us.zysk:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Ust. zresetowane",
 			""
diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json
index 4c475913..7d7c541b 100644
--- a/Translations/translation_PT.json
+++ b/Translations/translation_PT.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "SEM PONTA",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
index bfb01c22..b6746b86 100644
--- a/Translations/translation_RU.json
+++ b/Translations/translation_RU.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "ЖАЛО ОТСОЕДИНЕНО",
 		"SolderingAdvancedPowerPrompt": "Питание: ",
 		"OffString": "Выкл.",
-		"ResetOKMessage": "Сброс OK",
 		"YourGainMessage": "Прирост:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Сброс OK",
 		"SettingsResetMessage": [
 			"Настройки",
 			"сброшены!"
diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json
index 17c55126..6423287a 100644
--- a/Translations/translation_SK.json
+++ b/Translations/translation_SK.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "HROT ODPOJENÝ",
 		"SolderingAdvancedPowerPrompt": "Výkon: ",
 		"OffString": "Vyp",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Zisk:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Tov. nas. obnov.",
 			""
diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json
index 9f7b11e1..52e4bf44 100644
--- a/Translations/translation_SL.json
+++ b/Translations/translation_SL.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "NI KONICE",
 		"SolderingAdvancedPowerPrompt": "Moč: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Ojačenje"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Nastavitve OK!",
 			""
diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json
index 4dbf42c3..69620f63 100644
--- a/Translations/translation_SR_CYRL.json
+++ b/Translations/translation_SR_CYRL.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
 		"SolderingAdvancedPowerPrompt": "Снага: ",
 		"OffString": "Иск",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json
index 5eeb9fd0..573e99fa 100644
--- a/Translations/translation_SR_LATN.json
+++ b/Translations/translation_SR_LATN.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Isk",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json
index 7c63b4c6..da04a036 100644
--- a/Translations/translation_SV.json
+++ b/Translations/translation_SV.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "SPETS URTAGEN",
 		"SolderingAdvancedPowerPrompt": "Ström: ",
 		"OffString": "Av",
-		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
 			"Settings were",
 			"reset!"
diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json
index 4768d0f8..7092bc70 100644
--- a/Translations/translation_TR.json
+++ b/Translations/translation_TR.json
@@ -21,10 +21,13 @@
 		"TipDisconnectedString": "UÇ ÇIKARILDI",
 		"SolderingAdvancedPowerPrompt": "Güç: ",
 		"OffString": "Kapalı",
-		"ResetOKMessage": "Sıfırlama Tamam",
 		"YourGainMessage": "Kazancınız:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": [
+			"Sıfırlama Tamam",
+			""
+		],
 		"SettingsResetMessage": [
 			"Ayarlar",
 			"Sıfırlandı"
diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
index 542da8f2..94959c8a 100644
--- a/Translations/translation_UK.json
+++ b/Translations/translation_UK.json
@@ -21,10 +21,10 @@
 		"TipDisconnectedString": "Жало вимкнено!",
 		"SolderingAdvancedPowerPrompt": "Живлення: ",
 		"OffString": "Вимк",
-		"ResetOKMessage": "Скид. OK",
 		"YourGainMessage": "Приріст:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "Скид. OK",
 		"SettingsResetMessage": [
 			"Налаштування",
 			"скинуті!"
diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json
index d2562ec0..c448694b 100644
--- a/Translations/translation_YUE_HK.json
+++ b/Translations/translation_YUE_HK.json
@@ -22,10 +22,10 @@
 		"TipDisconnectedString": "NO TIP",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "關",
-		"ResetOKMessage": "已重設！",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "已重設！",
 		"SettingsResetMessage": "設定已被重設！",
 		"NoAccelerometerMessage": [
 			"No accelerometer",
diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json
index 79c15a24..f70e0ed4 100644
--- a/Translations/translation_ZH_TW.json
+++ b/Translations/translation_ZH_TW.json
@@ -22,10 +22,10 @@
 		"TipDisconnectedString": "NO TIP",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "關",
-		"ResetOKMessage": "已重設！",
 		"YourGainMessage": "Your gain:"
 	},
 	"messagesWarn": {
+		"ResetOKMessage": "已重設！",
 		"SettingsResetMessage": "設定已被重設！",
 		"NoAccelerometerMessage": [
 			"No accelerometer",
diff --git a/Translations/translations_def.js b/Translations/translations_def.js
index 0f79c20d..67106dbe 100644
--- a/Translations/translations_def.js
+++ b/Translations/translations_def.js
@@ -81,10 +81,6 @@ var def =
 			"id": "OffString",
 			"maxLen": 3
 		},
-		{
-			"id": "ResetOKMessage",
-			"maxLen": 8
-		},
 		{
 			"id": "YourGainMessage",
 			"maxLen": 8,
@@ -92,6 +88,9 @@ var def =
 		}
 	],
 	"messagesWarn": [
+		{
+			"id": "ResetOKMessage"
+		},
 		{
 			"id": "SettingsResetMessage"
 		},
diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h
index e8461976..69c96a34 100644
--- a/source/Core/Inc/Translation.h
+++ b/source/Core/Inc/Translation.h
@@ -35,9 +35,9 @@ extern const char *IdleSetString;
 extern const char *TipDisconnectedString;
 extern const char *SolderingAdvancedPowerPrompt;
 extern const char *OffString;
-extern const char *ResetOKMessage;
 extern const char *YourGainMessage;
 
+extern const char *ResetOKMessage;
 extern const char *SettingsResetMessage;
 extern const char *NoAccelerometerMessage;
 extern const char *NoPowerDeliveryMessage;
diff --git a/source/Core/Inc/gui.hpp b/source/Core/Inc/gui.hpp
index 0ddd9365..45e9f288 100644
--- a/source/Core/Inc/gui.hpp
+++ b/source/Core/Inc/gui.hpp
@@ -29,6 +29,7 @@ typedef struct {
 
 void                  enterSettingsMenu();
 void                  GUIDelay();
+void                  warnUser(const char *warning, const int timeout);
 extern const menuitem rootSettingsMenu[];
 
 #endif /* GUI_HPP_ */
diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp
index 72b6b320..8c907521 100644
--- a/source/Core/Src/gui.cpp
+++ b/source/Core/Src/gui.cpp
@@ -711,13 +711,7 @@ static bool settings_displayCoolingBlinkEnabled(void) {
 static bool settings_setResetSettings(void) {
   if (userConfirmation(SettingsResetWarning)) {
     resetSettings();
-
-    OLED::clearScreen();
-    OLED::setCursor(0, 0);
-    OLED::print(ResetOKMessage, FontStyle::LARGE);
-    OLED::refresh();
-
-    waitForButtonPressOrTimeout(2000); // 2 second timeout
+    warnUser(ResetOKMessage, 2 * TICKS_SECOND);
   }
   return false;
 }
@@ -801,7 +795,7 @@ static bool settings_setCalibrateVIN(void) {
       OLED::setCursor(0, 0);
       OLED::printNumber(systemSettings.voltageDiv, 3, FontStyle::LARGE);
       OLED::refresh();
-      waitForButtonPressOrTimeout(1000);
+      waitForButtonPressOrTimeout(1 * TICKS_SECOND);
       return false;
     case BUTTON_NONE:
     default: