8 files changed, 23 insertions, 8 deletions
diff --git a/icons/rccompile-fpc.bat b/icons/rccompile-fpc.bat
deleted file mode 100644
index 30998c6d..00000000
--- a/icons/rccompile-fpc.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@set PATH=C:\Programme\lazarus\fpc\2.2.0\bin\i386-win32\;%PATH%
-@set RES_NAME=ultrastardx-icon
-windres.exe -i %RES_NAME%.rc -o %RES_NAME%.res
-
diff --git a/icons/ultrastardx-icon.rc b/icons/ultrastardx-icon.rc
deleted file mode 100644
index 3d0b43fc..00000000
--- a/icons/ultrastardx-icon.rc
+++ /dev/null
@@ -1 +0,0 @@
-MAINICON  		ICON "ultrastardx.ico"
diff --git a/icons/rccompile-delphi.bat b/res/rccompile-delphi.bat
index 32f209a7..cb429f86 100644
--- a/icons/rccompile-delphi.bat
+++ b/res/rccompile-delphi.bat
@@ -1,2 +1,2 @@
-@set RES_NAME=ultrastardx-icon
-BRC32 -r -fo%RES_NAME%.res %RES_NAME%.rc
+@set RES_NAME=ultrastardx
+BRC32 -r -fo%RES_NAME%.res %RES_NAME%.rc
diff --git a/res/rccompile-fpc.bat b/res/rccompile-fpc.bat
new file mode 100644
index 00000000..fc31fd4d
--- /dev/null
+++ b/res/rccompile-fpc.bat
@@ -0,0 +1,4 @@
+@set PATH=C:\Programme\lazarus\fpc\2.2.4\bin\i386-win32\;%PATH%
+@set RES_NAME=ultrastardx
+windres.exe -i %RES_NAME%.rc -o %RES_NAME%.res
+
diff --git a/res/ultrastardx.exe.manifest b/res/ultrastardx.exe.manifest
new file mode 100644
index 00000000..20b58fb4
--- /dev/null
+++ b/res/ultrastardx.exe.manifest
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="ultrastardx" type="win32"></assemblyIdentity>
+<description>UltraStar Deluxe</description>
+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+        <requestedPrivileges>
+            <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+        </requestedPrivileges>
+    </security>
+</trustInfo>
+</assembly>
+\ No newline at end of file
diff --git a/res/ultrastardx.rc b/res/ultrastardx.rc
new file mode 100644
index 00000000..7c3dea60
--- /dev/null
+++ b/res/ultrastardx.rc
@@ -0,0 +1,4 @@
+#define MANIFEST_RESOURCE_ID   1
+#define RT_MANIFEST           24
+MANIFEST_RESOURCE_ID    RT_MANIFEST  "..\\res\\ultrastardx.exe.manifest"
+MAINICON                ICON         "..\\icons\\ultrastardx.ico"
diff --git a/icons/ultrastardx-icon.res b/res/ultrastardx.res
index d79a3d0f..813282ba 100644
--- a/icons/ultrastardx-icon.res
+++ b/res/ultrastardx.res
diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr
index fe434142..f6c9558c 100644
--- a/src/ultrastardx.dpr
+++ b/src/ultrastardx.dpr
@@ -26,7 +26,7 @@
 program ultrastardx;
 
 {$IFDEF MSWINDOWS}
-  {$R '..\icons\ultrastardx-icon.res' '..\icons\ultrastardx-icon.rc'}
+  {$R '..\res\ultrastardx.res' '..\res\ultrastardx.rc'}
 {$ENDIF}
 
 {$IFDEF FPC}