diff --git a/lib/libimhex/include/hex/pattern_language/ast/ast_node_array_variable_decl.hpp b/lib/libimhex/include/hex/pattern_language/ast/ast_node_array_variable_decl.hpp
index 8c2c6c398..8b8a42496 100644
--- a/lib/libimhex/include/hex/pattern_language/ast/ast_node_array_variable_decl.hpp
+++ b/lib/libimhex/include/hex/pattern_language/ast/ast_node_array_variable_decl.hpp
@@ -299,7 +299,7 @@ namespace hex::pl {
             }
 
 
-            if (auto &arrayEntries = arrayPattern->getEntries(); !entries.empty())
+            if (auto &arrayEntries = arrayPattern->getEntries(); !arrayEntries.empty())
                 arrayPattern->setTypeName(arrayEntries.front()->getTypeName());
 
             arrayPattern->setEntries(std::move(entries));
diff --git a/plugins/builtin/source/content/settings_entries.cpp b/plugins/builtin/source/content/settings_entries.cpp
index 6b12b4394..21090dea8 100644
--- a/plugins/builtin/source/content/settings_entries.cpp
+++ b/plugins/builtin/source/content/settings_entries.cpp
@@ -303,6 +303,7 @@ namespace hex::plugin::builtin {
                     }
                 });
             }
+            ImGui::InfoTooltip("hex.builtin.setting.folders.add_folder"_lang);
 
             if (ImGui::IconButton(ICON_VS_REMOVE_CLOSE, ImGui::GetCustomColorVec4(ImGuiCustomCol_DescButton), ImVec2(30, 30))) {
                 if (!folders.empty()) {
@@ -310,6 +311,7 @@ namespace hex::plugin::builtin {
                     ContentRegistry::Settings::write(dirsSetting, dirsSetting, folders);
                 }
             }
+            ImGui::InfoTooltip("hex.builtin.setting.folders.remove_folder"_lang);
 
             ImGui::EndGroup();
 
diff --git a/plugins/builtin/source/content/views/view_settings.cpp b/plugins/builtin/source/content/views/view_settings.cpp
index 74f65f3b9..decdc8ac2 100644
--- a/plugins/builtin/source/content/views/view_settings.cpp
+++ b/plugins/builtin/source/content/views/view_settings.cpp
@@ -50,7 +50,9 @@ namespace hex::plugin::builtin {
                     auto &[category, settings] = *it;
                     if (ImGui::BeginTabItem(LangEntry(category))) {
                         const std::string &categoryDesc = descriptions.count(category) ? descriptions.at(category) : category.name;
-                        ImGui::TextUnformatted(LangEntry(categoryDesc));
+                        LangEntry descriptionEntry{categoryDesc};
+                        ImGui::TextUnformatted(descriptionEntry);
+                        ImGui::InfoTooltip(descriptionEntry);
                         ImGui::Separator();
 
                         for (auto &[name, requiresRestart, callback] : settings) {
diff --git a/plugins/builtin/source/lang/de_DE.cpp b/plugins/builtin/source/lang/de_DE.cpp
index db53ed8c2..107927f45 100644
--- a/plugins/builtin/source/lang/de_DE.cpp
+++ b/plugins/builtin/source/lang/de_DE.cpp
@@ -676,6 +676,8 @@ namespace hex::plugin::builtin {
                     { "hex.builtin.setting.hex_editor.extra_info", "Extra informationen anzeigen" },
                 { "hex.builtin.setting.folders", "Ordner" },
                     { "hex.builtin.setting.folders.description", "Gib zusätzliche Orderpfade an in welchen Pattern, Scripts, Yara Rules und anderes gesucht wird" },
+                    // { "hex.builtin.setting.folders.add_folder", "Add new folder" },
+                    // { "hex.builtin.setting.folders.remove_folder", "Remove currently selected folder from list" },
                 { "hex.builtin.setting.font", "Schriftart" },
                     { "hex.builtin.setting.font.font_path", "Eigene Schriftart" },
                     { "hex.builtin.setting.font.font_size", "Schriftgrösse" },
diff --git a/plugins/builtin/source/lang/en_US.cpp b/plugins/builtin/source/lang/en_US.cpp
index 3fe1c2793..748ff288f 100644
--- a/plugins/builtin/source/lang/en_US.cpp
+++ b/plugins/builtin/source/lang/en_US.cpp
@@ -680,6 +680,8 @@ namespace hex::plugin::builtin {
                     { "hex.builtin.setting.hex_editor.extra_info", "Display extra information" },
                 { "hex.builtin.setting.folders", "Folders" },
                     { "hex.builtin.setting.folders.description", "Specify additional search paths for patterns, scripts, Yara rules and more" },
+                    { "hex.builtin.setting.folders.add_folder", "Add new folder" },
+                    { "hex.builtin.setting.folders.remove_folder", "Remove currently selected folder from list" },
                 { "hex.builtin.setting.font", "Font" },
                     { "hex.builtin.setting.font.font_path", "Custom Font Path" },
                     { "hex.builtin.setting.font.font_size", "Font Size" },
diff --git a/plugins/builtin/source/lang/it_IT.cpp b/plugins/builtin/source/lang/it_IT.cpp
index 7fe81a99d..5801e0ef7 100644
--- a/plugins/builtin/source/lang/it_IT.cpp
+++ b/plugins/builtin/source/lang/it_IT.cpp
@@ -677,6 +677,8 @@ namespace hex::plugin::builtin {
                     { "hex.builtin.setting.hex_editor.extra_info", "Mostra informazioni extra" },
                 //{ "hex.builtin.setting.folders", "Folders" },
                     //{ "hex.builtin.setting.folders.description", "Specify additional search paths for patterns, scripts, rules and more" },
+                    // { "hex.builtin.setting.folders.add_folder", "Add new folder" },
+                    // { "hex.builtin.setting.folders.remove_folder", "Remove currently selected folder from list" },
                 //{ "hex.builtin.setting.font", "Font" },
                     //{ "hex.builtin.setting.font.font_path", "Custom Font Path" },
                     //{ "hex.builtin.setting.font.font_size", "Font Size" },
diff --git a/plugins/builtin/source/lang/ja_JP.cpp b/plugins/builtin/source/lang/ja_JP.cpp
index 647cf1703..fa775fff4 100644
--- a/plugins/builtin/source/lang/ja_JP.cpp
+++ b/plugins/builtin/source/lang/ja_JP.cpp
@@ -678,6 +678,8 @@ namespace hex::plugin::builtin {
                     { "hex.builtin.setting.hex_editor.extra_info", "追加情報を表示" },
                 //{ "hex.builtin.setting.folders", "Folders" },
                     //{ "hex.builtin.setting.folders.description", "Specify additional search paths for patterns, scripts, rules and more" },
+                    // { "hex.builtin.setting.folders.add_folder", "Add new folder" },
+                    // { "hex.builtin.setting.folders.remove_folder", "Remove currently selected folder from list" },
                 //{ "hex.builtin.setting.font", "Font" },
                     //{ "hex.builtin.setting.font.font_path", "Custom Font Path" },
                     //{ "hex.builtin.setting.font.font_size", "Font Size" },
diff --git a/plugins/builtin/source/lang/zh_CN.cpp b/plugins/builtin/source/lang/zh_CN.cpp
index d24ef703f..f7494b979 100644
--- a/plugins/builtin/source/lang/zh_CN.cpp
+++ b/plugins/builtin/source/lang/zh_CN.cpp
@@ -670,8 +670,11 @@ namespace hex::plugin::builtin {
                     { "hex.builtin.setting.hex_editor.grey_zeros", "显示零字节为灰色" },
                     { "hex.builtin.setting.hex_editor.uppercase_hex", "大写Hex字符" },
                     { "hex.builtin.setting.hex_editor.extra_info", "显示额外信息" },
+
                 { "hex.builtin.setting.folders", "扩展搜索路径" },
                     { "hex.builtin.setting.folders.description", "为模式、脚本和规则等指定额外的搜索路径" },
+                 // { "hex.builtin.setting.folders.add_folder", "Add new folder" },
+                 // { "hex.builtin.setting.folders.remove_folder", "Remove currently selected folder from list" },
                 { "hex.builtin.setting.font", "字体" },
                     { "hex.builtin.setting.font.font_path", "自定义字体路径" },
                     { "hex.builtin.setting.font.font_size", "字体大小" },