diff --git a/components/rx/trunk/images/componet_img/all_component_res.bat b/components/rx/trunk/images/componet_img/all_component_res.bat
index af4c7034f..310bc11c5 100644
--- a/components/rx/trunk/images/componet_img/all_component_res.bat
+++ b/components/rx/trunk/images/componet_img/all_component_res.bat
@@ -1,5 +1,8 @@
 del tooledit.lrs
 del rxdbgrid.lrs
 
-..\..\..\..\tools\lazres.exe tooledit.lrs picDateEdit.bmp
-..\..\..\..\tools\lazres.exe rxdbgrid.lrs rx_markerdown.xpm rx_markerup.xpm
+..\..\..\..\tools\lazres.exe tooledit.lrs picDateEdit.png
+..\..\..\..\tools\lazres.exe rxdbgrid.lrs rx_markerdown.png rx_markerup.png
+
+..\..\..\..\tools\lazres.exe tooledit.res picDateEdit.png
+..\..\..\..\tools\lazres.exe rxdbgrid.res rx_markerdown.png rx_markerup.png
diff --git a/components/rx/trunk/images/componet_img/all_component_res.sh b/components/rx/trunk/images/componet_img/all_component_res.sh
index b2ebbeaad..ecd9c19a5 100644
--- a/components/rx/trunk/images/componet_img/all_component_res.sh
+++ b/components/rx/trunk/images/componet_img/all_component_res.sh
@@ -6,5 +6,5 @@ rm rxdbgrid.res
 /usr/local/share/lazarus/tools/lazres tooledit.res picDateEdit.png
 /usr/local/share/lazarus/tools/lazres rxdbgrid.res rx_markerdown.png rx_markerup.png
 
-#../../../../tools\lazres.exe tooledit.lrs picDateEdit.bmp
+../../../../tools\lazres.exe tooledit.lrs picDateEdit.bmp
 #../../../../tools\lazres.exe rxdbgrid.lrs rx_markerdown.xpm rx_markerup.xpm
diff --git a/components/rx/trunk/rx.inc b/components/rx/trunk/rx.inc
index 7b30bd8e3..b7c462dc4 100644
--- a/components/rx/trunk/rx.inc
+++ b/components/rx/trunk/rx.inc
@@ -55,6 +55,7 @@
 {$if FPC_FULLVERSION<20701}
   {$DEFINE NoAutomatedBookmark}
   {$DEFINE RX_USE_LCL_DEVEL}
+  {$DEFINE RX_USE_LAZARUS_RESOURCE}
 {$endif}
 
 {$IFDEF NoAutomatedBookmark}
diff --git a/components/rx/trunk/tooledit.lrs b/components/rx/trunk/tooledit.lrs
new file mode 100644
index 000000000..66820c0dd
--- /dev/null
+++ b/components/rx/trunk/tooledit.lrs
@@ -0,0 +1,12 @@
+LazarusResources.Add('picDateEdit','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#28#0#0#0#12#4#3#0#0#0#131#245#192
+  +'<'#0#0#0#18'PLTE'#255#0#255#0#0#0#136#136#136#255#255#255#204#204#204#0#0
+  +#136'J'#24#179#193#0#0#0#1'bKGD'#3#17#12'L'#242#0#0#0'jIDAT'#8#215'M'#142#193
+  +#13#192' '#8'E'#127#232#4#196#244'n`'#1'-nP'#23#168'I'#247'_'#165' '#151'~'
+  +#15#242#194'#'#0'p'#4'$'#145#10#140'9'#231#189#200'"'#10#236#127'Q'#131''''
+  +#176't.'#142#149#164':'#246#210#163'{)'#165#236']'#159'mJ'#146#178'Y'#200#10
+  +#171#27#199'H'#132#198',o'#249#18#146#227#183#200#252'9'#242#243#158#188#242
+  +'*'#199',R'#178#15#182#29#22'z'#250#223#190#142#0#0#0'%tEXtdate:create'#0'20'
+  +'13-09-28T19:59:53+04:00['#223#143'b'#0#0#0'%tEXtdate:modify'#0'2013-06-14T2'
+  +'2:45:38+04:00'#25#215#209#23#0#0#0#0'IEND'#174'B`'#130
+]);
diff --git a/components/rx/trunk/tooledit.pas b/components/rx/trunk/tooledit.pas
index 8809af416..93e21d13c 100644
--- a/components/rx/trunk/tooledit.pas
+++ b/components/rx/trunk/tooledit.pas
@@ -217,10 +217,13 @@ function PaintComboEdit(Editor: TCustomMaskEdit; const AText: string;
 function EditorTextMargins(Editor: TCustomMaskEdit): TPoint;
 
 implementation
-uses lclintf, LCLStrConsts, rxconst, rxstrutils, LResources, Forms, LCLProc,
+uses lclintf, LCLStrConsts, rxconst, rxstrutils, LResources,
+  Forms, LCLProc,
   variants;
 
+{$IFNDEF RX_USE_LAZARUS_RESOURCE}
 {$R tooledit.res}
+{$ENDIF}
 
 type
   TPopupCalendarAccess = class(TPopupCalendar)
@@ -909,9 +912,10 @@ begin
   SetDate(DateValue);
 end;
 
-(*
+{$IFDEF RX_USE_LAZARUS_RESOURCE}
 initialization
   {$I tooledit.lrs}
-*)
+{$ENDIF}
+
 end.