diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index b86059895..d35240952 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3376,7 +3376,7 @@ static void mmu_M600_load_filament(bool automatic) {
         slot = SpoolJoin::spooljoin.nextSlot();
     } else {
         // Only ask for the slot if automatic/SpoolJoin is off
-        slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT));
+        slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT);
     }
 
     setTargetHotend(saved_extruder_temperature);
diff --git a/Firmware/Tcodes.cpp b/Firmware/Tcodes.cpp
index 8e8e28009..355978aac 100644
--- a/Firmware/Tcodes.cpp
+++ b/Firmware/Tcodes.cpp
@@ -31,7 +31,7 @@ void TCodes(char *const strchr_pointer, const uint8_t codeValue) {
     } else if (strchr_pointer[index] == 'x' || strchr_pointer[index] == '?'){
         // load to extruder gears; if mmu is not present do nothing
         if (MMU2::mmu2.Enabled()) {
-            MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)));
+            MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT));
         }
     } else if (strchr_pointer[index] == 'c'){
         // load from extruder gears to nozzle (nozzle should be preheated)
diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp
index a1904f684..024defe7c 100644
--- a/Firmware/messages.cpp
+++ b/Firmware/messages.cpp
@@ -35,7 +35,6 @@ const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////MSG_ERROR c=10
 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////MSG_EXTRUDER c=17
 const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////MSG_FANS_CHECK c=13
 const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////MSG_FIL_RUNOUTS c=15
-const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////MSG_FILAMENT c=17
 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////MSG_FAN_SPEED c=14
 const char MSG_HOTEND_FAN_SPEED[] PROGMEM_I1 = ISTR("Hotend fan:");////MSG_HOTEND_FAN_SPEED c=15
 const char MSG_PRINT_FAN_SPEED[] PROGMEM_I1 = ISTR("Print fan:"); ////MSG_PRINT_FAN_SPEED c=15
@@ -380,6 +379,7 @@ extern const char MSG_FW_MK3_DETECTED [] PROGMEM_I1 = ISTR(PRINTER_NAME " firmwa
 //not internationalized messages
 const char MSG_SPOOL_JOIN[] PROGMEM_N1 = "SpoolJoin"; ////MSG_SPOOL_JOIN c=13
 const char MSG_FIRMWARE[] PROGMEM_N1 = "Firmware"; ////MSG_FIRMWARE c=8
+const char MSG_FILAMENT[] PROGMEM_N1 = "Filament"; ////MSG_FILAMENT c=8
 const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = "FlashAir"; ////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
 const char MSG_PINDA[] PROGMEM_N1 = "PINDA"; ////MSG_PINDA c=5
 const char MSG_WELCOME[] PROGMEM_N1 = WELCOME_MSG;
diff --git a/Firmware/messages.h b/Firmware/messages.h
index 1bb01fe56..c53ab966b 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -38,7 +38,6 @@ extern const char MSG_ERROR[];
 extern const char MSG_EXTRUDER[];
 extern const char MSG_FANS_CHECK[];
 extern const char MSG_FIL_RUNOUTS[];
-extern const char MSG_FILAMENT[];
 extern const char MSG_FAN_SPEED[];
 extern const char MSG_HOTEND_FAN_SPEED[];
 extern const char MSG_PRINT_FAN_SPEED[];
@@ -380,6 +379,7 @@ extern const char MSG_FW_MK3_DETECTED [];
 //not internationalized messages
 extern const char MSG_SPOOL_JOIN[];
 extern const char MSG_FIRMWARE[];
+extern const char MSG_FILAMENT[];
 extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[];
 extern const char MSG_PINDA[];
 extern const char MSG_WELCOME[];
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 34e509a82..eaf26d4b5 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3620,7 +3620,7 @@ void lcd_v2_calibration() {
 	if (MMU2::mmu2.Enabled()) {
 		const uint8_t filament = choose_menu_P(
 			_T(MSG_SELECT_FILAMENT),
-			_T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
+			MSG_FILAMENT,(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
 		if (filament < MMU_FILAMENT_COUNT) {
 			lay1cal_filament = filament;
 		} else {
@@ -6787,7 +6787,7 @@ static bool lcd_selftest_fsensor(void)
 static bool selftest_irsensor()
 {
     // Ask user which slot to load filament from
-    uint8_t slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT));
+    uint8_t slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT);
 
     // Render self-test screen
     lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0);
diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot
index 8a2788ac6..387fb863e 100644
--- a/lang/po/Firmware.pot
+++ b/lang/po/Firmware.pot
@@ -674,13 +674,6 @@ msgstr ""
 msgid "Fil. sensor"
 msgstr ""
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr ""
-
 #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:339
 msgid ""
diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po
index 70ba9923f..bc13edf73 100644
--- a/lang/po/Firmware_cs.po
+++ b/lang/po/Firmware_cs.po
@@ -680,13 +680,6 @@ msgstr "Výpadky filam."
 msgid "Fil. sensor"
 msgstr "Fil. senzor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po
index f0d67feb8..63d5eb224 100644
--- a/lang/po/Firmware_de.po
+++ b/lang/po/Firmware_de.po
@@ -682,13 +682,6 @@ msgstr "Fil. Mängel"
 msgid "Fil. sensor"
 msgstr "Fil. Sensor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
index 75b7d9eff..dbbdd6a42 100644
--- a/lang/po/Firmware_es.po
+++ b/lang/po/Firmware_es.po
@@ -686,13 +686,6 @@ msgstr "Fil. acabado"
 msgid "Fil. sensor"
 msgstr "Sensor Fil."
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filamento"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po
index 7fed179c0..77eb838f9 100644
--- a/lang/po/Firmware_fr.po
+++ b/lang/po/Firmware_fr.po
@@ -690,13 +690,6 @@ msgstr "Fins filament"
 msgid "Fil. sensor"
 msgstr "Capteur Fil."
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po
index 97e276bd4..964ed037d 100644
--- a/lang/po/Firmware_hr.po
+++ b/lang/po/Firmware_hr.po
@@ -684,13 +684,6 @@ msgstr "Bez filmaneta"
 msgid "Fil. sensor"
 msgstr "Fil. senzor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po
index 964cf1cce..6cbb7b3b9 100644
--- a/lang/po/Firmware_hu.po
+++ b/lang/po/Firmware_hu.po
@@ -687,13 +687,6 @@ msgstr "Fil. kifutasok"
 msgid "Fil. sensor"
 msgstr "Fil. szenzor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po
index bbad28db9..f74497432 100644
--- a/lang/po/Firmware_it.po
+++ b/lang/po/Firmware_it.po
@@ -688,13 +688,6 @@ msgstr "Fil. esauriti"
 msgid "Fil. sensor"
 msgstr "Sensore fil."
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filamento"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po
index 0a6c2cfa2..1baf2bb57 100644
--- a/lang/po/Firmware_nl.po
+++ b/lang/po/Firmware_nl.po
@@ -689,13 +689,6 @@ msgstr "Fil. fouten"
 msgid "Fil. sensor"
 msgstr "Fil. sensor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po
index 84d7a6fac..d8f7cf6fd 100644
--- a/lang/po/Firmware_no.po
+++ b/lang/po/Firmware_no.po
@@ -687,13 +687,6 @@ msgstr "Tomt filament"
 msgid "Fil. sensor"
 msgstr "Fil. Sensor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po
index 21e715611..3839b49ff 100644
--- a/lang/po/Firmware_pl.po
+++ b/lang/po/Firmware_pl.po
@@ -689,13 +689,6 @@ msgstr "Końc. filamentu"
 msgid "Fil. sensor"
 msgstr "Czuj. filam."
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po
index 2d160a62c..402122be9 100644
--- a/lang/po/Firmware_ro.po
+++ b/lang/po/Firmware_ro.po
@@ -689,13 +689,6 @@ msgstr "Epuizări Fil."
 msgid "Fil. sensor"
 msgstr "Senzor Fil."
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po
index c7abaf3c8..4c14e9d99 100644
--- a/lang/po/Firmware_sk.po
+++ b/lang/po/Firmware_sk.po
@@ -686,13 +686,6 @@ msgstr "Výpadky filam."
 msgid "Fil. sensor"
 msgstr "Fil. senzor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265
diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po
index 0b24d7a37..89b077798 100644
--- a/lang/po/Firmware_sv.po
+++ b/lang/po/Firmware_sv.po
@@ -687,13 +687,6 @@ msgstr "Fil. avbrott"
 msgid "Fil. sensor"
 msgstr "Fil. sensor"
 
-#. MSG_FILAMENT c=17
-#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
-#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
-#: ../../Firmware/ultralcd.cpp:6822
-msgid "Filament"
-msgstr "Filament"
-
 #. MSG_FILAMENT_CLEAN c=20 r=3
 #: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
 #: ../../Firmware/ultralcd.cpp:2265