diff --git a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
index ff5324fbb..9af1e4d2c 100644
--- a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -71,11 +71,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="RxDBGridMainUnit"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
         <TopLine Value="134"/>
-        <CursorPos X="1" Y="147"/>
+        <CursorPos X="1" Y="145"/>
         <UsageCount Value="95"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -103,10 +102,11 @@
       <Unit5>
         <Filename Value="../../rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="3958"/>
-        <CursorPos X="3" Y="3985"/>
+        <TopLine Value="3955"/>
+        <CursorPos X="19" Y="3985"/>
         <UsageCount Value="16"/>
         <Bookmarks Count="2">
           <Item0 X="1" Y="4281" ID="1"/>
diff --git a/components/rx/Demos/RxDateEdit/project1.lpi b/components/rx/Demos/RxDateEdit/project1.lpi
index 80ebe5aa9..3c6a7a24e 100644
--- a/components/rx/Demos/RxDateEdit/project1.lpi
+++ b/components/rx/Demos/RxDateEdit/project1.lpi
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
     <General>
       <MainUnit Value="0"/>
+      <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
       <Icon Value="0"/>
       <ActiveWindowIndexAtStart Value="0"/>
@@ -41,219 +42,261 @@
         <PackageName Value="LCL"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="19">
+    <Units Count="21">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="project1"/>
-        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
-        <CursorPos X="22" Y="21"/>
+        <CursorPos X="1" Y="14"/>
         <UsageCount Value="20"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="22"/>
-        <CursorPos X="22" Y="9"/>
+        <TopLine Value="6"/>
+        <CursorPos X="15" Y="19"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/curredit.pas"/>
+        <Filename Value="../../curredit.pas"/>
         <UnitName Value="curredit"/>
-        <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
         <TopLine Value="469"/>
         <CursorPos X="1" Y="485"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/tooledit.pas"/>
+        <Filename Value="../../tooledit.pas"/>
         <UnitName Value="tooledit"/>
-        <TopLine Value="287"/>
-        <CursorPos X="1" Y="303"/>
+        <EditorIndex Value="1"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="794"/>
+        <CursorPos X="5" Y="797"/>
         <UsageCount Value="10"/>
+        <Loaded Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rx.inc"/>
+        <Filename Value="../../rx.inc"/>
         <TopLine Value="1"/>
         <CursorPos X="20" Y="11"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
-        <Filename Value="/usr/local/share/lazarus/lcl/maskedit.pp"/>
+        <Filename Value="../../../../lcl/maskedit.pp"/>
         <UnitName Value="MaskEdit"/>
         <TopLine Value="149"/>
         <CursorPos X="30" Y="145"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
-        <Filename Value="/usr/local/share/lazarus/lcl/stdctrls.pp"/>
+        <Filename Value="../../../../lcl/stdctrls.pp"/>
         <UnitName Value="StdCtrls"/>
         <TopLine Value="677"/>
         <CursorPos X="3" Y="693"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
-        <Filename Value="/usr/local/share/lazarus/lcl/controls.pp"/>
+        <Filename Value="../../../../lcl/controls.pp"/>
         <UnitName Value="Controls"/>
         <TopLine Value="1720"/>
         <CursorPos X="15" Y="1736"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/wincontrol.inc"/>
+        <Filename Value="../../../../lcl/include/wincontrol.inc"/>
         <TopLine Value="4997"/>
         <CursorPos X="1" Y="5013"/>
         <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
-        <Filename Value="/usr/local/share/lazarus/lcl/dbctrls.pp"/>
+        <Filename Value="../../../../lcl/dbctrls.pp"/>
         <UnitName Value="DbCtrls"/>
         <TopLine Value="196"/>
         <CursorPos X="15" Y="212"/>
         <UsageCount Value="10"/>
       </Unit9>
       <Unit10>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/dbedit.inc"/>
+        <Filename Value="../../../../lcl/include/dbedit.inc"/>
         <TopLine Value="263"/>
         <CursorPos X="3" Y="265"/>
         <UsageCount Value="10"/>
       </Unit10>
       <Unit11>
-        <Filename Value="/usr/local/share/lazarus/lcl/graphics.pp"/>
+        <Filename Value="../../../../lcl/graphics.pp"/>
         <UnitName Value="Graphics"/>
         <TopLine Value="1099"/>
         <CursorPos X="15" Y="1115"/>
         <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Filename Value="../../../../lcl/include/canvas.inc"/>
         <TopLine Value="1057"/>
         <CursorPos X="1" Y="1073"/>
         <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/control.inc"/>
+        <Filename Value="../../../../lcl/include/control.inc"/>
         <TopLine Value="1615"/>
         <CursorPos X="1" Y="1631"/>
         <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
-        <Filename Value="/usr/local/share/lazarus/lcl/lclmessageglue.pas"/>
+        <Filename Value="../../../../lcl/lclmessageglue.pas"/>
         <UnitName Value="LCLMessageGlue"/>
         <TopLine Value="105"/>
         <CursorPos X="1" Y="121"/>
         <UsageCount Value="10"/>
       </Unit14>
       <Unit15>
-        <Filename Value="/usr/local/share/lazarus/lcl/interfaces/gtk/gtkproc.inc"/>
+        <Filename Value="../../../../lcl/interfaces/gtk/gtkproc.inc"/>
         <TopLine Value="3696"/>
         <CursorPos X="1" Y="3712"/>
         <UsageCount Value="10"/>
       </Unit15>
       <Unit16>
-        <Filename Value="/usr/local/share/lazarus/lcl/interfaces/gtk/gtkcallback.inc"/>
+        <Filename Value="../../../../lcl/interfaces/gtk/gtkcallback.inc"/>
         <TopLine Value="660"/>
         <CursorPos X="1" Y="676"/>
         <UsageCount Value="10"/>
       </Unit16>
       <Unit17>
-        <Filename Value="/usr/local/share/lazarus/lcl/interfaces/gtk/gtkwidgetset.inc"/>
+        <Filename Value="../../../../lcl/interfaces/gtk/gtkwidgetset.inc"/>
         <TopLine Value="1200"/>
         <CursorPos X="1" Y="1226"/>
         <UsageCount Value="10"/>
       </Unit17>
       <Unit18>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Filename Value="../../dbdateedit.pas"/>
         <UnitName Value="dbdateedit"/>
-        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
         <TopLine Value="211"/>
         <CursorPos X="1" Y="227"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit18>
+      <Unit19>
+        <Filename Value="/home/alexs/install/fpcsrc/rtl/objpas/sysutils/sysinth.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="77"/>
+        <CursorPos X="37" Y="93"/>
+        <UsageCount Value="10"/>
+      </Unit19>
+      <Unit20>
+        <Filename Value="../../../../lcl/editbtn.pas"/>
+        <UnitName Value="EditBtn"/>
+        <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="774"/>
+        <CursorPos X="1" Y="792"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit20>
     </Units>
-    <JumpHistory Count="15" HistoryIndex="14">
+    <JumpHistory Count="21" HistoryIndex="20">
       <Position1>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/curredit.pas"/>
-        <Caret Line="485" Column="1" TopLine="469"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="46" Column="1" TopLine="28"/>
       </Position1>
       <Position2>
         <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="1" TopLine="28"/>
+        <Caret Line="18" Column="22" TopLine="8"/>
       </Position2>
       <Position3>
         <Filename Value="unit1.pas"/>
-        <Caret Line="18" Column="22" TopLine="8"/>
+        <Caret Line="46" Column="1" TopLine="28"/>
       </Position3>
       <Position4>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="224" Column="3" TopLine="222"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="47" Column="1" TopLine="28"/>
       </Position4>
       <Position5>
         <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="1" TopLine="28"/>
+        <Caret Line="46" Column="26" TopLine="28"/>
       </Position5>
       <Position6>
         <Filename Value="unit1.pas"/>
-        <Caret Line="47" Column="1" TopLine="28"/>
+        <Caret Line="20" Column="25" TopLine="20"/>
       </Position6>
       <Position7>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="227" Column="1" TopLine="211"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="22" Column="20" TopLine="20"/>
       </Position7>
       <Position8>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="228" Column="1" TopLine="212"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="9" Column="22" TopLine="9"/>
       </Position8>
       <Position9>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="233" Column="1" TopLine="217"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="39" Column="1" TopLine="22"/>
       </Position9>
       <Position10>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="227" Column="1" TopLine="211"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="38" Column="1" TopLine="22"/>
       </Position10>
       <Position11>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="228" Column="1" TopLine="212"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="40" Column="7" TopLine="22"/>
       </Position11>
       <Position12>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="233" Column="1" TopLine="217"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="39" Column="7" TopLine="21"/>
       </Position12>
       <Position13>
         <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="26" TopLine="28"/>
+        <Caret Line="40" Column="7" TopLine="21"/>
       </Position13>
       <Position14>
         <Filename Value="unit1.pas"/>
-        <Caret Line="20" Column="25" TopLine="20"/>
+        <Caret Line="39" Column="7" TopLine="21"/>
       </Position14>
       <Position15>
         <Filename Value="unit1.pas"/>
-        <Caret Line="22" Column="20" TopLine="20"/>
+        <Caret Line="18" Column="15" TopLine="6"/>
       </Position15>
+      <Position16>
+        <Filename Value="../../tooledit.pas"/>
+        <Caret Line="161" Column="50" TopLine="142"/>
+      </Position16>
+      <Position17>
+        <Filename Value="../../tooledit.pas"/>
+        <Caret Line="897" Column="1" TopLine="868"/>
+      </Position17>
+      <Position18>
+        <Filename Value="../../../../lcl/editbtn.pas"/>
+        <Caret Line="249" Column="3" TopLine="234"/>
+      </Position18>
+      <Position19>
+        <Filename Value="../../tooledit.pas"/>
+        <Caret Line="223" Column="1" TopLine="203"/>
+      </Position19>
+      <Position20>
+        <Filename Value="../../tooledit.pas"/>
+        <Caret Line="900" Column="1" TopLine="870"/>
+      </Position20>
+      <Position21>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="18" Column="15" TopLine="6"/>
+      </Position21>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
+    <Target>
+      <Filename Value="project1"/>
+    </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
@@ -284,4 +327,5 @@
       </Item3>
     </Exceptions>
   </Debugging>
+  <EditorMacros Count="0"/>
 </CONFIG>
diff --git a/components/rx/Demos/RxDateEdit/project1.lpr b/components/rx/Demos/RxDateEdit/project1.lpr
index d961c0f14..718a85524 100644
--- a/components/rx/Demos/RxDateEdit/project1.lpr
+++ b/components/rx/Demos/RxDateEdit/project1.lpr
@@ -9,16 +9,13 @@ uses
   Interfaces, // this includes the LCL widgetset
   Forms,
   Unit1,
-  LResources,
   sysutils
   { you can add units after this };
-
-{$IFDEF WINDOWS}{$R project1.rc}{$ENDIF}
+{$R *.res}
 
 begin
-  {$I project1.lrs}
-  ShortDateFormat:='dd.mm.yyyy';
-  DateSeparator:='.';
+  DefaultFormatSettings.ShortDateFormat:='dd.mm.yyyy';
+  DefaultFormatSettings.DateSeparator:='.';
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/components/rx/Demos/RxDateEdit/unit1.lfm b/components/rx/Demos/RxDateEdit/unit1.lfm
index 321cc7966..1144fe04c 100644
--- a/components/rx/Demos/RxDateEdit/unit1.lfm
+++ b/components/rx/Demos/RxDateEdit/unit1.lfm
@@ -7,14 +7,14 @@ object Form1: TForm1
   ClientHeight = 300
   ClientWidth = 400
   OnCreate = FormCreate
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.3'
   object Label1: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 6
-    Height = 18
+    Height = 15
     Top = 6
-    Width = 46
+    Width = 43
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'Label1'
@@ -25,69 +25,73 @@ object Form1: TForm1
     AnchorSideTop.Control = DBDateEdit1
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 18
-    Top = 63
-    Width = 93
+    Height = 15
+    Top = 58
+    Width = 87
     BorderSpacing.Around = 6
     Caption = 'Currency edit'
     ParentColor = False
   end
-  object DBDateEdit1: TDBDateEdit
-    AnchorSideLeft.Control = Label1
-    AnchorSideTop.Control = Label1
-    AnchorSideTop.Side = asrBottom
-    Left = 12
-    Height = 27
-    Top = 30
-    Width = 148
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 6
-    ButtonWidth = 23
-    Enabled = False
-    Glyph.Data = {
-      36010000424D360100000000000076000000280000001C0000000C0000000100
-      040000000000C000000000000000000000000000000000000000000000000000
-      8000008000000080800080000000800080008080000080808000C0C0C0000000
-      FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00DDD777777777
-      77DDFFFFFFFFFFFF0000DD004044040047D777777777777F0000DDFFFFFFFFFF
-      47D7FDFFFDFFFD7F0000DDF000F0008F47D7F777D777DF7F0000DDFF0FF8F80F
-      47D7FD7FDDDD7F7F0000DDFF0FFFFF0F47D7FD7FDDFF7D7F0000DDFF0FF0008F
-      47D7FD7FD777DD7F0000DDF00FF0FFFF47D7F77FD7FFFF7F0000DDFF0FF0000F
-      47D7FD7DD7777D7F0000DDFFFFFFFFFF47D7FDDDDDDDDD7F0000DDF88888888F
-      47D7FFFFFFFFFF7F0000DD0000000000DDD777777777777D0000
-    }
-    NumGlyphs = 2
-    PopupColor = clWindow
-    TabOrder = 0
-    DataField = 'DOC_DATE'
-    DataSource = dsData
-  end
   object CurrencyEdit1: TCurrencyEdit
     AnchorSideLeft.Control = Label2
     AnchorSideTop.Control = Label2
     AnchorSideTop.Side = asrBottom
     Left = 12
-    Height = 27
-    Top = 87
+    Height = 25
+    Top = 79
     Width = 148
     Alignment = taCenter
     BorderSpacing.Around = 6
     MaxValue = 0
     MinValue = 0
-    TabOrder = 1
+    TabOrder = 0
     Value = 0
   end
   object Button1: TButton
     Left = 248
-    Height = 29
+    Height = 27
     Top = 80
-    Width = 76
+    Width = 77
     AutoSize = True
     Caption = 'Invalidate'
     OnClick = Button1Click
-    TabOrder = 2
+    TabOrder = 1
   end
-  object dsData: TDatasource
+  object RxDateEdit1: TRxDateEdit
+    Left = 12
+    Height = 25
+    Top = 135
+    Width = 80
+    ButtonWidth = 23
+    CharCase = ecNormal
+    MaxLength = 10
+    NumGlyphs = 2
+    PopupColor = clWindow
+    TabOrder = 2
+    Text = '  .  .    '
+  end
+  object DBDateEdit1: TDBDateEdit
+    AnchorSideLeft.Control = Label1
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    Left = 12
+    Height = 25
+    Top = 27
+    Width = 139
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    ButtonWidth = 23
+    CharCase = ecNormal
+    Enabled = False
+    MaxLength = 10
+    NumGlyphs = 2
+    PopupColor = clWindow
+    TabOrder = 3
+    Text = '  .  .    '
+    DataField = 'DOC_DATE'
+    DataSource = dsData
+  end
+  object dsData: TDataSource
     DataSet = rxData
     left = 264
     top = 21
@@ -100,6 +104,7 @@ object Form1: TForm1
         Precision = 0
         Size = 0
       end>
+    PacketRecords = 0
     left = 304
     top = 21
     object rxDataDOC_DATE: TDateField
diff --git a/components/rx/Demos/RxDateEdit/unit1.pas b/components/rx/Demos/RxDateEdit/unit1.pas
index 22ae1a076..de05f14e5 100644
--- a/components/rx/Demos/RxDateEdit/unit1.pas
+++ b/components/rx/Demos/RxDateEdit/unit1.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, db, FileUtil, LResources, Forms, Controls, Graphics,
-  Dialogs, StdCtrls, rxmemds, dbdateedit, curredit;
+  Dialogs, StdCtrls, rxmemds, dbdateedit, curredit, tooledit;
 
 type
 
@@ -21,6 +21,7 @@ type
     Label2: TLabel;
     rxData: TRxMemoryData;
     rxDataDOC_DATE: TDateField;
+    RxDateEdit1: TRxDateEdit;
     procedure Button1Click(Sender: TObject);
     procedure FormCreate(Sender: TObject);
   private
@@ -34,6 +35,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 { TForm1 }
 
 procedure TForm1.FormCreate(Sender: TObject);
@@ -49,8 +52,5 @@ begin
   CurrencyEdit1.Invalidate;
 end;
 
-initialization
-  {$I unit1.lrs}
-
 end.
 
diff --git a/components/rx/tooledit.lrs b/components/rx/tooledit.lrs
deleted file mode 100644
index 3d62b1c87..000000000
--- a/components/rx/tooledit.lrs
+++ /dev/null
@@ -1,14 +0,0 @@
-LazarusResources.Add('picDateEdit','BMP',[
-  'BM6'#1#0#0#0#0#0#0'v'#0#0#0'('#0#0#0#28#0#0#0#12#0#0#0#1#0#4#0#0#0#0#0#192#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#128#0#0#128#0#0#0#128#128#0
-  +#128#0#0#0#128#0#128#0#128#128#0#0#128#128#128#0#192#192#192#0#0#0#255#0#0
-  +#255#0#0#0#255#255#0#255#0#0#0#255#0#255#0#255#255#0#0#255#255#255#0#221#215
-  +'wwwww'#221#255#255#255#255#255#255#0#0#221#0'@D'#4#0'G'#215'wwwww'#0#0#221
-  +#255#255#255#255#255'G'#215#253#255#253#255#253''#0#0#221#240#0#240#0#143'G'
-  +#215#247'w'#215'w'#223''#0#0#221#255#15#248#248#15'G'#215#253''#221#221''
-  +#0#0#221#255#15#255#255#15'G'#215#253''#221#255'}'#0#0#221#255#15#240#0#143
-  +'G'#215#253''#215'w'#221''#0#0#221#240#15#240#255#255'G'#215#247''#215#255
-  +#255''#0#0#221#255#15#240#0#15'G'#215#253'}'#215'w}'#0#0#221#255#255#255
-  +#255#255'G'#215#253#221#221#221#221''#0#0#221#248#136#136#136#143'G'#215#255
-  +#255#255#255#255''#0#0#221#0#0#0#0#0#221#215'wwwww}'#0#0
-]);
diff --git a/components/rx/tooledit.pas b/components/rx/tooledit.pas
index 22f0f0f81..0cb006545 100644
--- a/components/rx/tooledit.pas
+++ b/components/rx/tooledit.pas
@@ -220,6 +220,8 @@ implementation
 uses lclintf, LCLStrConsts, rxconst, rxstrutils, LResources, Forms, LCLProc,
   variants;
 
+{$R tooledit.res}
+
 type
   TPopupCalendarAccess = class(TPopupCalendar)
   end;
@@ -894,7 +896,9 @@ begin
   SetDate(DateValue);
 end;
 
+(*
 initialization
   {$I tooledit.lrs}
+*)
 end.
 
diff --git a/components/rx/tooledit.res b/components/rx/tooledit.res
new file mode 100644
index 000000000..c4e05c0d2
Binary files /dev/null and b/components/rx/tooledit.res differ