diff --git a/lib/libimhex/source/api/content_registry.cpp b/lib/libimhex/source/api/content_registry.cpp
index 42dbc5595..c7e7b6cf2 100644
--- a/lib/libimhex/source/api/content_registry.cpp
+++ b/lib/libimhex/source/api/content_registry.cpp
@@ -882,7 +882,7 @@ namespace hex {
                     continue;
                 }
 
-                translationDefinitions.emplace(key, value.get<std::string>());
+                translationDefinitions.emplace(std::move(key), value.get<std::string>());
             }
 
             (*impl::s_definitions)[code.get<std::string>()].emplace_back(std::move(translationDefinitions));
diff --git a/lib/libimhex/source/api/localization_manager.cpp b/lib/libimhex/source/api/localization_manager.cpp
index 31be5b8c5..07dcff81c 100644
--- a/lib/libimhex/source/api/localization_manager.cpp
+++ b/lib/libimhex/source/api/localization_manager.cpp
@@ -28,13 +28,10 @@ namespace hex {
         }
 
         LanguageDefinition::LanguageDefinition(std::map<std::string, std::string> &&entries) {
-            for (const auto &[key, value] : entries) {
-                if (value.empty())
-                    continue;
-
-                m_entries.insert({ key, value });
-            }
-
+            m_entries = std::move(entries);
+            std::erase_if(m_entries, [](const auto &entry) {
+                return entry.second.empty();
+            });
         }
 
         const std::map<std::string, std::string> &LanguageDefinition::getEntries() const {
diff --git a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp
index 7c9607f45..57517ea82 100644
--- a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp
+++ b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp
@@ -446,7 +446,7 @@ namespace ImGuiExt {
         ImGuiContext &g         = *GImGui;
         const ImGuiStyle &style = g.Style;
         const ImGuiID id        = window->GetID(label);
-        const ImVec2 text_size  = CalcTextSize((std::string(label) + "\n  " + std::string(description)).c_str(), nullptr, true);
+        const ImVec2 text_size  = CalcTextSize(label, nullptr, true) + CalcTextSize(description, nullptr, true);
         const ImVec2 label_size = CalcTextSize(label, nullptr, true);
 
         ImVec2 pos = window->DC.CursorPos;