diff --git a/components/spktoolbar/SpkGUITools/SpkGUITools.pas b/components/spktoolbar/SpkGUITools/SpkGUITools.pas
index 55d4d5213..ab7037f3d 100644
--- a/components/spktoolbar/SpkGUITools/SpkGUITools.pas
+++ b/components/spktoolbar/SpkGUITools/SpkGUITools.pas
@@ -1905,7 +1905,7 @@ var
   OrgRgn: HRGN;
   ClipRgn: HRGN;
   //ImageIcon: TIcon;  // wp: no longer needed -- see below
-  ImageBitmap: TBitmap;
+  //ImageBitmap: TBitmap;
 begin
   // Storing original ClipRgn and applying a new one
   SaveClipRgn(ACanvas.Handle, UseOrgClipRgn, OrgRgn);
@@ -1956,7 +1956,7 @@ var
   OrgRgn: HRGN;
   ClipRgn: HRGN;
   //ImageIcon: TIcon;  // wp: no longer needed -- see below
-  ImageBitmap: TBitmap;
+  //ImageBitmap: TBitmap;
 begin
   // Storing original ClipRgn and applying a new one
   SaveClipRgn(ACanvas.Handle, UseOrgClipRgn, OrgRgn);
@@ -2508,8 +2508,8 @@ class procedure TGUITools.FillGradientRectangle(ACanvas: TCanvas;
   Rect: T2DIntRect; ColorFrom: TColor; ColorTo: TColor;
   GradientKind: TBackgroundKind);
 var
-  Mesh: array of GRADIENTRECT;
-  GradientVertice: array of TRIVERTEX;
+  Mesh: array of GRADIENTRECT = nil;
+  GradientVertice: array of TRIVERTEX = nil;
   ConcaveColor: TColor;
 begin
   case GradientKind of
diff --git a/components/spktoolbar/SpkToolbar/SpkToolbar.pas b/components/spktoolbar/SpkToolbar/SpkToolbar.pas
index d13a30416..6437d8865 100644
--- a/components/spktoolbar/SpkToolbar/SpkToolbar.pas
+++ b/components/spktoolbar/SpkToolbar/SpkToolbar.pas
@@ -301,15 +301,15 @@ type
     // *************************************************
 
     { Method called when the mouse will move over the region of Menu Button }
-    procedure MenuButtonMouseMove({%H-}Shift: TShiftState; X, Y: integer);
+    procedure MenuButtonMouseMove({%H-}Shift: TShiftState; {%H-}X, {%H-}Y: integer);
 
     { Method called when mouse pointer left the region of Menu Button }
     procedure MenuButtonMouseLeave;
 
     { Method called when the mouse button is pressed
       and at the same time the mouse pointer is over the region of Menu Button }
-    procedure MenuButtonMouseDown(Button: TMouseButton; {%H-}Shift: TShiftState;
-      X, Y: integer);
+    procedure MenuButtonMouseDown({%H-}Button: TMouseButton; {%H-}Shift: TShiftState;
+      {%H-}X, {%H-}Y: integer);
 
     { Method called when one of the mouse buttons is released
       and at the same time the region of Menu Button was active element of toolbar }
@@ -1893,7 +1893,7 @@ procedure TSpkToolbar.ValidateBuffer;
     procedure DrawMenuButtonBackground(BorderColor, GradientFrom, GradientTo: TColor; GradientKind: TBackgroundKind);
     var
       MenuButtonRegion: HRGN;
-      TmpRegion, TmpRegion2: HRGN;
+      TmpRegion: HRGN;
       aCornerRadius: Integer;
       DrawRounded: Boolean;
     begin
@@ -2550,10 +2550,6 @@ end;
 
 // MouseMove to support Menu Button
 procedure TSpkToolbar.MenuButtonMouseMove(Shift: TShiftState; X, Y: integer);
-var
-  NewTabHover: integer;
-  TabRect: T2DIntRect;
-  i: integer;
 begin
    //During rebuilding procees the mouse is ignored
    if FInternalUpdating or FUpdating then
diff --git a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas
index 7e97e7f6e..d12f912ce 100644
--- a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas
+++ b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas
@@ -79,7 +79,7 @@ type
     procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue);
 
     {$IF lcl_fullversion >= 1080000}
-    procedure AutoAdjustLayout(const AXProportion, AYProportion: Double);
+    procedure AutoAdjustLayout(const {%H-}AXProportion, AYProportion: Double);
     {$IFEND}
 
   published
diff --git a/components/spktoolbar/SpkToolbar/spkt_Const.pas b/components/spktoolbar/SpkToolbar/spkt_Const.pas
index 0ec37bab7..c6ad32a00 100644
--- a/components/spktoolbar/SpkToolbar/spkt_Const.pas
+++ b/components/spktoolbar/SpkToolbar/spkt_Const.pas
@@ -307,8 +307,10 @@ uses
 
 procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0);
 begin
+  {
   if not SPK_DPI_AWARE then
     ToDPI := FromDPI;
+  }
 
   {$IfDef Darwin}
     ToDPI := FromDPI; //macOS raster scales by itself
diff --git a/components/spktoolbar/SpkToolbar/spkt_Pane.pas b/components/spktoolbar/SpkToolbar/spkt_Pane.pas
index 4889948cc..1f3d34f4d 100644
--- a/components/spktoolbar/SpkToolbar/spkt_Pane.pas
+++ b/components/spktoolbar/SpkToolbar/spkt_Pane.pas
@@ -632,7 +632,7 @@ type
   TLayoutColumn = array of TLayoutRow;
   TLayout = array of TLayoutColumn;
 var
-  Layout: TLayout;
+  Layout: TLayout = nil;
   CurrentColumn: integer;
   CurrentRow: integer;
   CurrentItem: integer;
@@ -648,6 +648,8 @@ var
   ItemWidth: Integer;
   tmpRect: T2DIntRect;
 begin
+  Result.Rects := Default(T2DIntRectArray);
+
   SetLength(Result.Rects, FItems.count);
   Result.Width := 0;
 
diff --git a/components/spktoolbar/SpkXML/SpkXMLParser.pas b/components/spktoolbar/SpkXML/SpkXMLParser.pas
index 21895ec48..576d819aa 100644
--- a/components/spktoolbar/SpkXML/SpkXMLParser.pas
+++ b/components/spktoolbar/SpkXML/SpkXMLParser.pas
@@ -1271,7 +1271,8 @@ var // Stos przetwarzanych ga
     // Przetwarzana gałąź XMLa
     Node : TSpkXMLNode;
     // Pomocnicze ciągi znaków
-    s,s1 : string;
+    s: String = '';
+    s1: string;
     // Pozycja w pliku - linia i znak
     ParseLine, ParseChar : integer;
 
diff --git a/components/spktoolbar/designtime/spkte_EditWindow.pas b/components/spktoolbar/designtime/spkte_EditWindow.pas
index 25ab34eb1..ead0686e4 100644
--- a/components/spktoolbar/designtime/spkte_EditWindow.pas
+++ b/components/spktoolbar/designtime/spkte_EditWindow.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   LCLIntf, LCLType, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, ImgList, ComCtrls,
+  Dialogs, ImgList, ComCtrls,
   ActnList, Menus, ComponentEditors, PropEdits,
   SpkToolbar, spkt_Tab, spkt_Pane, spkt_BaseItem, spkt_Buttons, spkt_Types, spkt_Checkboxes;