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 ecd9c19a5..51b0f5a3c 100644
--- a/components/rx/trunk/images/componet_img/all_component_res.sh
+++ b/components/rx/trunk/images/componet_img/all_component_res.sh
@@ -3,8 +3,8 @@ rm rxdbgrid.lrs
 rm tooledit.res
 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
+/usr/local/share/lazarus/tools/lazres rx_lcl.res picDateEdit.png rxbtn_downarrow.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/tooledit.res b/components/rx/trunk/images/componet_img/rx_lcl.res
similarity index 64%
rename from components/rx/trunk/tooledit.res
rename to components/rx/trunk/images/componet_img/rx_lcl.res
index c4e05c0d2..7034a20a6 100644
Binary files a/components/rx/trunk/tooledit.res and b/components/rx/trunk/images/componet_img/rx_lcl.res differ
diff --git a/components/rx/trunk/images/componet_img/rxbtn_downarrow.png b/components/rx/trunk/images/componet_img/rxbtn_downarrow.png
new file mode 100644
index 000000000..e534f8aed
Binary files /dev/null and b/components/rx/trunk/images/componet_img/rxbtn_downarrow.png differ
diff --git a/components/rx/trunk/rx.inc b/components/rx/trunk/rx.inc
index 79a4c4290..7ca0a4ea9 100644
--- a/components/rx/trunk/rx.inc
+++ b/components/rx/trunk/rx.inc
@@ -57,9 +57,14 @@
 {$if FPC_FULLVERSION<20701}
   {$DEFINE NoAutomatedBookmark}
   {$DEFINE RX_USE_LCL_DEVEL}
-  {$DEFINE RX_USE_LAZARUS_RESOURCE}
 {$endif}
 
+{$IFDEF OLD_EDITBUTTON}
+{$if FPC_FULLVERSION<20701}
+{$DEFINE RX_USE_LAZARUS_RESOURCE}
+{$ENDIF}
+{$ENDIF}
+
 {$IFDEF NoAutomatedBookmark}
 {$ELSE}
 {$ENDIF}
diff --git a/components/rx/trunk/rx_lcl.res b/components/rx/trunk/rx_lcl.res
new file mode 100644
index 000000000..ef157ef48
Binary files /dev/null and b/components/rx/trunk/rx_lcl.res differ
diff --git a/components/rx/trunk/rxlookup.pas b/components/rx/trunk/rxlookup.pas
index 5be1fb5e3..078737fb2 100644
--- a/components/rx/trunk/rxlookup.pas
+++ b/components/rx/trunk/rxlookup.pas
@@ -627,12 +627,7 @@ begin
   FLookupDataLink.FOnLayoutChanged:=@ListLinkActiveChanged;
   FLookupDataLink.FOnDataSetChanged:=@LookupDataSetChanged;
 
-
-//  FDropDownCount:=8;
   FFieldList:=TStringList.Create;
-  P:=CreateArrowBitmap;
-  Glyph.Assign(P);
-  P.Free;
   ButtonWidth:=15;
   FPopUpFormOptions:=TPopUpFormOptions.Create(Self);
 end;
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index cee89b7bc..134c9882a 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -26,8 +26,8 @@ Copyright (c) 1998 Master-Bank
 translate to Lazarus by alexs in 2005 - 2014
 "/>
     <License Value="LGPL"/>
-    <Version Major="2" Minor="6" Release="4" Build="142"/>
-    <Files Count="67">
+    <Version Major="2" Minor="6" Release="5" Build="152"/>
+    <Files Count="68">
       <Item1>
         <Filename Value="autopanel.pas"/>
         <UnitName Value="AutoPanel"/>
@@ -299,6 +299,10 @@ translate to Lazarus by alexs in 2005 - 2014
         <Filename Value="rxinipropstorage.pas"/>
         <UnitName Value="RxIniPropStorage"/>
       </Item67>
+      <Item68>
+        <Filename Value="rx_lcl.res"/>
+        <Type Value="Binary"/>
+      </Item68>
     </Files>
     <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>
     <i18n>
diff --git a/components/rx/trunk/tooledit.pas b/components/rx/trunk/tooledit.pas
index 0cc6b0587..b0a00a93f 100644
--- a/components/rx/trunk/tooledit.pas
+++ b/components/rx/trunk/tooledit.pas
@@ -230,9 +230,9 @@ uses lclintf, LCLStrConsts, rxconst, rxstrutils, LResources,
   Forms, LCLProc,
   variants;
 
-{$IFNDEF RX_USE_LAZARUS_RESOURCE}
-{$R tooledit.res}
-{$ENDIF}
+{.$IFNDEF RX_USE_LAZARUS_RESOURCE}
+{.$R tooledit.res}
+{.$ENDIF}
 
 type
   TPopupCalendarAccess = class(TPopupCalendar)
diff --git a/components/rx/trunk/vclutils.pas b/components/rx/trunk/vclutils.pas
index 5c6eb065e..4ace277b0 100644
--- a/components/rx/trunk/vclutils.pas
+++ b/components/rx/trunk/vclutils.pas
@@ -104,6 +104,10 @@ procedure OutOfResources;
 implementation
 uses LCLProc, LCLIntf, LCLType, LCLStrConsts;
 
+{$IFNDEF RX_USE_LAZARUS_RESOURCE}
+{$R rx_lcl.res}
+{$ENDIF}
+
 function WidthOf(R: TRect): Integer;
 begin
   Result := R.Right - R.Left;
@@ -600,10 +604,26 @@ end;
 {$ENDIF}
 
 function CreateArrowBitmap:TBitmap;
+var
+  C : TCustomBitmap;
 begin
+  {$IFNDEF RX_USE_LAZARUS_RESOURCE}
+  Result := TBitmap.Create;
+  try
+    try
+      C := TPortableNetworkGraphic.Create;
+      C.LoadFromResourceName(hInstance, 'rxbtn_downarrow');
+      Result.Assign(C);
+    finally
+      C.Free;
+    end;
+  except
+    Result.Free;
+    raise;
+  end;
+  {$ELSE}
   Result:=LoadLazResBitmapImage('rxbtn_downarrow')
-{  Result:=Graphics.TBitmap.Create;
-  Result.LoadFromLazarusResource('rxbtn_downarrow');}
+  {$ENDIF}
 end;
 
 //Code from DBGrid
@@ -650,10 +670,13 @@ begin
 end;
 
 initialization
+{$IFDEF RX_USE_LAZARUS_RESOURCE}
   LazarusResources.Add('rxbtn_downarrow','XPM',[
   '/* XPM */'#13#10'static char * btn_downarrow_xpm[] = {'#13#10'"5 3 2 1",'#13
   +#10'" '#9'c None",'#13#10'".'#9'c #000000",'#13#10'".....",'#13#10'" ... ",'
   +#13#10'"  .  "};'#13#10]);
+{$ENDIF}
+
 end.