diff --git a/extra/build_everything.cmd b/extra/build_everything.cmd
index f93b7797..dc175bd4 100644
--- a/extra/build_everything.cmd
+++ b/extra/build_everything.cmd
@@ -225,6 +225,8 @@ if not %err% == 0 goto end
 rem Build main executable
 echo Compiling main project.
 cd /d "%base_dir%\packages\%package_dir%\"
+brcc32 version.rc
+brcc32 icon.rc
 "%compiler%" %params% -e"%base_dir%\out" heidisql.dpr
 if not %errorlevel% == 0 goto end
 
diff --git a/packages/delphi11/heidisql.dpr b/packages/delphi11/heidisql.dpr
index d4359749..5c706b00 100644
--- a/packages/delphi11/heidisql.dpr
+++ b/packages/delphi11/heidisql.dpr
@@ -43,7 +43,8 @@ uses
   uVistaFuncs in '..\..\source\uVistaFuncs.pas',
   dataviewsave in '..\..\source\dataviewsave.pas' {FrmDataViewSave};
 
-{$R *.RES}
+{$R icon.RES}
+{$R version.RES}
 
 begin
   debug('perf: All modules loaded.');
diff --git a/packages/delphi11/heidisql.dproj b/packages/delphi11/heidisql.dproj
index 4f4b272c..4ce528d7 100644
--- a/packages/delphi11/heidisql.dproj
+++ b/packages/delphi11/heidisql.dproj
@@ -58,6 +58,12 @@
     <DelphiCompile Include="heidisql.dpr">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <RcCompile Include="icon.rc">
+      <Form>icon.res</Form>
+    </RcCompile>
+    <RcCompile Include="version.rc">
+      <Form>version.res</Form>
+    </RcCompile>
     <DCCReference Include="..\..\source\about.pas">
       <Form>AboutBox</Form>
     </DCCReference>
diff --git a/packages/delphi11/heidisql.res b/packages/delphi11/heidisql.res
deleted file mode 100644
index 3080b66d..00000000
Binary files a/packages/delphi11/heidisql.res and /dev/null differ
diff --git a/packages/delphi11/icon.rc b/packages/delphi11/icon.rc
new file mode 100644
index 00000000..211cbc12
--- /dev/null
+++ b/packages/delphi11/icon.rc
@@ -0,0 +1 @@
+MAINICON ICON "../../res/mainicon.ico"
\ No newline at end of file
diff --git a/packages/delphi11/version.rc b/packages/delphi11/version.rc
new file mode 100644
index 00000000..9c155853
--- /dev/null
+++ b/packages/delphi11/version.rc
@@ -0,0 +1,20 @@
+1 VERSIONINFO
+  FILEVERSION 0,0,0,0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_APP
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904E4"
+      BEGIN
+        VALUE "FileDescription", "A lightweight, fast and flexible interface to MySQL\000"
+        VALUE "ProductName", "HeidiSQL\000"
+        VALUE "LegalCopyright", "See GLP license\000"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x0409 0x04E4
+    END 
+  END
+ 
\ No newline at end of file