diff --git a/tools/lazdatadesktop/conneditor.pp b/tools/lazdatadesktop/conneditor.pp
index 8baa9ea1f9..45279b2943 100644
--- a/tools/lazdatadesktop/conneditor.pp
+++ b/tools/lazdatadesktop/conneditor.pp
@@ -154,7 +154,7 @@ begin
     begin
     P:=TPortableNetworkGraphic.Create;
     try
-      P.LoadFromLazarusResource(ImageNames[i]);
+      P.LoadFromResourceName(HInstance,ImageNames[i]);
       FImgList.Add(P,Nil);
     finally
       P.Free;
diff --git a/tools/lazdatadesktop/datapanel.pp b/tools/lazdatadesktop/datapanel.pp
index 1e6d6f9c05..9d284913d9 100644
--- a/tools/lazdatadesktop/datapanel.pp
+++ b/tools/lazdatadesktop/datapanel.pp
@@ -169,7 +169,7 @@ begin
   FExportSB.Top:=4;
   FExportSB.Height:=22;
   FExportSB.Width:=22;
-  P.LoadFromLazarusResource('qrybtn_export');
+  P.LoadFromResourceName(HInstance,'qrybtn_export');
   FExportSB.Glyph.Assign(P);
   FExportSB.Flat:=True;
   FExportSB.OnClick:=@DoExport;
@@ -179,7 +179,7 @@ begin
   FCodeSB.Top:=4;
   FCodeSB.Height:=22;
   FCodeSB.Width:=22;
-  P.LoadFromLazarusResource('qrybtn_code');
+  P.LoadFromResourceName(HInstance,'qrybtn_code');
   FCodeSB.Glyph.Assign(P);
   FCodeSB.Flat:=True;
   FCodeSB.OnClick:=@DoCode;
diff --git a/tools/lazdatadesktop/lazdatadesktop.lpi b/tools/lazdatadesktop/lazdatadesktop.lpi
index e630ab77b7..66a024f519 100644
--- a/tools/lazdatadesktop/lazdatadesktop.lpi
+++ b/tools/lazdatadesktop/lazdatadesktop.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>