diff --git a/src/libslic3r/GCode/Thumbnails.cpp b/src/libslic3r/GCode/Thumbnails.cpp
index edafccbea8..6e2b51f764 100644
--- a/src/libslic3r/GCode/Thumbnails.cpp
+++ b/src/libslic3r/GCode/Thumbnails.cpp
@@ -4,6 +4,7 @@
 ///|/
 #include "Thumbnails.hpp"
 #include "../miniz_extension.hpp"
+#include "../format.hpp"
 
 #include <qoi/qoi.h>
 #include <jpeglib.h>
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 23e17e0018..e7c05e8db0 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -22,6 +22,7 @@
 #include "PrintConfig.hpp"
 #include "Config.hpp"
 #include "I18N.hpp"
+#include "format.hpp"
 
 #include "SLA/SupportTree.hpp"
 #include "GCode/Thumbnails.hpp"
@@ -3175,8 +3176,8 @@ void PrintConfigDef::init_fff_params()
 
     def = this->add("use_firmware_retraction", coBool);
     def->label = L("Use firmware retraction");
-    def->tooltip = L("This experimental setting uses G10 and G11 commands to have the firmware "
-                   "handle the retraction. This is only supported in recent Marlin.");
+    def->tooltip = L("This setting uses G10 and G11 commands to have the firmware "
+                   "handle the retraction. Note that this has to be supported by firmware.");
     def->mode = comExpert;
     def->set_default_value(new ConfigOptionBool(false));
 
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index 1e1d3c08bd..0fa39cd106 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -113,7 +113,7 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
             if (!m_disabled)
                 this->edit_custom_gcode(opt_id);
         };
-        field->set_edit_tooltip(_L("Edit CustomG-code"));
+        field->set_edit_tooltip(_L("Edit Custom G-code"));
     }
 
 	field->m_back_to_initial_value = [this](std::string opt_id) {