diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp
index 7126cd834..853dad20f 100644
--- a/Firmware/language_all.cpp
+++ b/Firmware/language_all.cpp
@@ -553,14 +553,14 @@ const char * const MSG_FACTOR_LANG_TABLE[1] PROGMEM = {
 	MSG_FACTOR_EN
 };
 
-const char MSG_FANS_CHECK_OFF_EN[] PROGMEM = "Fans check [OFF]";
+const char MSG_FANS_CHECK_OFF_EN[] PROGMEM = "Fans check  [off]";
 const char MSG_FANS_CHECK_OFF_CZ[] PROGMEM = "Kontr. vent.[vyp]";
 const char * const MSG_FANS_CHECK_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_FANS_CHECK_OFF_EN,
 	MSG_FANS_CHECK_OFF_CZ
 };
 
-const char MSG_FANS_CHECK_ON_EN[] PROGMEM = "Fans check [ON]";
+const char MSG_FANS_CHECK_ON_EN[] PROGMEM = "Fans check   [on]";
 const char MSG_FANS_CHECK_ON_CZ[] PROGMEM = "Kontr. vent.[zap]";
 const char * const MSG_FANS_CHECK_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_FANS_CHECK_ON_EN,
@@ -1859,15 +1859,15 @@ const char * const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_DONE_CZ
 };
 
-const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal. [OFF]";
-const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal. [OFF]";
+const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal.   [off]";
+const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal.  [vyp]";
 const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_OFF_EN,
 	MSG_TEMP_CALIBRATION_OFF_CZ
 };
 
-const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal. [ON]";
-const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal. [ON]";
+const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal.    [on]";
+const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal.  [zap]";
 const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_ON_EN,
 	MSG_TEMP_CALIBRATION_ON_CZ
diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h
index 14a1ccb95..7e7beaa47 100644
--- a/Firmware/language_cz.h
+++ b/Firmware/language_cz.h
@@ -290,8 +290,8 @@
 #define MSG_PINDA_PREHEAT								"Nahrivani PINDA"
 #define MSG_TEMP_CALIBRATION							"Tepl. kal.          "
 #define MSG_TEMP_CALIBRATION_DONE						"Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka."
-#define MSG_TEMP_CALIBRATION_ON							"Tepl. kal. [ON]"
-#define MSG_TEMP_CALIBRATION_OFF						"Tepl. kal. [OFF]"
+#define MSG_TEMP_CALIBRATION_ON							"Tepl. kal.  [zap]"
+#define MSG_TEMP_CALIBRATION_OFF						"Tepl. kal.  [vyp]"
 #define MSG_PREPARE_FILAMENT							"Pripravte filament"
 #define MSG_ALL											"Vse"
 #define MSG_USED										"Pouzite behem tisku"
diff --git a/Firmware/language_en.h b/Firmware/language_en.h
index 51f61cb5d..b93e4c52d 100644
--- a/Firmware/language_en.h
+++ b/Firmware/language_en.h
@@ -291,8 +291,8 @@
 #define(length=20, lines=1) MSG_PINDA_PREHEAT					"PINDA Heating"
 #define(length=20, lines=1) MSG_TEMP_CALIBRATION				"Temp. cal.          "
 #define(length=20, lines=4) MSG_TEMP_CALIBRATION_DONE			"Temperature calibration is finished. Click to continue."
-#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON				"Temp. cal. [ON]"
-#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF			"Temp. cal. [OFF]"
+#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON				"Temp. cal.    [on]"
+#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF			"Temp. cal.   [off]"
 #define(length=20, lines=1) MSG_PREPARE_FILAMENT				"Prepare new filament"
 #define(length=19, lines=1) MSG_ALL								"All"
 #define(length=19, lines=1) MSG_USED							"Used during print"
@@ -364,5 +364,5 @@
 #define(length=11, lines=1) MSG_INFO_PRINT_FAN				"Print FAN: "
 #define(length=11, lines=1) MSG_INFO_FILAMENT_XDIFF				"Fil. Xd:"
 #define(length=11, lines=1) MSG_INFO_FILAMENT_YDIFF				"Fil. Ydiff:"
-#define(length=17, lines=1) MSG_FANS_CHECK_ON					"Fans check [ON]"
-#define(length=17, lines=1) MSG_FANS_CHECK_OFF					"Fans check [OFF]"
+#define(length=17, lines=1) MSG_FANS_CHECK_ON					"Fans check   [on]"
+#define(length=17, lines=1) MSG_FANS_CHECK_OFF					"Fans check  [off]"
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index c682a70c1..afd0a68d2 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3655,11 +3655,6 @@ static void lcd_settings_menu()
 	  MENU_ITEM(function, MSG_FANS_CHECK_OFF, lcd_set_fan_check);
   }
 
-  if (SilentModeMenu == 0) {
-    MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set);
-  } else {
-    MENU_ITEM(function, MSG_SILENT_MODE_ON, lcd_silent_mode_set);
-  }
 
   if (SilentModeMenu == 0) {
     if (CrashDetectMenu == 0) {
@@ -3674,7 +3669,12 @@ static void lcd_settings_menu()
   else {
 	  MENU_ITEM(function, MSG_TEMP_CALIBRATION_ON, lcd_temp_calibration_set);
   }
-
+  if (SilentModeMenu == 0) {
+	  MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set);
+  }
+  else {
+	  MENU_ITEM(function, MSG_SILENT_MODE_ON, lcd_silent_mode_set);
+  }
 	if (!isPrintPaused && !homing_flag)
 	{
 		MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);