diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp
index fb151fb9..0deef58d 100644
--- a/src/lib/Application.cpp
+++ b/src/lib/Application.cpp
@@ -13,7 +13,7 @@
 #include "utility/scheduling/TaskScheduler.h"
 #include "utility/tracing.h"
 #include "utility/UserPaths.h"
-#include "utility/utilityQString.h"
+#include "utility/utilityString.h"
 #include "utility/utilityUuid.h"
 #include "utility/Version.h"
 
diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp
index 4dde0459..0d162815 100644
--- a/src/lib/component/controller/CodeController.cpp
+++ b/src/lib/component/controller/CodeController.cpp
@@ -7,7 +7,6 @@
 #include "utility/text/TextAccess.h"
 #include "utility/tracing.h"
 #include "utility/logging/logging.h"
-#include "utility/utilityQString.h"
 #include "utility/utilityString.h"
 
 #include "data/access/StorageAccess.h"
diff --git a/src/lib/data/TaskFinishParsing.cpp b/src/lib/data/TaskFinishParsing.cpp
index d196b371..4e93db76 100644
--- a/src/lib/data/TaskFinishParsing.cpp
+++ b/src/lib/data/TaskFinishParsing.cpp
@@ -7,7 +7,7 @@
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/scheduling/Blackboard.h"
 #include "utility/utility.h"
-#include "utility/utilityQString.h"
+#include "utility/utilityString.h"
 #include "Application.h"
 
 TaskFinishParsing::TaskFinishParsing(
diff --git a/src/lib/utility/ConfigManager.cpp b/src/lib/utility/ConfigManager.cpp
index eead56cf..7e38c041 100644
--- a/src/lib/utility/ConfigManager.cpp
+++ b/src/lib/utility/ConfigManager.cpp
@@ -8,7 +8,6 @@
 #include "utility/text/TextAccess.h"
 #include "utility/utility.h"
 #include "utility/utilityString.h"
-#include "utility/utilityQString.h"
 
 std::shared_ptr<ConfigManager> ConfigManager::createEmpty()
 {
diff --git a/src/lib/utility/logging/LogManager.cpp b/src/lib/utility/logging/LogManager.cpp
index e9620028..611faef0 100644
--- a/src/lib/utility/logging/LogManager.cpp
+++ b/src/lib/utility/logging/LogManager.cpp
@@ -6,7 +6,7 @@
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/utility.h"
 #include "utility/Version.h"
-#include "utility/utilityQString.h"
+#include "utility/utilityString.h"
 
 std::shared_ptr<LogManager> LogManager::getInstance()
 {
diff --git a/src/lib/utility/messaging/type/MessageStatus.cpp b/src/lib/utility/messaging/type/MessageStatus.cpp
index 13444ae0..bc09a4ff 100644
--- a/src/lib/utility/messaging/type/MessageStatus.cpp
+++ b/src/lib/utility/messaging/type/MessageStatus.cpp
@@ -1,6 +1,5 @@
 #include "utility/messaging/type/MessageStatus.h"
 
-#include "utility/utilityQString.h"
 #include "utility/utilityString.h"
 
 MessageStatus::MessageStatus(const std::string& status, bool isError, bool showLoader)
diff --git a/src/lib/utility/utilityString.cpp b/src/lib/utility/utilityString.cpp
index 7ce76ea6..f74fb4e5 100644
--- a/src/lib/utility/utilityString.cpp
+++ b/src/lib/utility/utilityString.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <cctype>
+#include <codecvt>
 #include <iterator>
 #include <string>
 
@@ -29,6 +30,18 @@ namespace
 
 namespace utility
 {
+	std::string encodeToUtf8(const std::wstring& s)
+	{
+		std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+		return conv.to_bytes(s);
+	}
+
+	std::wstring decodeFromUtf8(const std::string& s)
+	{
+		std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+		return conv.from_bytes(s);
+	}
+
 	std::deque<std::string> split(const std::string& str, char delimiter)
 	{
 		return split<std::deque<std::string>>(str, std::string(1, delimiter));
diff --git a/src/lib/utility/utilityString.h b/src/lib/utility/utilityString.h
index 2be4cbb7..e920a962 100644
--- a/src/lib/utility/utilityString.h
+++ b/src/lib/utility/utilityString.h
@@ -8,6 +8,9 @@
 
 namespace utility
 {
+	std::string encodeToUtf8(const std::wstring& s);
+	std::wstring decodeFromUtf8(const std::string& s);
+
 	template <typename ContainerType>
 	ContainerType split(const std::string& str, const std::string& delimiter);
 
diff --git a/src/lib_gui/CMakeLists.txt b/src/lib_gui/CMakeLists.txt
index e7dc9d68..f1fa3408 100644
--- a/src/lib_gui/CMakeLists.txt
+++ b/src/lib_gui/CMakeLists.txt
@@ -285,7 +285,5 @@ add_files(
 	utility/utilityApp.h
 	utility/utilityPathDetection.cpp
 	utility/utilityPathDetection.h
-	utility/utilityQString.cpp
-	utility/utilityQString.h
 )
 
diff --git a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp
index 4e1bfbf9..29701a08 100644
--- a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp
+++ b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp
@@ -10,7 +10,7 @@
 #include "qt/utility/utilityQt.h"
 #include "settings/ColorScheme.h"
 #include "utility/ResourcePaths.h"
-#include "utility/utilityQString.h"
+#include "utility/utilityString.h"
 
 QtCodeFileTitleButton::QtCodeFileTitleButton(QWidget* parent)
 	: QPushButton(parent)
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
index 99a6d78f..27dc23ab 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
@@ -31,7 +31,6 @@
 #include "utility/utility.h"
 #include "utility/utilityApp.h"
 #include "utility/utilityPathDetection.h"
-#include "utility/utilityQString.h"
 #include "utility/utilityString.h"
 #include "utility/utilityUuid.h"
 
diff --git a/src/lib_gui/utility/utilityQString.cpp b/src/lib_gui/utility/utilityQString.cpp
deleted file mode 100644
index 46023f8e..00000000
--- a/src/lib_gui/utility/utilityQString.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "utility/utilityQString.h"
-
-#include <QString>
-
-std::wstring utility::decodeFromUtf8(std::string s)
-{
-	QString qs = QString::fromUtf8(s.c_str());
-	return qs.toStdWString();
-}
-
-std::string utility::encodeToUtf8(std::wstring s)
-{
-	QString qs = QString::fromStdWString(s);
-	return qs.toUtf8().toStdString();
-}
\ No newline at end of file
diff --git a/src/lib_gui/utility/utilityQString.h b/src/lib_gui/utility/utilityQString.h
deleted file mode 100644
index 811e79ce..00000000
--- a/src/lib_gui/utility/utilityQString.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef UTILITY_Q_STRING_H
-#define UTILITY_Q_STRING_H
-
-#include <string>
-
-namespace utility
-{
-	std::wstring decodeFromUtf8(std::string s);
-	std::string encodeToUtf8(std::wstring s);
-}
-
-#endif // UTILITY_Q_STRING_H
-
diff --git a/src/lib_java/project/SourceGroupJava.cpp b/src/lib_java/project/SourceGroupJava.cpp
index 27762dce..d7b35fd5 100644
--- a/src/lib_java/project/SourceGroupJava.cpp
+++ b/src/lib_java/project/SourceGroupJava.cpp
@@ -11,7 +11,6 @@
 #include "utility/text/TextAccess.h"
 #include "utility/ScopedFunctor.h"
 #include "utility/utilityJava.h"
-#include "utility/utilityQString.h"
 #include "utility/utilityString.h"
 #include "Application.h"