diff --git a/components/rx/trunk/rxcontrols/rxtoolbar.pas b/components/rx/trunk/rxcontrols/rxtoolbar.pas
index c69985e40..1416f9112 100644
--- a/components/rx/trunk/rxcontrols/rxtoolbar.pas
+++ b/components/rx/trunk/rxcontrols/rxtoolbar.pas
@@ -578,7 +578,7 @@ begin
 
     if ((FLastDrawFlagsA and DFCS_FLAT) <> 0) and ((FLastDrawFlagsA and DFCS_PUSHED) = 0) and (not Assigned(FImgS)) and (tpGlyphPopup in ToolPanel.Options) and FFullPush then
     begin
-      {$IF LCL_FullVersion >= 1080000}
+      {.$IF LCL_FullVersion >= 1080000}
         //FImageList.DrawForPPI(Canvas, Offset.X, Offset.Y,
         FImgN.DrawForPPI(Canvas, Offset.X, Offset.Y,
            TCustomAction(Action).ImageIndex,
@@ -586,28 +586,28 @@ begin
            Font.PixelsPerInch,
            GetCanvasScaleFactor,
            gdeShadowed);
-      {$ELSE}
-      FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, gde1Bit);
-      {$ENDIF}
+      {.$ELSE}
+//      FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, gde1Bit);
+      {.$ENDIF}
       Dec(Offset.X, 2);
       Dec(Offset.Y, 2);
     end;
 
     if Assigned(FImgS) and (FImgS.Count>TCustomAction(Action).ImageIndex) and ((FLastDrawFlagsA and DFCS_FLAT) <> 0) and ((FLastDrawFlagsA and DFCS_PUSHED) = 0) then
     begin
-      {$IF LCL_FullVersion >= 1080000}
+      {.$IF LCL_FullVersion >= 1080000}
       FImgS.DrawForPPI(Canvas, Offset.X, Offset.Y,
          TCustomAction(Action).ImageIndex,
          FImgS.Width,
          Font.PixelsPerInch,
          GetCanvasScaleFactor,
          (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
-      {$ELSE}
-      FImgS.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled)
-      {$ENDIF}
+      {.$ELSE}
+//      FImgS.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled)
+      {.$ENDIF}
     end
     else
-    {$IF LCL_FullVersion >= 1080000}
+    {.$IF LCL_FullVersion >= 1080000}
       //FImageList.DrawForPPI(Canvas, Offset.X, Offset.Y,
       FImgN.DrawForPPI(Canvas, Offset.X, Offset.Y,
          TCustomAction(Action).ImageIndex,
@@ -615,9 +615,9 @@ begin
          Font.PixelsPerInch,
          GetCanvasScaleFactor,
          (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
-    {$ELSE}
-      FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
-    {$ENDIF}
+    {.$ELSE}
+//      FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
+    {.$ENDIF}
   end
   else
   begin