diff --git a/components/tparadoxdataset/images/imagelist.txt b/components/tparadoxdataset/images/imagelist.txt
new file mode 100644
index 000000000..1998a231d
--- /dev/null
+++ b/components/tparadoxdataset/images/imagelist.txt
@@ -0,0 +1,3 @@
+tparadoxdataset.png
+tparadoxdataset_150.png
+tparadoxdataset_200.png
diff --git a/components/tparadoxdataset/images/make_res.bat b/components/tparadoxdataset/images/make_res.bat
new file mode 100644
index 000000000..447cd9d53
--- /dev/null
+++ b/components/tparadoxdataset/images/make_res.bat
@@ -0,0 +1 @@
+lazres ../pdx_icons.res @imagelist.txt
diff --git a/components/tparadoxdataset/images/tparadoxdataset.png b/components/tparadoxdataset/images/tparadoxdataset.png
new file mode 100644
index 000000000..b4bfdc8c0
Binary files /dev/null and b/components/tparadoxdataset/images/tparadoxdataset.png differ
diff --git a/components/tparadoxdataset/images/tparadoxdataset_150.png b/components/tparadoxdataset/images/tparadoxdataset_150.png
new file mode 100644
index 000000000..159ebb31a
Binary files /dev/null and b/components/tparadoxdataset/images/tparadoxdataset_150.png differ
diff --git a/components/tparadoxdataset/images/tparadoxdataset_200.png b/components/tparadoxdataset/images/tparadoxdataset_200.png
new file mode 100644
index 000000000..7df858bac
Binary files /dev/null and b/components/tparadoxdataset/images/tparadoxdataset_200.png differ
diff --git a/components/tparadoxdataset/lazparadox.lpk b/components/tparadoxdataset/lazparadox.lpk
index 2441eccd7..67f731ae4 100644
--- a/components/tparadoxdataset/lazparadox.lpk
+++ b/components/tparadoxdataset/lazparadox.lpk
@@ -1,20 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="lazparadox"/>
+    <Type Value="RunAndDesignTime"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Christian Ulrich"/>
     <CompilerOptions>
-      <Version Value="8"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
+      <Parsing>
+        <SyntaxOptions>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
     </CompilerOptions>
-    <Description Value="Paradox DataSet"/>
+    <Description Value="Paradox DataSet
+
+NOTE: THIS PACKAGE IS DEPRECATED. PLEASE USE lazparadoxpkg.lpk INSTEAD!"/>
     <License Value="LGPL"/>
     <Version Minor="1"/>
     <Files Count="2">
@@ -28,7 +34,6 @@
         <UnitName Value="paradoxds"/>
       </Item2>
     </Files>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="LCL"/>
@@ -42,11 +47,10 @@
       </Item3>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>
 </CONFIG>
diff --git a/components/tparadoxdataset/lazparadoxpkg.lpk b/components/tparadoxdataset/lazparadoxpkg.lpk
new file mode 100644
index 000000000..ec5cf56fe
--- /dev/null
+++ b/components/tparadoxdataset/lazparadoxpkg.lpk
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <Package Version="4">
+    <PathDelim Value="\"/>
+    <Name Value="lazparadoxpkg"/>
+    <Type Value="RunAndDesignTime"/>
+    <Author Value="Christian Ulrich"/>
+    <CompilerOptions>
+      <Version Value="11"/>
+      <PathDelim Value="\"/>
+      <SearchPaths>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+    </CompilerOptions>
+    <Description Value="Dataset for Paradox Database files
+Read-only
+Tested on Windows and Linux, 32- and 64-bit"/>
+    <License Value="LGPL"/>
+    <Version Minor="2"/>
+    <Files Count="2">
+      <Item1>
+        <Filename Value="paradoxreg.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="paradoxreg"/>
+      </Item1>
+      <Item2>
+        <Filename Value="paradoxds.pas"/>
+        <UnitName Value="paradoxds"/>
+      </Item2>
+    </Files>
+    <RequiredPkgs Count="3">
+      <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="IDEIntf"/>
+      </Item2>
+      <Item3>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item3>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/tparadoxdataset/paradoxreg.pas b/components/tparadoxdataset/paradoxreg.pas
index d61c2040e..fd4049cd0 100644
--- a/components/tparadoxdataset/paradoxreg.pas
+++ b/components/tparadoxdataset/paradoxreg.pas
@@ -14,6 +14,8 @@ procedure Register;
 
 implementation
 
+{$R pdx_icons.res}
+
 type
 
   TParadoxFileNamePropertyEditor=class(TFileNamePropertyEditor)
diff --git a/components/tparadoxdataset/pdx_icons.res b/components/tparadoxdataset/pdx_icons.res
new file mode 100644
index 000000000..53129a778
Binary files /dev/null and b/components/tparadoxdataset/pdx_icons.res differ