diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
index 0b820b45..2e4c5b96 100644
--- a/Translations/translation_PL.json
+++ b/Translations/translation_PL.json
@@ -48,15 +48,15 @@
 		"SettingLockDisableChar": "W",
 		"SettingLockBoostChar": "B",
 		"SettingLockFullChar": "P",
-		"SettingNAChar": "N/A"
+		"SettingNAChar": "N/D"
 	},
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": [
-				"Power",
-				"settings"
+				"Ustawienia",
+				"zasilania"
 			],
-			"desc": "Power settings"
+			"desc": "Zasilanie i minimalne napięcie na komórkę"
 		},
 		"SolderingMenu": {
 			"text2": [
@@ -286,10 +286,10 @@
 		},
 		"MinVolCell": {
 			"text2": [
-				"Minimum",
-				"voltage"
+				"Minimalne",
+				"napięcie"
 			],
-			"desc": "Minimum allowed voltage per cell"
+			"desc": "Minimalne dozwolone napięcie na komórkę <W woltach> <3S — 3.0V - 3.7V, 4/5/6S — 2.4V - 3.7V>"
 		}
 	}
 }
diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
index 49f7240b..29621499 100644
--- a/Translations/translation_RU.json
+++ b/Translations/translation_RU.json
@@ -7,7 +7,7 @@
 		"SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь, что жало имеет комнатную температуру!",
 		"SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?",
 		"UVLOWarningString": "НАПРЯЖ--",
-		"UndervoltageString": "Низкое\nнапряжение",
+		"UndervoltageString": "Низкое напряжение",
 		"InputVoltageString": "Питание В: ",
 		"WarningTipTempString": "Темп. жала: ",
 		"BadTipString": "ЖАЛО--",
@@ -47,15 +47,15 @@
 		"SettingLockDisableChar": "О",
 		"SettingLockBoostChar": "Т",
 		"SettingLockFullChar": "П",
-		"SettingNAChar": "N/A"
+		"SettingNAChar": "Н/Д"
 	},
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": [
-				"Power",
-				"settings"
+				"Параметры",
+				"питания"
 			],
-			"desc": "Power settings"
+			"desc": "Источник питания и минимальное напряжение на ячейку"
 		},
 		"SolderingMenu": {
 			"text2": [
@@ -285,10 +285,10 @@
 		},
 		"MinVolCell": {
 			"text2": [
-				"Minimum",
-				"voltage"
+				"Мин.",
+				"напр."
 			],
-			"desc": "Minimum allowed voltage per cell"
+			"desc": "Минимальное разрешенное напряжение на ячейку <В вольтах> <3S — 3.0V - 3.7V, 4/5/6S — 2.4V - 3.7V>"
 		}
 	}
 }
diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
index 6a17ec53..38a7c6eb 100644
--- a/Translations/translation_UK.json
+++ b/Translations/translation_UK.json
@@ -7,7 +7,7 @@
 		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
 		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? <A - Так, В - Ні>",
 		"UVLOWarningString": "АККУМ--",
-		"UndervoltageString": "Низька\nнапруга",
+		"UndervoltageString": "Низька напруга",
 		"InputVoltageString": "Жив.(B): ",
 		"WarningTipTempString": "Жало t°: ",
 		"BadTipString": "ЖАЛО--",
@@ -47,15 +47,15 @@
 		"SettingLockDisableChar": "В",
 		"SettingLockBoostChar": "Т",
 		"SettingLockFullChar": "П",
-		"SettingNAChar": "N/A"
+		"SettingNAChar": "Н/Д"
 	},
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": [
-				"Power",
-				"settings"
+				"Параметри",
+				"живлення"
 			],
-			"desc": "Power settings"
+			"desc": "Джерело живлення, та мінамільна напруга на комірку"
 		},
 		"SolderingMenu": {
 			"text2": [
@@ -285,10 +285,10 @@
 		},
 		"MinVolCell": {
 			"text2": [
-				"Minimum",
-				"voltage"
+				"Мін.",
+				"напруга"
 			],
-			"desc": "Minimum allowed voltage per cell"
+			"desc": "Мінімальна дозволена напруга на комірку <В вольтах> <3S — 3.0V - 3.7V, 4/5/6S — 2.4V - 3.7V>"
 		}
 	}
 }
diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp
index 945eab36..9b9f254f 100644
--- a/source/Core/Src/gui.cpp
+++ b/source/Core/Src/gui.cpp
@@ -310,7 +310,7 @@ static bool settings_setInputVRange(void) {
   systemSettings.minDCVoltageCells = (systemSettings.minDCVoltageCells + 1) % 5;
   if (systemSettings.minDCVoltageCells == 1 && systemSettings.minVoltageCells < 30)
     systemSettings.minVoltageCells = 30;
-  return systemSettings.minDCVoltageCells == 5;
+  return systemSettings.minDCVoltageCells == 4;
 }
 
 static void settings_displayInputVRange(void) {
@@ -330,7 +330,7 @@ static bool settings_setInputMinVRange(void) {
     systemSettings.minVoltageCells = 30;
   else if(systemSettings.minVoltageCells < 24)
     systemSettings.minVoltageCells = 24;
-  return systemSettings.minVoltageCells == 38;
+  return systemSettings.minVoltageCells == 37;
 }
 
 static void settings_displayInputMinVRange(void) {
diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index 1fbb14f8..f58a1e8c 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -159,10 +159,10 @@ static void gui_drawBatteryIcon() {
     uint8_t  cellCount = systemSettings.minDCVoltageCells + 2;
     uint32_t cellV     = getInputVoltageX10(systemSettings.voltageDiv, 0) / cellCount;
     // Should give us approx cell voltage X10
-    // Range is 42 -> 33 = 9 steps therefore we will use battery 0-9
-    if (cellV < 33)
-      cellV = 33;
-    cellV -= 33; // Should leave us a number of 0-9
+    // Range is 42 -> Minimum voltage setting (systemSettings.minVoltageCells) = 9 steps therefore we will use battery 0-9
+    if (cellV < systemSettings.minVoltageCells)
+      cellV = systemSettings.minVoltageCells;
+    cellV -= systemSettings.minVoltageCells; // Should leave us a number of 0-9
     if (cellV > 9)
       cellV = 9;
     OLED::drawBattery(cellV + 1);