diff --git a/components/rx/rxlookup.pas b/components/rx/rxlookup.pas
index 310322efa..c6d7efa09 100644
--- a/components/rx/rxlookup.pas
+++ b/components/rx/rxlookup.pas
@@ -78,6 +78,7 @@ type
       Shift: TShiftState);
   protected
     procedure DoButtonClick (Sender: TObject); override;
+    function GetDefaultGlyphName: String; override;
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
     //
     property DropDownCount: Integer read FDropDownCount write SetDropDownCount default 8;
@@ -484,6 +485,11 @@ begin
     ShowList;
 end;
 
+function TCustomDBLookupEdit.GetDefaultGlyphName: String;
+begin
+  Result:='rxbtn_downarrow';
+end;
+
 procedure TCustomDBLookupEdit.KeyDown(var Key: Word; Shift: TShiftState);
 begin
   if (Key in [VK_PRIOR, VK_NEXT, VK_UP, VK_DOWN, VK_RETURN]) and PopupVisible then
diff --git a/components/rx/tooledit.pas b/components/rx/tooledit.pas
index 96831fdd7..c0528b398 100644
--- a/components/rx/tooledit.pas
+++ b/components/rx/tooledit.pas
@@ -77,6 +77,7 @@ type
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
     procedure KeyPress(var Key: Char); override;
     procedure DoButtonClick (Sender: TObject); override;
+    function GetDefaultGlyphName: String; override;
 
     property BlanksChar: Char read FBlanksChar write SetBlanksChar default ' ';
     property DialogTitle:TCaption Read FDialogTitle Write FDialogTitle Stored IsStoreTitle;
@@ -719,12 +720,17 @@ begin
   end;
 end;
 
+function TCustomRxDateEdit.GetDefaultGlyphName: String;
+begin
+  Result:='picDateEdit';
+end;
+
 constructor TCustomRxDateEdit.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   FBlanksChar := ' ';
   FDialogTitle := sDateDlgTitle;
-  FPopupColor := clBtnFace;
+  FPopupColor := clWindow;
   FNotInThisMonthColor := clSilver;
   FPopupAlign := epaLeft;
   FStartOfWeek := Mon;
@@ -747,7 +753,7 @@ begin
   finally
     ControlState := ControlState - [csCreating];
   end;
-  Glyph:=LoadBitmapFromLazarusResource('picDateEdit');
+//  Glyph:=LoadBitmapFromLazarusResource('picDateEdit');
   NumGlyphs := 2;
 end;