diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp
index 9c8429577..5e12bab1f 100644
--- a/source/shared_lib/sources/platform/common/platform_common.cpp
+++ b/source/shared_lib/sources/platform/common/platform_common.cpp
@@ -1803,11 +1803,16 @@ string replaceAllHTMLEntities(string& context) {
 	replaceAll(context,"&","&");
 	replaceAll(context,"&lt;","<");
 	replaceAll(context,"&gt;",">");
-	replaceAll(context,"&OElig;","Œ");
-	replaceAll(context,"&oelig;","œ");
-	replaceAll(context,"&Scaron;","Š");
-	replaceAll(context,"&scaron;","š");
-	replaceAll(context,"&Yuml;","Ÿ");
+	//replaceAll(context,"&OElig;","Œ");
+	replaceAll(context,"&OElig;","\xC5\x92\0");
+	//replaceAll(context,"&oelig;","œ");
+	replaceAll(context,"&oelig;","\xC5\x93\0");
+	//replaceAll(context,"&Scaron;","Š");
+	replaceAll(context,"&Scaron;","\xC5\xA0\0");
+	//replaceAll(context,"&scaron;","š");
+	replaceAll(context,"&scaron;","\xC5\xA1\0");
+	//replaceAll(context,"&Yuml;","Ÿ");
+	replaceAll(context,"&Yuml;","\xC5\xB8\0");
 	replaceAll(context,"&circ;","ˆ");
 	replaceAll(context,"&tilde;","˜");
 	replaceAll(context,"&ensp;"," ");
@@ -1815,18 +1820,30 @@ string replaceAllHTMLEntities(string& context) {
 	replaceAll(context,"&thinsp;"," ");
 	replaceAll(context,"&ndash;","-");
 	replaceAll(context,"&mdash;","-");
-	replaceAll(context,"&lsquo;","‘");
-	replaceAll(context,"&rsquo;","’");
-	replaceAll(context,"&sbquo;","‚");
-	replaceAll(context,"&ldquo;","“");
-	replaceAll(context,"&rdquo;","”");
-	replaceAll(context,"&bdquo;","„");
-	replaceAll(context,"&dagger;","†");
-	replaceAll(context,"&Dagger;","‡");
-	replaceAll(context,"&permil;","‰");
-	replaceAll(context,"&lsaquo;","‹");
-	replaceAll(context,"&rsaquo;","›");
-	replaceAll(context,"&euro;","€");
+	//replaceAll(context,"&lsquo;","‘");
+	replaceAll(context,"&lsquo;","\xE2\x80\x98\0");
+	//replaceAll(context,"&rsquo;","’");
+	replaceAll(context,"&rsquo;","\xE2\x80\x99\0");
+	//replaceAll(context,"&sbquo;","‚");
+	replaceAll(context,"&sbquo;","\xE2\x80\x9A\0");
+	//replaceAll(context,"&ldquo;","“");
+	replaceAll(context,"&ldquo;","\xE2\x80\x9C\0");
+	//replaceAll(context,"&rdquo;","”");
+	replaceAll(context,"&rdquo;","\xE2\x80\x9D\0");
+	//replaceAll(context,"&bdquo;","„");
+	replaceAll(context,"&bdquo;","\xE2\x80\x9E\0");
+	//replaceAll(context,"&dagger;","†");
+	replaceAll(context,"&dagger;","\xE2\x80\xA0\0");
+	//replaceAll(context,"&Dagger;","‡");
+	replaceAll(context,"&Dagger;","\xE2\x80\xA1\0");
+	//replaceAll(context,"&permil;","‰");
+	replaceAll(context,"&permil;","\xE2\x80\xB0\0");
+	//replaceAll(context,"&lsaquo;","‹");
+	replaceAll(context,"&lsaquo;","\xE2\x80\xB9\0");
+	//replaceAll(context,"&rsaquo;","›");
+	replaceAll(context,"&rsaquo;","\xE2\x80\xBA\0");
+	//replaceAll(context,"&euro;","€");
+	replaceAll(context,"&euro;","\xE2\x82\xAC\0");
 
 	return context;
 }