diff --git a/components/jvcllaz/packages/JvXPCtrlsLaz.lpk b/components/jvcllaz/packages/JvXPCtrlsLaz.lpk
index a83bb2a2c..f44a85172 100644
--- a/components/jvcllaz/packages/JvXPCtrlsLaz.lpk
+++ b/components/jvcllaz/packages/JvXPCtrlsLaz.lpk
@@ -20,7 +20,7 @@
         </SyntaxOptions>
       </Parsing>
     </CompilerOptions>
-    <Description Value="JvXPBar (JVCL) conversion for Lazarus version 1.0
+    <Description Value="Conversion of the JVCL XP controls to Lazarus
 "/>
     <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/>
     <Version Major="1" Release="1"/>
diff --git a/components/jvcllaz/packages/JvXPCtrlsReg.pp b/components/jvcllaz/packages/JvXPCtrlsReg.pp
index 1d470bd26..12f323799 100644
--- a/components/jvcllaz/packages/JvXPCtrlsReg.pp
+++ b/components/jvcllaz/packages/JvXPCtrlsReg.pp
@@ -11,8 +11,6 @@ procedure Register;
 
 implementation
 
-//{$R ../resource/JvXPCore.res}
-
 uses
   JvXPBar, JvXPContainer, JvXPButtons, JvXPCheckCtrls;
 
@@ -22,6 +20,7 @@ begin
     TJvXPBar,
     TJvXPContainer,
     TJvXPButton,
+    TJvXPToolButton,
     TJvXPCheckbox
   ]);
 end;
diff --git a/components/jvcllaz/resource/JvXPBarLaz.lrs b/components/jvcllaz/resource/JvXPCtrlsLaz.lrs
similarity index 77%
rename from components/jvcllaz/resource/JvXPBarLaz.lrs
rename to components/jvcllaz/resource/JvXPCtrlsLaz.lrs
index d36803b8d..5a099bae0 100644
--- a/components/jvcllaz/resource/JvXPBarLaz.lrs
+++ b/components/jvcllaz/resource/JvXPCtrlsLaz.lrs
@@ -48,6 +48,25 @@ LazarusResources.Add('TJvXpButton','PNG',[
   +#137#220#239' ,'#151' h&'#202''''#144#139#252#171#225#236'1'#253#7#147#182
   +#239#202'!'#176#21#156#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('TJvXpToolButton','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#24#8#6#0#0#0#224'w='#248#0
+  +#0#0#9'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#1'SIDATH'#137#181'T;v'
+  +#131'0'#16#156#245#227#10'qkj'#251#16'p'#137#244#185#137#201'M'#210#231#18
+  +#226#16'v'#189#181#221#167#221#20'B'#176'B'#203#2#249#204'{'#251#158#164'''f'
+  +'4#-'#196#1#130#132#26#127#2'V'#227#195#127#146#3'@'#149#200#235#141#2'<gp'
+  +#200#163#128'"'#22#17'c'#203#4'"'#218'E'#30#5#230'x'#222'{s'#231#253'3'#0#184
+  +#238'!'#183#5#20#232'xi'#212#180#1#236'('#131#163'`'#10'h'#226#223#196#182'('
+  +' '#143'['#159#9#253' 6W`'#22#205'*'#218#218'^'#15#188#213#129'!'#154#246#0
+  +'v'#140')'#186'R '#218'N'#152#238#226'q'#235#147#136'&'#7'PF'#168#162#203#4#6
+  +#213#197'L'#11'b'#253#237#130#248'(`u'#232#214#238'^"g'#172#244#193#136'<'
+  +#182']X'#21'X'#139#13#152#238#135#142#151'f'#238#130#152'av'#18';'#132'm='
+  +#188#156#231#189#167#151#179#251#164#15#214#162'G'#158'!EG'#203'U8'#216'B'
+  +#158'5'#150'H$'#203#150#8'D'#145'6'#187#131#173''''#215'?'#183'vm'#243#224
+  +#192#173#192#229'|\'#19#145'hc*'#17#140#227#10#0'$t'#239#222'!ztW}'#242#182
+  +#142#227#192#147#3#29#139'F'#197#0'N'#231'W'#223#233'Wg'#187'w?'#26'0'#183'o'
+  +#149#21#209#135#17#145#196'Y'#22#23'1'#130'0'#251#6#188#147#191#157#202'W'
+  +#164#241#13#155#136#218#131#210#31#211#156#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('TJvXpCheckbox','PNG',[
   #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#24#8#6#0#0#0#224'w='#248#0
   +#0#0#9'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#1#24'IDATH'#137#181#148
diff --git a/components/jvcllaz/run/JvXPButtons.pas b/components/jvcllaz/run/JvXPButtons.pas
index a43ef7394..fefea014b 100644
--- a/components/jvcllaz/run/JvXPButtons.pas
+++ b/components/jvcllaz/run/JvXPButtons.pas
@@ -282,20 +282,11 @@ type
     property OnStartDrag;
   end;
 
-{$IFDEF USEJVCL}
-{$IFDEF UNITVERSIONING}
-const
-  UnitVersioning: TUnitVersionInfo = (
-    RCSfile: '$URL: https://jvcl.svn.sourceforge.net/svnroot/jvcl/tags/JVCL3_32/run/JvXPButtons.pas $';
-    Revision: '$Revision: 11167 $';
-    Date: '$Date: 2007-01-27 19:57:52 +0100 (sam., 27 janv. 2007) $';
-    LogPath: 'JVCL\run'
-  );
-{$ENDIF UNITVERSIONING}
-{$ENDIF USEJVCL}
 
 implementation
 
+//{$R ../resource/JvXPCore.res}
+
 //=== { TJvXPCustomButtonActionLink } ========================================
 
 destructor TJvXPCustomButtonActionLink.Destroy;
@@ -795,7 +786,7 @@ begin
   FToolType := ttClose;
   FChangeLink := TChangeLink.Create;
   FChangeLink.OnChange := DoImagesChange;
-//  HookResized;
+  HookResized;
 end;
 
 destructor TJvXPCustomToolButton.Destroy;
@@ -885,15 +876,15 @@ begin
     begin
       lBitmap := TBitmap.Create;
       try
+        {
         lBitmap.LoadFromLazarusResource(
           PChar('JvXPCustomToolButton' + Copy(GetEnumName(TypeInfo(TJvXPToolType),
           Ord(FToolType)), 3, MaxInt)));
-        {
+          }
         lBitmap.Assign(nil); // fixes GDI resource leak
-        Bitmap.LoadFromResourceName(HInstance,
+        lBitmap.LoadFromResourceName(HInstance,
           PChar('JvXPCustomToolButton' + Copy(GetEnumName(TypeInfo(TJvXPToolType),
           Ord(FToolType)), 3, MaxInt)));
-          }
         if (dsClicked in DrawState) and (dsHighlight in DrawState) then
           JvXPColorizeBitmap(lBitmap, clWhite)
         else
@@ -984,15 +975,6 @@ begin
   LockedInvalidate;
 end;
 
-{$IFDEF USEJVCL}
-{$IFDEF UNITVERSIONING}
-initialization
-  RegisterUnitVersion(HInstance, UnitVersioning);
-
-finalization
-  UnregisterUnitVersion(HInstance);
-{$ENDIF UNITVERSIONING}
-{$ENDIF USEJVCL}
 
 end.