diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json
index 72ddf0f511..327f760d74 100644
--- a/Translations/translation_BE.json
+++ b/Translations/translation_BE.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Беларуская",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Каліброўка\nзроблена!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json
index 72b4f49fe4..afc756ba8b 100644
--- a/Translations/translation_BG.json
+++ b/Translations/translation_BG.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Български",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json
index fb4c4d1f05..05279d4685 100644
--- a/Translations/translation_CS.json
+++ b/Translations/translation_CS.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Český",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Kalibrace\ndokončena!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json
index 12625a67ce..5b42beb502 100644
--- a/Translations/translation_DA.json
+++ b/Translations/translation_DA.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Dansk",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json
index 8ba129a3d3..c93cc0e41d 100644
--- a/Translations/translation_DE.json
+++ b/Translations/translation_DE.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Deutsch",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Erfolgreich\nkalibriert!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json
index ae81203d90..83600bbc2e 100644
--- a/Translations/translation_EL.json
+++ b/Translations/translation_EL.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Greek",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Βαθμονόμηση\nολοκληρώθηκε!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json
index 874095628c..e33e8b6a70 100644
--- a/Translations/translation_EN.json
+++ b/Translations/translation_EN.json
@@ -3,7 +3,7 @@
     "languageLocalName": "English",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json
index ad352fd3d7..803db9f1ea 100644
--- a/Translations/translation_ES.json
+++ b/Translations/translation_ES.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Castellano",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "¡Calibracion\nlista!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json
index 9bb4e90c5a..bc2ccc17a7 100644
--- a/Translations/translation_FI.json
+++ b/Translations/translation_FI.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Suomi",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json
index 1078b29a96..04b15e645b 100644
--- a/Translations/translation_FR.json
+++ b/Translations/translation_FR.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Français",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Étalonnage\nterminé!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json
index 093e66f781..cf0aa44718 100644
--- a/Translations/translation_HR.json
+++ b/Translations/translation_HR.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Hrvatski",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Kalibracija\ndovršena!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json
index 449a28c310..cc55dd7270 100644
--- a/Translations/translation_HU.json
+++ b/Translations/translation_HU.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Magyar",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Kalibráció\nkész!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json
index e1b7d32be4..52a631c0a2 100644
--- a/Translations/translation_IT.json
+++ b/Translations/translation_IT.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Italiano",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibrazione\ncompletata!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json
index 74a3cd0cfb..df58ce7905 100755
--- a/Translations/translation_JA_JP.json
+++ b/Translations/translation_JA_JP.json
@@ -3,7 +3,7 @@
     "languageLocalName": "日本語",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration done!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json
index 96387be6d9..b4c2b53f99 100644
--- a/Translations/translation_LT.json
+++ b/Translations/translation_LT.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Lietuvių",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json
index f716171fbd..f8b4b9a7d6 100644
--- a/Translations/translation_NB.json
+++ b/Translations/translation_NB.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Norsk bokmål",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json
index 4a1d2d5633..e775541e52 100644
--- a/Translations/translation_NL.json
+++ b/Translations/translation_NL.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Nederlands",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json
index 29767d8ebf..8cfd64ef3c 100644
--- a/Translations/translation_NL_BE.json
+++ b/Translations/translation_NL_BE.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Vlaams",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
index 604e8e29e5..0ca28f206a 100644
--- a/Translations/translation_PL.json
+++ b/Translations/translation_PL.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Polski",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Kalibracja\nwykonana!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json
index 13078f7fba..feac8a17b6 100644
--- a/Translations/translation_PT.json
+++ b/Translations/translation_PT.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Português",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibração\nefetuada!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json
index b40e8d16f4..857e94202b 100644
--- a/Translations/translation_RO.json
+++ b/Translations/translation_RO.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Română",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
index 626508192d..225afa6ff8 100644
--- a/Translations/translation_RU.json
+++ b/Translations/translation_RU.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Русский",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Калибровка\nзавершена!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json
index b0b550ad23..b8c50c9409 100644
--- a/Translations/translation_SK.json
+++ b/Translations/translation_SK.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Slovenčina",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json
index 5e7d2d6dd0..6063abec08 100644
--- a/Translations/translation_SL.json
+++ b/Translations/translation_SL.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Slovenščina",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json
index 6d8ab8a39b..473fb3d2f4 100644
--- a/Translations/translation_SR_CYRL.json
+++ b/Translations/translation_SR_CYRL.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Српски",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json
index c3eedfcbd0..50f1b46bae 100644
--- a/Translations/translation_SR_LATN.json
+++ b/Translations/translation_SR_LATN.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Srpski",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json
index 58d6f6d8c4..4d70fe90f9 100644
--- a/Translations/translation_SV.json
+++ b/Translations/translation_SV.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Svenska",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json
index 3a22cd1960..e63b49bdc6 100644
--- a/Translations/translation_TR.json
+++ b/Translations/translation_TR.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Türkçe",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
index 03a470570f..48ea65e492 100644
--- a/Translations/translation_UK.json
+++ b/Translations/translation_UK.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Українська",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "КХС\nвідкалібровано!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json
index 10c36e0b06..9b5c8fa569 100644
--- a/Translations/translation_VI.json
+++ b/Translations/translation_VI.json
@@ -3,7 +3,7 @@
     "languageLocalName": "Tieng Viet",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json
index 745e6801aa..b02c91777a 100644
--- a/Translations/translation_YUE_HK.json
+++ b/Translations/translation_YUE_HK.json
@@ -3,7 +3,7 @@
     "languageLocalName": "廣東話 (香港)",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration done!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json
index de08f69672..b5180addcf 100644
--- a/Translations/translation_ZH_CN.json
+++ b/Translations/translation_ZH_CN.json
@@ -3,7 +3,7 @@
     "languageLocalName": "简体中文",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration done!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json
index 1094e3aab0..9151fea852 100644
--- a/Translations/translation_ZH_TW.json
+++ b/Translations/translation_ZH_TW.json
@@ -3,7 +3,7 @@
     "languageLocalName": "正體中文",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration done!"
         },
         "ResetOKMessage": {
diff --git a/Translations/translations_definitions.json b/Translations/translations_definitions.json
index 96d237b7e9..2a9a567ee0 100644
--- a/Translations/translations_definitions.json
+++ b/Translations/translations_definitions.json
@@ -1,7 +1,7 @@
 {
     "messagesWarn": [{
-            "id": "CJCCalibrationDone",
-            "description": "Confirmation message indicating CJC calibration is complete."
+            "id": "CalibrationDone",
+            "description": "Confirmation message indicating calibration is complete."
         },
         {
             "id": "ResetOKMessage",
diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h
index 1f1f39649d..45632edad4 100644
--- a/source/Core/Inc/Translation.h
+++ b/source/Core/Inc/Translation.h
@@ -107,7 +107,7 @@ enum class SettingsItemIndex : uint8_t {
 };
 
 struct TranslationIndexTable {
-  uint16_t CJCCalibrationDone;
+  uint16_t CalibrationDone;
   uint16_t ResetOKMessage;
   uint16_t SettingsResetMessage;
   uint16_t NoAccelerometerMessage;
diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp
index 87a17b6ac1..9542b08c9c 100644
--- a/source/Core/Src/settingsGUI.cpp
+++ b/source/Core/Src/settingsGUI.cpp
@@ -884,19 +884,21 @@ static bool setCalibrateVIN(void) {
   OLED::clearScreen();
 
   for (;;) {
-    OLED::setCursor(0, 0);
+    OLED::setCursor(25, 0);
     uint16_t voltage = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0);
     OLED::printNumber(voltage / 10, 2, FontStyle::LARGE);
     OLED::print(LargeSymbolDot, FontStyle::LARGE);
     OLED::printNumber(voltage % 10, 1, FontStyle::LARGE, false);
     OLED::print(LargeSymbolVolts, FontStyle::LARGE);
+    OLED::setCursor(0, 8);
+    OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::SMALL);
 
     switch (getButtonState()) {
     case BUTTON_F_SHORT:
-      nextSettingValue(SettingsOptions::VoltageDiv);
+      prevSettingValue(SettingsOptions::VoltageDiv);
       break;
     case BUTTON_B_SHORT:
-      prevSettingValue(SettingsOptions::VoltageDiv);
+      nextSettingValue(SettingsOptions::VoltageDiv);
       break;
     case BUTTON_BOTH:
     case BUTTON_F_LONG:
@@ -904,9 +906,9 @@ static bool setCalibrateVIN(void) {
       saveSettings();
       OLED::clearScreen();
       OLED::setCursor(0, 0);
-      OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::LARGE);
+      warnUser(translatedString(Tr->CalibrationDone), 3 * TICKS_SECOND);
       OLED::refresh();
-      waitForButtonPressOrTimeout(1 * TICKS_SECOND);
+      waitForButtonPressOrTimeout(0.5 * TICKS_SECOND);
       return false;
     case BUTTON_NONE:
     default:
diff --git a/source/Core/Threads/OperatingModes/CJC.cpp b/source/Core/Threads/OperatingModes/CJC.cpp
index 25fef8d8b4..4da688f96e 100644
--- a/source/Core/Threads/OperatingModes/CJC.cpp
+++ b/source/Core/Threads/OperatingModes/CJC.cpp
@@ -30,7 +30,7 @@ void performCJCC(void) {
     }
     setSettingValue(SettingsOptions::CalibrationOffset, setoffset);
     OLED::clearScreen();
-    warnUser(translatedString(Tr->CJCCalibrationDone), 3 * TICKS_SECOND);
+    warnUser(translatedString(Tr->CalibrationDone), 3 * TICKS_SECOND);
     OLED::refresh();
     // Preventing to repeat calibration at boot automatically (only one shot).
     setSettingValue(SettingsOptions::CalibrateCJC, 0);