diff --git a/lib/libimhex/include/hex/api/content_registry/settings.hpp b/lib/libimhex/include/hex/api/content_registry/settings.hpp
index 406ee09cd..b0fd0cfc7 100644
--- a/lib/libimhex/include/hex/api/content_registry/settings.hpp
+++ b/lib/libimhex/include/hex/api/content_registry/settings.hpp
@@ -52,7 +52,7 @@ EXPORT_MODULE namespace hex {
                         return *this;
                     }
 
-                    Interface& setTooltip(const std::string &tooltip) {
+                    Interface& setTooltip(const UnlocalizedString &tooltip) {
                         m_tooltip = tooltip;
 
                         return *this;
diff --git a/plugins/builtin/romfs/lang/en_US.json b/plugins/builtin/romfs/lang/en_US.json
index fcb8e1145..75102a871 100644
--- a/plugins/builtin/romfs/lang/en_US.json
+++ b/plugins/builtin/romfs/lang/en_US.json
@@ -54,7 +54,8 @@
     "hex.builtin.achievement.misc.download_from_store.name": "There's an app for that",
     "hex.builtin.achievement.misc.download_from_store.desc": "Download any item from the Content Store",
     "hex.builtin.background_service.network_interface": "Network Interface",
-    "hex.builtin.setting.general.mcp_server": "MCP Server support",
+    "hex.builtin.setting.general.mcp_server": "MCP Server",
+    "hex.builtin.setting.general.mcp_server.desc": "When enabled, AI clients can interact with ImHex while it's running. After enabling, simply add 'imhex --mcp' as an stdio MCP server to your AI client.",
     "hex.builtin.background_service.auto_backup": "Auto Backup",
     "hex.builtin.command.calc.desc": "Calculator",
     "hex.builtin.command.convert.desc": "Unit conversion",
@@ -78,6 +79,7 @@
     "hex.builtin.inspector.binary": "Binary",
     "hex.builtin.inspector.bfloat16": "bfloat16",
     "hex.builtin.inspector.bool": "bool",
+    "hex.builtin.inspector.bcd": "BCD",
     "hex.builtin.inspector.custom_encoding": "Custom Encoding",
     "hex.builtin.inspector.custom_encoding.change": "Select encoding",
     "hex.builtin.inspector.custom_encoding.no_encoding": "No encoding selected",
diff --git a/plugins/builtin/source/content/settings_entries.cpp b/plugins/builtin/source/content/settings_entries.cpp
index 28c84cb05..270892755 100644
--- a/plugins/builtin/source/content/settings_entries.cpp
+++ b/plugins/builtin/source/content/settings_entries.cpp
@@ -762,7 +762,8 @@ for (const auto &path : m_paths) {
 
             ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.network_interface", false);
 
-            ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.mcp_server", false);
+            ContentRegistry::Settings::add<Widgets::Checkbox>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.mcp_server", false)
+                .setTooltip("hex.builtin.setting.general.mcp_server.desc");
 
             #if !defined(OS_WEB)
                 ContentRegistry::Settings::add<ServerContactWidget>("hex.builtin.setting.general", "hex.builtin.setting.general.network", "hex.builtin.setting.general.server_contact");