diff --git a/Source/README.txt b/Source/README.txt
index e195613e..bd89101c 100644
--- a/Source/README.txt
+++ b/Source/README.txt
@@ -4,9 +4,17 @@ To build devcpp a recent Delphi version is required (10.4 and onwards).
 
 The main executable devcpp.exe can be built using the following steps:
 
-	1) Install
-		VCL Style - Windows10BlueWhale from GetIt in the IDE.
-		https://getitnow.embarcadero.com/VCLStyle-Windows10BlueWhale-1.0/
+	1) Install VCL Style Files:
+		You need to install the following package(s) by "Tools" - "GetIt Package Manager..." in the IDE.
+		Search them using the search box in the upper right corner:
+		VCL Style - Calypso 2.0
+		VCL Style - FlatUILight 2.0
+		VCL Style - Windows10BlackPearl 2.0
+		VCL Style - Windows10BlueWhale 2.0
+		
+		VCL Windows Style - Material Patterns Blue 2.0(https://getitnow.embarcadero.com/vcl-windows-style-material-patterns-blue/), Unfortunately, you can't search and install it in Delphi IDE, so you can only delete the line when compiling errors.
+		
+		
 	1) Compile and install the following package(s):
 		Source\VCL\DevCpp.dpk
 		Source\VCL\SynEdit\Packages\Sydney\Delphi\SynEditDelphi.groupproj
@@ -15,6 +23,8 @@ The main executable devcpp.exe can be built using the following steps:
 
 	2) Compile resources by running the following script(s):
 		Source\CompileResources.bat
+		Source\VCL\vcl-styles-utils\Common\CompileResources.bat
+		Source\VCL\vcl-styles-utils\Common\CompileResources_zip.bat
 		
 	3) Open the project file devcpp.dpr. Your IDE should not produce any 
 	   'Module Not Found' or 'Resource Not Found' errors when opening files, 
diff --git a/Source/VCL/SVGIconImageList/Cairo/cairo.inc b/Source/VCL/SVGIconImageList/Cairo/cairo.inc
index 87f7ebf7..be1d301f 100644
--- a/Source/VCL/SVGIconImageList/Cairo/cairo.inc
+++ b/Source/VCL/SVGIconImageList/Cairo/cairo.inc
@@ -16,7 +16,7 @@
   {$DEFINE CAIRO_HAS_FT_FONT}
 {$ENDIF}
 
-{$ifdef MSWINDOWS}
+{$ifdef WIN32}
   {$define CAIRO_HAS_WIN32_SURFACE}
   {$define CAIRO_HAS_WIN32_FONT}
 {$endif}
diff --git a/Source/VCL/SVGIconImageList/Cairo/cairo.pas b/Source/VCL/SVGIconImageList/Cairo/cairo.pas
index f1e571f3..be3e2fb9 100644
--- a/Source/VCL/SVGIconImageList/Cairo/cairo.pas
+++ b/Source/VCL/SVGIconImageList/Cairo/cairo.pas
@@ -28,7 +28,6 @@
  *)
 
 unit cairo;
-
 {$IFDEF FPC}
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
@@ -37,7 +36,7 @@
 
 interface
 uses sysutils, classes, cairolib
-{$IFDEF MSWINDOWS}
+{$IFDEF WIN32}
 , windows
 {$ENDIF}
 {$IFDEF CAIRO_HAS_RSVG_FUNCTIONS}
@@ -2860,4 +2859,3 @@ function TCairoRegion.XorRegion(other: ICairoRegion): TCairoStatus;
 end;
 
 end.
-
diff --git a/Source/VCL/SVGIconImageList/Cairo/cairolib.pas b/Source/VCL/SVGIconImageList/Cairo/cairolib.pas
index 3738ab0a..4071918b 100644
--- a/Source/VCL/SVGIconImageList/Cairo/cairolib.pas
+++ b/Source/VCL/SVGIconImageList/Cairo/cairolib.pas
@@ -47,9 +47,9 @@
 
 interface
 
-{$IFDEF MSWINDOWS}
+{$ifdef WIN32}
 uses windows;
-{$ENDIF}
+{$endif}
 
 {$ifdef UNIX}
 uses x, xlib, xrender, freetypeh;
diff --git a/Source/VCL/SVGIconImageList/Demo/Benchmark/Benchmark.dpr b/Source/VCL/SVGIconImageList/Demo/Benchmark/Benchmark.dpr
index d1156c7f..218f1dd6 100644
--- a/Source/VCL/SVGIconImageList/Demo/Benchmark/Benchmark.dpr
+++ b/Source/VCL/SVGIconImageList/Demo/Benchmark/Benchmark.dpr
@@ -8,7 +8,6 @@ uses
 
 begin
   Application.Initialize;
-  Application.Title := 'SVG Icons - Factories Benchmark';
   Application.MainFormOnTaskbar := True;
   Application.CreateForm(TfrmBenchmark, frmBenchmark);
   Application.Run;
diff --git a/Source/VCL/SVGIconImageList/Demo/Benchmark/Benchmark_Icon.ico b/Source/VCL/SVGIconImageList/Demo/Benchmark/Benchmark_Icon.ico
deleted file mode 100644
index feeaac14..00000000
Binary files a/Source/VCL/SVGIconImageList/Demo/Benchmark/Benchmark_Icon.ico and /dev/null differ
diff --git a/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.dfm b/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.dfm
index 67bd4b19..f626c7e7 100644
--- a/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.dfm
+++ b/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.dfm
@@ -2,227 +2,102 @@ object frmBenchmark: TfrmBenchmark
   Left = 0
   Top = 0
   Caption = 'Benchmark'
-  ClientHeight = 545
-  ClientWidth = 784
+  ClientHeight = 342
+  ClientWidth = 719
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -12
-  Font.Name = 'Segoe UI'
+  Font.Height = -11
+  Font.Name = 'Tahoma'
   Font.Style = []
   OldCreateOrder = False
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   PixelsPerInch = 96
-  TextHeight = 15
-  object splHorizontal: TSplitter
-    Left = 0
-    Top = 421
-    Width = 784
-    Height = 4
-    Cursor = crVSplit
-    Align = alBottom
-    AutoSnap = False
-    Beveled = True
-    MinSize = 100
-    ExplicitTop = 422
+  TextHeight = 13
+  object lblLoops: TLabel
+    Left = 304
+    Top = 316
+    Width = 28
+    Height = 13
+    Caption = '&Loops'
+    FocusControl = speLoops
   end
   object memOutput: TMemo
-    Left = 0
-    Top = 425
-    Width = 784
-    Height = 120
-    Align = alBottom
+    Left = 24
+    Top = 24
+    Width = 385
+    Height = 281
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
     Font.Height = -11
     Font.Name = 'Consolas'
     Font.Style = []
     ParentFont = False
-    ReadOnly = True
-    ScrollBars = ssVertical
     TabOrder = 0
   end
+  object btnClear: TButton
+    Left = 24
+    Top = 311
+    Width = 100
+    Height = 25
+    Caption = '&Clear'
+    TabOrder = 1
+    OnClick = btnClearClick
+  end
+  object btnLoad: TButton
+    Left = 130
+    Top = 311
+    Width = 100
+    Height = 25
+    Caption = 'L&oad Image'
+    TabOrder = 2
+    OnClick = btnLoadClick
+  end
   object SVGIconImage: TSVGIconImage
-    Left = 0
-    Top = 0
-    Width = 634
-    Height = 421
+    Left = 424
+    Top = 24
+    Width = 281
+    Height = 281
     AutoSize = False
-    ParentDoubleBuffered = False
-    DoubleBuffered = True
-    ImageList = SVGIconVirtualImageList
-    Align = alClient
+    ImageList = imlIcons
   end
-  object pnlButtons: TPanel
-    Left = 634
-    Top = 0
-    Width = 150
-    Height = 421
-    Align = alRight
-    BevelOuter = bvNone
-    TabOrder = 2
-    object btnClear: TButton
-      AlignWithMargins = True
-      Left = 10
-      Top = 386
-      Width = 130
-      Height = 30
-      Margins.Left = 10
-      Margins.Top = 5
-      Margins.Right = 10
-      Margins.Bottom = 5
-      Align = alBottom
-      Caption = '&Clear Output'
-      TabOrder = 0
-      OnClick = btnClearClick
-    end
-    object btnLoad: TButton
-      AlignWithMargins = True
-      Left = 10
-      Top = 5
-      Width = 130
-      Height = 30
-      Margins.Left = 10
-      Margins.Top = 5
-      Margins.Right = 10
-      Margins.Bottom = 5
-      Align = alTop
-      Caption = 'L&oad Image'
-      TabOrder = 1
-      OnClick = btnLoadClick
-    end
-    object btnRunBenchmark: TButton
-      AlignWithMargins = True
-      Left = 10
-      Top = 346
-      Width = 130
-      Height = 30
-      Margins.Left = 10
-      Margins.Top = 5
-      Margins.Right = 10
-      Margins.Bottom = 5
-      Align = alBottom
-      Caption = '&Benchmark'
-      TabOrder = 2
-      OnClick = btnRunBenchmarkClick
-    end
-    object chkGrayScale: TCheckBox
-      AlignWithMargins = True
-      Left = 10
-      Top = 256
-      Width = 130
-      Height = 20
-      Margins.Left = 10
-      Margins.Top = 5
-      Margins.Right = 10
-      Margins.Bottom = 5
-      Align = alBottom
-      Caption = '&Grayscale'
-      Checked = True
-      State = cbChecked
-      TabOrder = 3
-    end
-    object chkFixedColor: TCheckBox
-      AlignWithMargins = True
-      Left = 10
-      Top = 286
-      Width = 130
-      Height = 20
-      Margins.Left = 10
-      Margins.Top = 5
-      Margins.Right = 10
-      Margins.Bottom = 5
-      Align = alBottom
-      Caption = '&Fixed Color'
-      Checked = True
-      State = cbChecked
-      TabOrder = 4
-    end
-    object pnlLoops: TPanel
-      Left = 0
-      Top = 311
-      Width = 150
-      Height = 30
-      Align = alBottom
-      BevelOuter = bvNone
-      TabOrder = 5
-      object lblLoops: TLabel
-        AlignWithMargins = True
-        Left = 10
-        Top = 8
-        Width = 32
-        Height = 17
-        Margins.Left = 10
-        Margins.Top = 8
-        Margins.Right = 5
-        Margins.Bottom = 5
-        Align = alLeft
-        Caption = '&Loops'
-        FocusControl = speLoops
-        ExplicitHeight = 15
-      end
-      object speLoops: TSpinEdit
-        AlignWithMargins = True
-        Left = 52
-        Top = 5
-        Width = 88
-        Height = 24
-        Margins.Left = 5
-        Margins.Top = 5
-        Margins.Right = 10
-        Margins.Bottom = 5
-        MaxValue = 999
-        MinValue = 1
-        TabOrder = 0
-        Value = 50
-      end
-    end
-    object grpFactory: TRadioGroup
-      AlignWithMargins = True
-      Left = 10
-      Top = 45
-      Width = 130
-      Height = 105
-      Margins.Left = 10
-      Margins.Top = 5
-      Margins.Right = 10
-      Margins.Bottom = 5
-      Align = alTop
-      Caption = 'SVG Factory'
-      TabOrder = 6
-      OnClick = grpFactoryClick
-    end
-    object chkDrawVisible: TCheckBox
-      AlignWithMargins = True
-      Left = 10
-      Top = 227
-      Width = 130
-      Height = 20
-      Margins.Left = 10
-      Margins.Top = 5
-      Margins.Right = 10
-      Margins.Bottom = 5
-      Align = alBottom
-      Caption = '&Draw visible'
-      Checked = True
-      State = cbChecked
-      TabOrder = 7
-      ExplicitTop = 230
-    end
+  object btnRunBenchmark: TButton
+    Left = 447
+    Top = 309
+    Width = 100
+    Height = 25
+    Caption = '&Benchmark'
+    TabOrder = 4
+    OnClick = btnRunBenchmarkClick
+  end
+  object speLoops: TSpinEdit
+    Left = 360
+    Top = 311
+    Width = 81
+    Height = 22
+    MaxValue = 999
+    MinValue = 10
+    TabOrder = 5
+    Value = 100
   end
   object SVGIconImageCollection: TSVGIconImageCollection
     SVGIconItems = <>
     Left = 48
     Top = 40
   end
+  object imlIcons: TVirtualImageList
+    AutoFill = True
+    DisabledGrayscale = False
+    DisabledSuffix = '_Disabled'
+    Images = <>
+    ImageCollection = SVGIconImageCollection
+    Left = 48
+    Top = 88
+  end
   object OpenDialog: TOpenDialog
     DefaultExt = '*.svg'
     Left = 48
     Top = 136
   end
-  object SVGIconVirtualImageList: TSVGIconVirtualImageList
-    ImageCollection = SVGIconImageCollection
-    Left = 48
-    Top = 88
-  end
 end
diff --git a/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.pas b/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.pas
index 65da3d67..da96f01b 100644
--- a/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.pas
+++ b/Source/VCL/SVGIconImageList/Demo/Benchmark/UBenchmark.pas
@@ -1,25 +1,18 @@
-{-----------------------------------------------------------------------------
- Unit Name: UBenchmark
- Author:    Lübbe Onken
- Purpose:   Main form for SVG Factories Benchmark
- History:
------------------------------------------------------------------------------}
 unit UBenchmark;
 
 interface
 
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls,
-  System.ImageList, //if you are compiling with older version than XE7 remove this line
-  Vcl.ImgList,
+  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, System.ImageList,
+  Vcl.ImgList, Vcl.VirtualImageList, Vcl.BaseImageCollection,
   SVGInterfaces,
-  SVGIconImageCollection, SVGIconImage, Vcl.Samples.Spin, Vcl.ExtCtrls,
-  SVGIconImageListBase, SVGIconVirtualImageList;
+  SVGIconImageCollection, SVGIconImage, Vcl.Samples.Spin;
 
 type
   TfrmBenchmark = class(TForm)
     SVGIconImageCollection: TSVGIconImageCollection;
+    imlIcons: TVirtualImageList;
     memOutput: TMemo;
     btnClear: TButton;
     btnLoad: TButton;
@@ -28,38 +21,19 @@   TfrmBenchmark = class(TForm)
     btnRunBenchmark: TButton;
     speLoops: TSpinEdit;
     lblLoops: TLabel;
-    pnlButtons: TPanel;
-    chkGrayScale: TCheckBox;
-    chkFixedColor: TCheckBox;
-    splHorizontal: TSplitter;
-    pnlLoops: TPanel;
-    grpFactory: TRadioGroup;
-    chkDrawVisible: TCheckBox;
-    SVGIconVirtualImageList: TSVGIconVirtualImageList;
     procedure btnClearClick(Sender: TObject);
     procedure btnLoadClick(Sender: TObject);
-    procedure btnRunBenchmarkClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure grpFactoryClick(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure btnRunBenchmarkClick(Sender: TObject);
   private
-    FSvgSource  : string;
+    FImageStream: TMemoryStream;
     FStartTick  : Int64;
     FLastTick   : Int64;
-    FLine       : string;
-    FInBenchmark: boolean;
-
-    function GetFactoryName: string;
-    procedure SetFactory(AIndex: integer);
-
-    procedure BenchmarkLoad;
-    procedure BenchmarkGrayScale;
-    procedure BenchmarkFixedColor;
-    procedure BenchmarkDraw;
-
-    procedure LogTicks(var AMessage: string; ATick: Int64);
-    procedure PrepareBenchmark(ACaption: string);
-    procedure ReloadImage;
-    procedure RunBenchmark(AIndex: integer);
+    procedure LogTicks(var AMessage: string; const ASuffix: string; ATick: Int64);
+    procedure RunBenchmark(AFactoryName: string; AFactory: ISVGFactory);
+  public
+    { Public-Deklarationen }
   end;
 
 var
@@ -71,97 +45,15 @@ implementation
   CairoSVGFactory,
   D2DSVGFactory,
   PasSVGFactory,
-  System.IOUtils,
-  System.Math,
-  System.StrUtils,
-  System.TypInfo,
   System.Types;
 
 {$R *.dfm}
 
 
-type
-  TCanvasImage = class(TSVGIconImage) // Just to have something to paint on
-  public
-    property Canvas;
-  end;
-
-procedure TfrmBenchmark.BenchmarkDraw;
-
-  procedure DrawOnCanvas(ACanvas: TCanvas);
-  var
-    I    : integer;
-    LStep: real;
-    LSize: real;
-    LRect: TRect;
-  begin
-    LStep := Min(ACanvas.ClipRect.Width, ACanvas.ClipRect.Height) / speLoops.Value;
-    LSize := 0;
-
-    for I := 1 to speLoops.Value do
-      begin
-        LSize := LSize + LStep;
-        LRect := TRect.Create(0, 0, Round(LSize), Round(LSize));
-
-        SvgIconImageCollection.Draw(ACanvas, LRect, 0, true);
-      end;
-  end;
-
-var
-  LBitmap: TBitmap;
-begin
-  // Benchmark Draw
-  if chkDrawVisible.Checked then
-    DrawOnCanvas(TCanvasImage(SVGIconImage).Canvas)
-  else
-    begin
-      LBitmap := TBitmap.Create;
-      try
-        LBitmap.Width := SvgIconImage.Height;
-        LBitmap.Width := SvgIconImage.Width;
-
-        DrawOnCanvas(LBitmap.Canvas);
-      finally
-        LBitmap.Free;
-      end;
-    end;
-end;
-
-procedure TfrmBenchmark.BenchmarkFixedColor;
-begin
-  SVGIconImageCollection.FixedColor := clLime;
-end;
-
-procedure TfrmBenchmark.BenchmarkGrayScale;
-begin
-  SVGIconImageCollection.GrayScale := true;
-end;
-
-procedure TfrmBenchmark.BenchmarkLoad;
-var
-  I   : integer;
-  LSvg: ISvg;
-begin
-  SVGIconImageCollection.SVGIconItems.BeginUpdate;
-  try
-    SVGIconImageCollection.SVGIconItems.Clear;
-    SVGIconImageCollection.FixedColor := clDefault;
-    SVGIconImageCollection.GrayScale := false;
-
-    for I := 1 to speLoops.Value do
-      begin
-        LSvg := GlobalSvgFactory.NewSvg;
-        LSvg.Source := FSvgSource;
-        SVGIconImageCollection.Add(LSvg, '');
-      end;
-  finally
-    SVGIconImageCollection.SVGIconItems.EndUpdate;
-  end;
-end;
-
 procedure TfrmBenchmark.btnClearClick(Sender: TObject);
 begin
   memOutput.Clear;
+  SVGIconImageCollection.ClearIcons;
 end;
 
 procedure TfrmBenchmark.btnLoadClick(Sender: TObject);
@@ -170,172 +62,101 @@ procedure TfrmBenchmark.btnLoadClick(Sender: TObject);
 begin
   if OpenDialog.Execute then
     begin
-      FSvgSource := TFile.ReadAllText(OpenDialog.FileName);
-
-      PrepareBenchmark('Factory    |  Load  |  Draw  | Total');
-
-      LSvg := GlobalSvgFactory.NewSvg;
-      LSvg.Source := FSvgSource;
-      LogTicks(FLine, FLastTick);
+      FImageStream.LoadFromFile(OpenDialog.FileName);
+      FImageStream.Position := 0;
 
       SVGIconImageCollection.SVGIconItems.Clear;
+      LSvg := GlobalSvgFactory.NewSvg;
+      LSvg.LoadFromStream(FImageStream);
       SVGIconImageCollection.Add(LSvg, '');
       SVGIconImage.ImageIndex := 0;
-
-      LogTicks(FLine, FLastTick);
-      LogTicks(FLine, FStartTick);
     end;
 end;
 
 procedure TfrmBenchmark.btnRunBenchmarkClick(Sender: TObject);
-var
-  LLine: string;
 begin
-  if (FSvgSource = '') then
+  if (FImageStream.Size = 0) then
     memOutput.Lines.Add('Please load a SVG image first')
   else
     begin
-      FInBenchmark := true;
-      try
-        SVGIconImage.ImageIndex := -1;
-
-        LLine := 'Factory    |  Load  |  Draw  ';
-        if chkGrayScale.Checked then
-          LLine := LLine + '|  Gray  |  Draw  ';
-        if chkFixedColor.Checked then
-          LLine := LLine + '|  Fixed |  Draw  ';
-        LLine := LLine + '|  Total';
-
-        memOutput.Lines.Add('');
-        memOutput.Lines.Add(Format('Benchmark: Repeat %d times. Draw %svisible.', [speLoops.Value, IfThen(chkDrawVisible.Checked, '', 'in')]));
+      SVGIconImage.ImageIndex := -1;
 
-        memOutput.Lines.Add(LLine);
-        RunBenchmark(0);
-        RunBenchmark(1);
-        RunBenchmark(2);
+      memOutput.Lines.Add(Format('Factory    | Load %3d | Draw %3d |   Total  |', [speLoops.Value, speLoops.Value]));
+      RunBenchmark('Direct 2D', GetD2DSVGFactory);
+      RunBenchmark('Pascal', GetPasSVGFactory);
+      RunBenchmark('Cairo', GetCairoSVGFactory);
 
-        SVGIconImage.ImageIndex := 0;
-      finally
-        FInBenchmark := false;
-      end;
+      SVGIconImage.ImageIndex := 0;
     end;
 end;
 
 procedure TfrmBenchmark.FormCreate(Sender: TObject);
 begin
-  Caption := Application.Title;
-  FInBenchmark := false;
-  grpFactory.Items.Add('Pascal');
-  grpFactory.Items.Add('Direct 2D');
-  grpFactory.Items.Add('Cairo');
-  SetFactory(0);
+  FImageStream := TMemoryStream.Create;
 end;
 
-function TfrmBenchmark.GetFactoryName: string;
+procedure TfrmBenchmark.FormDestroy(Sender: TObject);
 begin
-  if grpFactory.ItemIndex > -1 then
-    Result := grpFactory.Items[grpFactory.ItemIndex]
-  else
-    Result := '';
+  FImageStream.Free;
 end;
 
-procedure TfrmBenchmark.grpFactoryClick(Sender: TObject);
-begin
-  if not FInBenchmark then
-    begin
-      SetFactory(grpFactory.ItemIndex);
-      ReloadImage;
-    end;
-end;
-
-procedure TfrmBenchmark.LogTicks(var AMessage: string; ATick: Int64);
+procedure TfrmBenchmark.LogTicks(var AMessage: string; const ASuffix: string; ATick: Int64);
 var
   LCurrentTick: Int64;
 begin
   LCurrentTick := GetTickCount;
-  AMessage := Format('%s | %6d', [AMessage, LCurrentTick - ATick]);
+  AMessage := Format('%s | %8d%s', [AMessage, LCurrentTick - ATick, ASuffix]);
   memOutput.Lines[memOutput.Lines.Count - 1] := AMessage;
   FLastTick := LCurrentTick;
 end;
 
-procedure TfrmBenchmark.PrepareBenchmark(ACaption: string);
-begin
-  if ACaption <> '' then
-    memOutput.Lines.Add(ACaption);
-
-  FLine := Format('%-10s', [GetFactoryName]);
-  memOutput.Lines.Add(FLine);
-
-  FStartTick := GetTickCount;
-  FLastTick := FStartTick;
-end;
+type
+  TCanvasImage = class(TSVGIconImage)
+  public
+    property Canvas;
+  end;
 
-procedure TfrmBenchmark.ReloadImage;
+procedure TfrmBenchmark.RunBenchmark(AFactoryName: string; AFactory: ISVGFactory);
 var
-  LSvg: ISvg;
+  LSvg : ISvg;
+  I    : integer;
+  LStep: real;
+  LSize: real;
+  LRect: TRect;
+  LLine: string;
 begin
-  if FSvgSource <> '' then
-    begin
-      PrepareBenchmark('Factory    |  Load  |  Draw  | Total');
-
-      LSvg := GlobalSvgFactory.NewSvg;
-      LSvg.Source := FSvgSource;
-      LogTicks(FLine, FLastTick);
+  LLine := Format('%-10s', [AFactoryName]);
+  memOutput.Lines.Add(LLine);
 
-      SVGIconImage.ImageIndex := -1;
-      SVGIconImageCollection.SVGIconItems.Clear;
-      SVGIconImageCollection.Add(LSvg, '');
-      SVGIconImage.ImageIndex := 0;
-      LogTicks(FLine, FLastTick);
-      LogTicks(FLine, FStartTick);
-    end;
-end;
-
-procedure TfrmBenchmark.RunBenchmark(AIndex: integer);
+  FStartTick := GetTickCount;
+  FLastTick := FStartTick;
 
-  procedure Benchmark(AProc: TPRoc);
-  begin
-    if Assigned(AProc) then
+  SVGIconImageCollection.SVGIconItems.BeginUpdate;
+  try
+    SVGIconImageCollection.SVGIconItems.Clear;
+    for I := 1 to speLoops.Value do
       begin
-        AProc;
-        LogTicks(FLine, FLastTick);
+        LSvg := AFactory.NewSvg;
+        FImageStream.Position := 0;
+        LSvg.LoadFromStream(FImageStream);
+        SVGIconImageCollection.Add(LSvg, '');
       end;
+  finally
+    SVGIconImageCollection.SVGIconItems.EndUpdate;
   end;
 
-begin
-  SetFactory(AIndex);
-
-  PrepareBenchmark('');
+  LogTicks(LLine, '', FLastTick);
 
-  Benchmark(BenchmarkLoad);
-  Benchmark(BenchmarkDraw);
-
-  if chkGrayScale.Checked then
+  LStep := SvgIconImage.Height / 100;
+  LSize := 0;
+  for I := 1 to speLoops.Value do
     begin
-      Benchmark(BenchmarkGrayScale);
-      Benchmark(BenchmarkDraw);
+      LSize := LSize + LStep;
+      LRect := TRect.Create(0, 0, Round(LSize), Round(LSize));
+      SvgIconImageCollection.Draw(TCanvasImage(SVGIconImage).Canvas, LRect, 0);
     end;
-
-  if chkFixedColor.Checked then
-    begin
-      Benchmark(BenchmarkFixedColor);
-      Benchmark(BenchmarkDraw);
-    end;
-
-  LogTicks(FLine, FStartTick);
-end;
-
-procedure TfrmBenchmark.SetFactory(AIndex: integer);
-begin
-  case AIndex of
-    0:
-      SetGlobalSvgFactory(GetPasSVGFactory);
-    1:
-      SetGlobalSvgFactory(GetD2DSVGFactory);
-    2:
-      SetGlobalSvgFactory(GetCairoSVGFactory);
-  end;
-  grpFactory.ItemIndex := AIndex;
+  LogTicks(LLine, '', FLastTick);
+  LogTicks(LLine, ' |', FStartTick);
 end;
 
 end.
diff --git a/Source/VCL/SVGIconImageList/Demo/Images/ComponentEditor.jpg b/Source/VCL/SVGIconImageList/Demo/Images/ComponentEditor.jpg
index 2f156276..335c76d9 100644
Binary files a/Source/VCL/SVGIconImageList/Demo/Images/ComponentEditor.jpg and b/Source/VCL/SVGIconImageList/Demo/Images/ComponentEditor.jpg differ
diff --git a/Source/VCL/SVGIconImageList/Demo/Source/UIconPickerFMX.pas b/Source/VCL/SVGIconImageList/Demo/Source/UIconPickerFMX.pas
index 9d3fea46..ace0a422 100644
--- a/Source/VCL/SVGIconImageList/Demo/Source/UIconPickerFMX.pas
+++ b/Source/VCL/SVGIconImageList/Demo/Source/UIconPickerFMX.pas
@@ -92,7 +92,6 @@ procedure PaintToBitmap(const ABitmap: TBitmap; const ASVG: TSVG);
   GPGraphics := TGPGraphics.Create(GPBitmap);
   try
     GPGraphics.SetSmoothingMode(SmoothingModeAntiAlias);
-    GPGraphics.SetPixelOffsetMode(PixelOffsetModeHalf);
     GPRectF.X := 0;
     GPRectF.Y := 0;
     GPRectF.Width := ABitmap.Width;
diff --git a/Source/VCL/SVGIconImageList/Source/CairoSVGFactory.pas b/Source/VCL/SVGIconImageList/Source/CairoSVGFactory.pas
index 8c59192f..d92db391 100644
--- a/Source/VCL/SVGIconImageList/Source/CairoSVGFactory.pas
+++ b/Source/VCL/SVGIconImageList/Source/CairoSVGFactory.pas
@@ -38,13 +38,10 @@   TCairoSVG = class(TInterfacedObject, ISVG)
   private const
     cEmptySvg = '<svg xmlns="http://www.w3.org/2000/svg"></svg>';
   private
-    FSource    : string;
-    FSvgObject : IRSVGObject;
-    FWidth     : Single;
-    FHeight    : Single;
-    FFixedColor: TColor;
-    FGrayScale : Boolean;
-    FOpacity   : Single;
+    FSource   : string;
+    FSvgObject: IRSVGObject;
+    FHeight   : Single;
+    FWidth    : Single;
     // property access methods
     function GetWidth: Single;
     function GetHeight: Single;
@@ -59,15 +56,12 @@   TCairoSVG = class(TInterfacedObject, ISVG)
     // procedures and functions
     function IsEmpty: Boolean;
     procedure Clear;
-    procedure PaintTo(DC: HDC; R: TRectF; KeepAspectRatio: Boolean = True);
-    procedure LoadFromSource(const ASource: string);
-    procedure LoadFromFile(const AFileName: string);
+    procedure SaveToStream(AStream: TStream);
+    procedure SaveToFile(const AFileName: string);
+    procedure LoadFromSource;
     procedure LoadFromStream(AStream: TStream);
-    procedure SaveToFile(const AFileName: string); overload;
-    procedure SaveToStream(AStream: TStream); overload;
-    procedure SaveToStream(AStream: TStream; const ASource: string); overload;
-    procedure SourceFromStream(AStream: TStream);
-    procedure SvgFromStream(AStream: TStream);
+    procedure LoadFromFile(const AFileName: string);
+    procedure PaintTo(DC: HDC; R: TRectF; KeepAspectRatio: Boolean = True);
   public
     constructor Create;
   end;
@@ -99,19 +93,16 @@ procedure TCairoSVG.Clear;
 constructor TCairoSVG.Create;
 begin
   FSvgObject := TRSVGObject.Create;
-  FFixedColor := TColors.SysDefault; // clDefault
-  FGrayScale := false;
-  FOpacity := 1.0;
 end;
 
 function TCairoSVG.GetFixedColor: TColor;
 begin
-  Result := FFixedColor;
+
 end;
 
 function TCairoSVG.GetGrayScale: Boolean;
 begin
-  Result := FGrayScale;
+
 end;
 
 function TCairoSVG.GetHeight: Single;
@@ -121,7 +112,7 @@ function TCairoSVG.GetHeight: Single;
 
 function TCairoSVG.GetOpacity: Single;
 begin
-  Result := FOpacity;
+
 end;
 
 function TCairoSVG.GetSource: string;
@@ -151,34 +142,33 @@ procedure TCairoSVG.LoadFromFile(const AFileName: string);
   end;
 end;
 
-procedure TCairoSVG.LoadFromSource(const ASource: string);
+procedure TCairoSVG.LoadFromSource;
 var
-  LMemoryStream: TMemoryStream;
+  LStream: TMemoryStream;
 begin
-  if ASource = '' then
+  if FSource = '' then
     Clear;
 
-  LMemoryStream := TMemoryStream.Create;
+  LStream := TMemoryStream.Create;
   try
-    SaveToStream(LMemoryStream, ASource);
-    LMemoryStream.Position := 0;
-    SvgFromStream(LMemoryStream);
+    SaveToStream(LStream);
+    LStream.Position := 0;
+    LoadFromStream(LStream);
   finally
-    LMemoryStream.Free;
+    LStream.Free;
   end;
 end;
 
 procedure TCairoSVG.LoadFromStream(AStream: TStream);
-Var
-  LStreamPos: Int64;
 begin
-  // read and save the Source
-  LStreamPos := AStream.Position;
-  SourceFromStream(AStream);
-  // Restore Position
-  AStream.Position := LStreamPos;
-  // Now create the SVG
-  SvgFromStream(AStream);
+  try
+    FSvgObject := TRSVGObject.Create(AStream);
+    FHeight := FSvgObject.Dimensions.height;
+    FWidth := FSvgObject.Dimensions.width;
+  except
+    on E: Exception do
+      raise Exception.CreateFmt(CAIRO_ERROR_PARSING_SVG_TEXT, [E.Message]);
+  end;
 end;
 
 procedure TCairoSVG.PaintTo(DC: HDC; R: TRectF; KeepAspectRatio: Boolean);
@@ -224,32 +214,27 @@ procedure TCairoSVG.SaveToFile(const AFileName: string);
   end;
 end;
 
-procedure TCairoSVG.SaveToStream(AStream: TStream; const ASource: string);
+procedure TCairoSVG.SaveToStream(AStream: TStream);
 var
   LBuffer: TBytes;
 begin
-  LBuffer := TEncoding.UTF8.GetBytes(ASource);
+  LBuffer := TEncoding.UTF8.GetBytes(FSource);
   AStream.WriteBuffer(LBuffer, Length(LBuffer))
 end;
 
-procedure TCairoSVG.SaveToStream(AStream: TStream);
-begin
-  SaveToStream(AStream, FSource);
-end;
-
 procedure TCairoSVG.SetFixedColor(const AColor: TColor);
 begin
-  // TODO: Implement recoloring
+
 end;
 
 procedure TCairoSVG.SetGrayScale(const IsGrayScale: Boolean);
 begin
-  // TODO: Implement recoloring
+
 end;
 
 procedure TCairoSVG.SetOpacity(const AOpacity: Single);
 begin
-  // TODO: Implement setting opacity
+
 end;
 
 procedure TCairoSVG.SetSource(const ASource: string);
@@ -257,31 +242,8 @@ procedure TCairoSVG.SetSource(const ASource: string);
   if FSource <> ASource then
     begin
       FSource := ASource;
-      LoadFromSource(ASource);
+      LoadFromSource;
     end;
 end;
 
-procedure TCairoSVG.SourceFromStream(AStream: TStream);
-var
-  LSize  : Integer;
-  LBuffer: TBytes;
-begin
-  LSize := AStream.Size - AStream.Position;
-  SetLength(LBuffer, LSize);
-  AStream.Read(LBuffer, 0, LSize);
-  FSource := TEncoding.UTF8.GetString(LBuffer);
-end;
-
-procedure TCairoSVG.SvgFromStream(AStream: TStream);
-begin
-  try
-    FSvgObject := TRSVGObject.Create(AStream);
-    FHeight := FSvgObject.Dimensions.height;
-    FWidth := FSvgObject.Dimensions.width;
-  except
-    on E: Exception do
-      raise Exception.CreateFmt(CAIRO_ERROR_PARSING_SVG_TEXT, [E.Message]);
-  end;
-end;
-
 end.
diff --git a/Source/VCL/SVGIconImageList/Source/D2DSVGFactory.pas b/Source/VCL/SVGIconImageList/Source/D2DSVGFactory.pas
index 0fc5593a..bbdc07db 100644
--- a/Source/VCL/SVGIconImageList/Source/D2DSVGFactory.pas
+++ b/Source/VCL/SVGIconImageList/Source/D2DSVGFactory.pas
@@ -18,6 +18,9 @@ function RenderTarget: ID2D1DCRenderTarget;
 // Support functions
 function WinSvgSupported: Boolean;
 
+resourcestring
+  D2D_ERROR_PARSING_SVG_TEXT = 'Error parsing SVG Text: %s';
+
 implementation
 
 Uses
@@ -30,13 +33,10 @@ implementation
   System.UITypes,
   System.UIConsts,
   System.SysUtils,
-  System.Classes,
-  System.RegularExpressions;
+  System.Classes;
 
 resourcestring
-  D2D_ERROR_NOT_AVAILABLE    = 'Windows SVG support is not available';
-  D2D_ERROR_PARSING_SVG_TEXT = 'Error parsing SVG Text: %s';
-  D2D_ERROR_UNSUPPORTED_SVG  = '<style> or <text> elements and class="" attributes are not supported by Windows SVG';
+  SvgNotSupported = 'Windows SVG support is not available';
 
 type
 
@@ -70,9 +70,6 @@   TD2DSVG = class(TInterfacedObject, ISVG)
     procedure LoadFromSource;
     procedure SourceFromStream(Stream: TStream);
     procedure SvgFromStream(Stream: TStream);
-    {$IFDEF CheckForUnsupportedSvg}
-    procedure CheckForUnsupportedSvg;
-    {$ENDIF}
   public
     constructor Create;
   end;
@@ -87,20 +84,8 @@   TD2DSVGHandler = class(TInterfacedObject, ISVGFactory)
     class function RT: ID2D1DCRenderTarget; static;
   end;
 
-{$INCLUDE SVGIconImageList.inc}
-
 { TD2DSVG }
 
-{$IFDEF CheckForUnsupportedSvg}
-procedure TD2DSVG.CheckForUnsupportedSvg;
-const
-  cRegEx = '(\<(style|text)|class=\")';
-begin
-  if TRegEx.IsMatch(FSource, cRegEx, [roIgnoreCase]) then
-    raise Exception.CreateRes(@D2D_ERROR_UNSUPPORTED_SVG);
-end;
-{$ENDIF}
-
 procedure TD2DSVG.Clear;
 Const
   EmptySvg = '<svg xmlns="http://www.w3.org/2000/svg"></svg>';
@@ -152,7 +137,7 @@ procedure TD2DSVG.SvgFromStream(Stream: TStream);
       fSvgDoc.SetViewportSize(D2D1SizeF(fWidth, fHeight));
   end
   else
-    raise Exception.CreateRes(@D2D_ERROR_NOT_AVAILABLE);
+    raise Exception.CreateRes(@SvgNotSupported);
 end;
 
 procedure TD2DSVG.LoadFromFile(const FileName: string);
@@ -174,10 +159,6 @@ procedure TD2DSVG.LoadFromSource;
   fSvgDoc := nil;
   if fSource = '' then Exit;
 
-{$IFDEF CheckForUnsupportedSvg}
-  CheckForUnsupportedSvg;
-{$ENDIF}
-
   try
     MStream := TMemoryStream.Create;
     try
diff --git a/Source/VCL/SVGIconImageList/Source/FMX.SVGIconImageList.pas b/Source/VCL/SVGIconImageList/Source/FMX.SVGIconImageList.pas
index aa467f2f..10e8229c 100644
--- a/Source/VCL/SVGIconImageList/Source/FMX.SVGIconImageList.pas
+++ b/Source/VCL/SVGIconImageList/Source/FMX.SVGIconImageList.pas
@@ -223,7 +223,6 @@ procedure PaintToBitmap(const ABitmap: TBitmap; const ASVG: TSVG);
   GPGraphics := TGPGraphics.Create(GPBitmap);
   try
     GPGraphics.SetSmoothingMode(SmoothingModeAntiAlias);
-    GPGraphics.SetPixelOffsetMode(PixelOffsetModeHalf);
     GPRectF.X := 0;
     GPRectF.Y := 0;
     GPRectF.Width := ABitmap.Width;
diff --git a/Source/VCL/SVGIconImageList/Source/SVGIconImageCollection.pas b/Source/VCL/SVGIconImageList/Source/SVGIconImageCollection.pas
index 5aeb59d9..096bf128 100644
--- a/Source/VCL/SVGIconImageList/Source/SVGIconImageCollection.pas
+++ b/Source/VCL/SVGIconImageList/Source/SVGIconImageCollection.pas
@@ -92,7 +92,6 @@   TSVGIconImageCollection = class(TComponent)
     procedure Draw(ACanvas: TCanvas; ARect: TRect; AIndex: Integer; AProportional: Boolean = False); override;
     {$ELSE}
     procedure Change;
-    procedure Draw(ACanvas: TCanvas; ARect: TRect; AIndex: Integer; AProportional: Boolean = False);
     {$ENDIF}
 
     constructor Create(AOwner: TComponent); override;
@@ -422,14 +421,6 @@ function TSVGIconImageCollection.GetBitmap(AIndex: Integer; AWidth, AHeight: Int
     Result := nil;
 end;
 
-{$ELSE}
-procedure TSVGIconImageCollection.Change;
-begin
-  FSVGItems.BeginUpdate;
-  FSVGItems.EndUpdate;
-end;
-{$ENDIF}
-
 procedure TSVGIconImageCollection.Draw(ACanvas: TCanvas; ARect: TRect; AIndex: Integer;
   AProportional: Boolean = False);
 var
@@ -450,5 +441,12 @@ procedure TSVGIconImageCollection.Draw(ACanvas: TCanvas; ARect: TRect; AIndex: I
 
   LSVG.PaintTo(ACanvas.Handle, TRectF.Create(ARect), AProportional);
 end;
+{$ELSE}
+procedure TSVGIconImageCollection.Change;
+begin
+  FSVGItems.BeginUpdate;
+  FSVGItems.EndUpdate;
+end;
+{$ENDIF}
 
 end.
diff --git a/Source/VCL/SVGIconImageList/Source/SVGIconImageList.inc b/Source/VCL/SVGIconImageList/Source/SVGIconImageList.inc
index db8cd90a..76e98cf4 100644
--- a/Source/VCL/SVGIconImageList/Source/SVGIconImageList.inc
+++ b/Source/VCL/SVGIconImageList/Source/SVGIconImageList.inc
@@ -130,7 +130,24 @@
   {$DEFINE D10_2+}
   {$DEFINE D10_3+}
   {$DEFINE D10_4+}
-  {$DEFINE D11+}
+{$ENDIF}
+
+// Delphi 12
+{$IFDEF VER360}
+  {$DEFINE D2010+}
+  {$DEFINE DXE+}
+  {$DEFINE DXE2+}
+  {$DEFINE DXE3+}
+  {$DEFINE DXE4+}
+  {$DEFINE DXE5+}
+  {$DEFINE DXE6+}
+  {$DEFINE DXE7+}
+  {$DEFINE DXE8+}
+  {$DEFINE D10_0+}
+  {$DEFINE D10_1+}
+  {$DEFINE D10_2+}
+  {$DEFINE D10_3+}
+  {$DEFINE D10_4+}
 {$ENDIF}
 
 {$IFDEF D10_3+}
@@ -139,14 +156,8 @@
 
 //Prefer Engine Direct2D by Kiriakos Vlahos
 //if supported by Windows Platform (from Windows Creators update)
-{.$DEFINE PreferNativeSvgSupport}
+{$DEFINE PreferNativeSvgSupport}
 {.$DEFINE GPUSupport}
-{$IFDEF PreferNativeSvgSupport}
-  // Throw an exception if the SVG contains text elements or class attributes
-  // which are not supported by Windows SVG. Since it costs some performance,
-  // you should only turn it on during debugging or if it's absolutely necessary.
-  {.$DEFINE CheckForUnsupportedSvg}
-{$ENDIF}
 
 //if PreferNativeSvgSupport not active or not available:
 //use Delphi Engine TSVG by Martin Walter (included into SVG folder)
diff --git a/Source/VCL/SVGIconImageList/Source/SVGIconItems.pas b/Source/VCL/SVGIconImageList/Source/SVGIconItems.pas
index 8767c34a..14952087 100644
--- a/Source/VCL/SVGIconImageList/Source/SVGIconItems.pas
+++ b/Source/VCL/SVGIconImageList/Source/SVGIconItems.pas
@@ -110,7 +110,6 @@ implementation
 
 uses
   System.SysUtils,
-  VCL.Controls,
   VCL.Themes,
 {$IFDEF D10_3+}
   BaseImageCollection,
@@ -395,7 +394,6 @@ procedure TSVGIconItems.Update(Item: TCollectionItem);
   System.Messaging.TMessageManager.DefaultManager.SendMessage(Self,
     TSVGItemsUpdateMessage.Create);
 
-  {$IFNDEF D11+}
   {$IFDEF D10_3+}
   if Owner is TSVGIconImageCollection then
   begin
@@ -404,11 +402,9 @@ procedure TSVGIconItems.Update(Item: TCollectionItem);
     else
       System.Messaging.TMessageManager.DefaultManager.SendMessage(nil,
         TImageCollectionChangedMessage.Create(TSVGIconImageCollection(Owner),
-          Item.Index,
-          TSVGIconItem(Item).IconName));
+          Item.Index, TSVGIconItem(Item).IconName));
   end;
   {$ENDIF}
-  {$ENDIF}
 end;
 
 end.
diff --git a/Source/VCL/SVGIconImageList/Svg/BitmapCodecSVG.pas b/Source/VCL/SVGIconImageList/Svg/BitmapCodecSVG.pas
index 6c3888c5..39c7d4e7 100644
--- a/Source/VCL/SVGIconImageList/Svg/BitmapCodecSVG.pas
+++ b/Source/VCL/SVGIconImageList/Svg/BitmapCodecSVG.pas
@@ -155,8 +155,6 @@ function TBitmapCodecSVG.CopyToSurface(const ASVG: TSVG; const Bitmap: TBitmapSu
   try
     Status := GPGraphics.SetSmoothingMode(SmoothingModeAntiAlias);
     OutputDebugString(PChar('SetSmoothingMode ' + IntToStr(Ord(Status))));
-    Status := GPGraphics.SetPixelOffsetMode(PixelOffsetModeHalf);
-    OutputDebugString(PChar('PixelOffsetModeHalf ' + IntToStr(Ord(Status))));
 
     GPRectF.X := 0;
     GPRectF.Y := 0;
diff --git a/Source/VCL/SVGIconImageList/Svg/SVG.pas b/Source/VCL/SVGIconImageList/Svg/SVG.pas
index 929c80bf..5cb89ecb 100644
--- a/Source/VCL/SVGIconImageList/Svg/SVG.pas
+++ b/Source/VCL/SVGIconImageList/Svg/SVG.pas
@@ -29,7 +29,6 @@
 { Kiriakos Vlahos (Replacement of MSXLML with XMLite)              }
 { Kiriakos Vlahos (Refactoring parsing)                            }
 { Kiriakos Vlahos (Refactoring parsing Font)                       }
-{ Kiriakos Vlahos (Increase performances using Dictionary)         }
 {                                                                  }
 { This Software is distributed on an "AS IS" basis, WITHOUT        }
 { WARRANTY OF ANY KIND, either express or implied.                 }
@@ -108,7 +107,7 @@   TSVGObject = class abstract (TPersistent)
     procedure Delete(Index: Integer);
     function Remove(Item: TSVGObject): Integer;
     function IndexOf(Item: TSVGObject): Integer;
-    function FindByID(const Name: string): TSVGObject; virtual;
+    function FindByID(const Name: string): TSVGObject;
     procedure CalculateMatrices;
     function ObjectBounds(IncludeStroke: Boolean = False;
       ApplyTranform: Boolean = False): TRectF; virtual;
@@ -279,7 +278,6 @@   TSVG = class(TSVGBasic)
     FFileName: string;
     FGrayscale: Boolean;
     FFixedColor: TColor;
-    FIdDict: TDictionary<string, TSVGObject>;
 
     procedure SetViewBox(const Value: TRectF);
 
@@ -306,7 +304,6 @@   TSVG = class(TSVGBasic)
 
     procedure DeReferenceUse;
     function GetStyleValue(const Name, Key: string): string;
-    function FindByID(const Name: string): TSVGObject; override;
 
     procedure LoadFromText(const Text: string);
     procedure LoadFromFile(const FileName: string);
@@ -332,7 +329,6 @@   TSVG = class(TSVGBasic)
     property ViewBox: TRectF read FViewBox write SetViewBox;
     property Grayscale: boolean read FGrayscale write SetGrayscale;
     property FixedColor: TColor read FFixedColor write SetFixedColor;
-    property IdDict : TDictionary<string, TSVGObject> read FIdDict;
 
     class function Features: TSVGElementFeatures; override;
   end;
@@ -431,9 +427,9 @@   TSVGEllipse = class(TSVGShape)
 
   TSVGPath = class(TSVGShape)
   private
-    function SeparateValues(const ACommand: Char; const S: string; CommandList:
-        TList<Char>; ValueList: TList<TFloat>): Boolean;
-    procedure Split(const S: string; CommandList: TList<Char>;  ValueList: TList<TFloat>);
+    procedure PrepareMoveLineCurveArc(const ACommand: Char; SL: TStrings);
+    procedure SeparateValues(const ACommand: Char; const S: string; Values: TStrings);
+    function Split(const S: string): TStrings;
   protected
     procedure ConstructPath; override;
   public
@@ -539,8 +535,6 @@   TSVGClipPath = class(TSVGBasic)
   public
     destructor Destroy; override;
     procedure Clear; override;
-    function ReadInAttr(SVGAttr: TSVGAttribute; const AttrValue: string): Boolean; override;
-
     property ClipPath: TGPGraphicsPath read GetClipPath;
 
     class function Features: TSVGElementFeatures; override;
@@ -2090,7 +2084,6 @@ procedure TSVG.PaintTo(DC: HDC; Bounds: TGPRectF;
   Graphics := TGPGraphics.Create(DC);
   try
     Graphics.SetSmoothingMode(SmoothingModeAntiAlias);
-    Graphics.SetPixelOffsetMode(PixelOffsetModeHalf);
     PaintTo(Graphics, Bounds, Rects, RectCount);
   finally
     Graphics.Free;
@@ -2105,7 +2098,6 @@ procedure TSVG.PaintTo(MetaFile: TGPMetaFile; Bounds: TGPRectF;
   Graphics := TGPGraphics.Create(MetaFile);
   try
     Graphics.SetSmoothingMode(SmoothingModeAntiAlias);
-    Graphics.SetPixelOffsetMode(PixelOffsetModeHalf);
     PaintTo(Graphics, Bounds, Rects, RectCount);
   finally
     Graphics.Free;
@@ -2145,13 +2137,11 @@ constructor TSVG.Create;
   FillChar(FInitialMatrix, SizeOf(FInitialMatrix), 0);
   FGrayscale  := False;
   FFixedColor := SVG_INHERIT_COLOR;
-  FIdDict := TDictionary<string, TSVGObject>.Create;
 end;
 
 destructor TSVG.Destroy;
 begin
   FreeAndNil(FStyles);
-  FreeAndNil(FidDict);
   inherited;
 end;
 
@@ -2160,15 +2150,6 @@ class function TSVG.Features: TSVGElementFeatures;
   Result := [sefMayHaveChildren, sefChildrenNeedPainting];
 end;
 
-function TSVG.FindByID(const Name: string): TSVGObject;
-begin
-   if not FIdDict.TryGetValue(Name, Result) then
-   begin
-     Result := inherited FindById(Name);
-     FIdDict.Add(Name, Result);
-   end;
-end;
-
 procedure TSVG.Clear;
 begin
   inherited;
@@ -2177,8 +2158,6 @@ procedure TSVG.Clear;
 
   if Assigned(FStyles) then
     FStyles.Clear;
-  if Assigned(FIdDict) then
-    FIdDict.Clear;
 
   FillChar(FViewBox, SizeOf(FViewBox), 0);
   FillChar(FInitialMatrix, SizeOf(FInitialMatrix), 0);
@@ -2389,7 +2368,6 @@ function TSVG.RenderToBitmap(Width, Height: Integer): HBITMAP;
     Graphics := TGPGraphics.Create(Bitmap);
     try
       Graphics.SetSmoothingMode(SmoothingModeAntiAlias);
-      Graphics.SetPixelOffsetMode(PixelOffsetModeHalf);
       R := FittedRect(MakeRect(0.0, 0.0, Width, Height), FWidth, FHeight);
       PaintTo(Graphics, R, nil, 0);
     finally
@@ -2416,7 +2394,6 @@ function TSVG.RenderToIcon(Size: Integer): HICON;
     Graphics := TGPGraphics.Create(Bitmap);
     try
       Graphics.SetSmoothingMode(SmoothingModeAntiAlias);
-      Graphics.SetPixelOffsetMode(PixelOffsetModeHalf);
       R := FittedRect(MakeRect(0.0, 0, Size, Size), Width, Height);
       PaintTo(Graphics, R, nil, 0);
     finally
@@ -2438,12 +2415,13 @@ procedure TSVG.CalcMatrix;
   ViewBoxMatrix := TAffineMatrix.CreateTranslation(-FViewBox.Left, -FViewBox.Top);
   BoundsMatrix := TAffineMatrix.CreateTranslation(FRootBounds.X, FRootBounds.Y);
 
+  // The -1 below is for fixing #14. There may well be a better way.
   if (FViewBox.Width > 0) and (FRootBounds.Width > 0) then
-    ScaleX := (FRootBounds.Width) / FViewBox.Width
+    ScaleX := (FRootBounds.Width - 1) / FViewBox.Width
   else
     ScaleX := 1;
   if (FViewBox.Height > 0) and (FRootBounds.Height > 0) then
-    ScaleY := (FRootBounds.Height)/ FViewBox.Height
+    ScaleY := (FRootBounds.Height - 1)/ FViewBox.Height
   else
     ScaleY := 1;
   ScaleMatrix := TAffineMatrix.CreateScaling(ScaleX, ScaleY);
@@ -2989,19 +2967,46 @@ procedure TSVGPath.ConstructPath;
   end;
 end;
 
-function TSVGPath.SeparateValues(const ACommand: Char;
-  const S: string; CommandList: TList<Char>;  ValueList: TList<TFloat>): Boolean;
+procedure TSVGPath.PrepareMoveLineCurveArc(const ACommand: Char; SL: TStrings);
+var
+  C: Integer;
+  D: Integer;
+  Command: Char;
+begin
+  case ACommand of
+    'M': Command := 'L';
+    'm': Command := 'l';
+  else
+    Command := ACommand;
+  end;
+
+  case Command of
+    'A', 'a':                     D := 7;
+    'C', 'c':                     D := 6;
+    'S', 's', 'Q', 'q':           D := 4;
+    'T', 't', 'M', 'm', 'L', 'l': D := 2;
+    'H', 'h', 'V', 'v':           D := 1;
+  else
+    D := 0;
+  end;
+
+  if (D = 0) or (SL.Count = D + 1) or ((SL.Count - 1) mod D = 1) then
+    Exit;
+
+  for C := SL.Count - D downto (D + 1) do
+  begin
+    if (C - 1) mod D = 0 then
+      SL.Insert(C, Command);
+  end;
+end;
+
+procedure TSVGPath.SeparateValues(const ACommand: Char;
+  const S: string; Values: TStrings);
 var
   I, NumStart: Integer;
   HasDot: Boolean;
   HasExp: Boolean;
-  OldCount: Integer;
-  AddedCount: Integer;
-  ExpectedValueCount: Integer;
-  RepeatCommand: Char;
 begin
-  OldCount := ValueList.Count;
-
   HasDot := False;
   HasExp := False;
   NumStart := 1;
@@ -3013,7 +3018,7 @@ function TSVGPath.SeparateValues(const ACommand: Char;
         begin
           if HasDot or HasExp then
           begin
-            ValueList.Add(StrToTFloat(Copy(S, NumStart, I - NumStart)));
+            Values.Add(Copy(S, NumStart, I - NumStart));
             NumStart := I;
             HasExp := False;
           end;
@@ -3025,7 +3030,7 @@ function TSVGPath.SeparateValues(const ACommand: Char;
           if I > NumStart then
           begin
             if not HasExp or (UpCase(S[I-1]) <> 'E') then begin
-              ValueList.Add(StrToTFloat(Copy(S, NumStart, I-NumStart)));
+              Values.Add(Copy(S, NumStart, I-NumStart));
               HasDot := False;
               HasExp := False;
               NumStart := I;
@@ -3034,11 +3039,11 @@ function TSVGPath.SeparateValues(const ACommand: Char;
         end;
       'E', 'e':
         HasExp := True;
-      ' ', ',', #9, #$A, #$D:
+      ' ', #9, #$A, #$D:
         begin
           if I > NumStart then
           begin
-            ValueList.Add(StrToTFloat(Copy(S, NumStart, I-NumStart)));
+            Values.Add(Copy(S, NumStart, I-NumStart));
             HasDot := False;
             HasExp := False;
           end;
@@ -3049,75 +3054,70 @@ function TSVGPath.SeparateValues(const ACommand: Char;
 
   if S.Length  + 1 > NumStart then
   begin
-    ValueList.Add(StrToTFloat(Copy(S, NumStart, S.Length + 1 - NumStart)));
-  end;
-
-  AddedCount := ValueList.Count - OldCount;
-
-  case AnsiChar(ACommand) of
-    'A', 'a':                     ExpectedValueCount := 7;
-    'C', 'c':                     ExpectedValueCount := 6;
-    'S', 's', 'Q', 'q':           ExpectedValueCount := 4;
-    'T', 't', 'M', 'm', 'L', 'l': ExpectedValueCount := 2;
-    'H', 'h', 'V', 'v':           ExpectedValueCount := 1;
-  else
-    ExpectedValueCount := 0;
+    Values.Add(Copy(S, NumStart, S.Length + 1 - NumStart));
   end;
 
-  Result := ((ExpectedValueCount = 0) and (AddedCount = 0)) or
-    ((AddedCount >= ExpectedValueCount) and (AddedCount mod ExpectedValueCount = 0));
+  Values.Insert(0, ACommand);
 
-  if Result then
+  if Values.Count > 0 then
   begin
-    CommandList.Add(ACommand);
-    if AddedCount > ExpectedValueCount then
+    if ACommand.IsInArray(['M', 'm', 'L', 'l', 'H', 'h', 'V', 'v',
+      'C', 'c', 'S', 's', 'Q', 'q', 'T', 't', 'A', 'a']) then
     begin
-      case ACommand of
-        'M': RepeatCommand := 'L';
-        'm': RepeatCommand := 'l';
-      else
-        RepeatCommand := ACommand;
+      PrepareMoveLineCurveArc(ACommand, Values);
+    end
+    else if (ACommand = 'Z') or (ACommand = 'z') then
+    begin
+      while Values.Count > 1 do
+      begin
+        Values.Delete(1);
       end;
-      for I := 2 to AddedCount div ExpectedValueCount do
-        CommandList.Add(RepeatCommand);
     end;
   end;
 end;
 
-procedure TSVGPath.Split(const S: string; CommandList: TList<Char>;  ValueList: TList<TFloat>);
+function TSVGPath.Split(const S: string): TStrings;
 var
   Part: string;
+  SL: TStrings;
   Found: Integer;
   StartIndex: Integer;
   SLength: Integer;
 const
-  IDs: TSysCharSet = ['M', 'm', 'L', 'l', 'H', 'h', 'V', 'v',
-    'C', 'c', 'S', 's', 'Q', 'q', 'T', 't', 'A', 'a', 'Z', 'z'];
+  IDs: array [0..19] of Char = ('M', 'm', 'L', 'l', 'H', 'h', 'V', 'v',
+    'C', 'c', 'S', 's', 'Q', 'q', 'T', 't', 'A', 'a', 'Z', 'z');
 begin
-  StartIndex := 1;
+  Result := TStringList.Create;
+
+  StartIndex := 0;
   SLength := Length(S);
-  while StartIndex <= SLength do
-  begin
-    if not (AnsiChar(S[StartIndex]) in IDs) then Exit;  // invalid path
-    Found := StartIndex + 1;
-    while (Found <= SLength) and not (AnsiChar(S[Found]) in IDs) do
-      Inc(Found);
-    Part := Trim(Copy(S, StartIndex + 1, Found - StartIndex -1));
-    if not SeparateValues(S[StartIndex], Part, CommandList, ValueList) then
-      Break;
-    StartIndex := Found;
+  SL := TStringList.Create;
+  try
+    while StartIndex < SLength do
+    begin
+      Found := S.IndexOfAny(IDs, StartIndex + 1);
+      if Found = -1 then
+      begin
+        Found := SLength;
+      end;
+      Part := S.Substring(StartIndex + 1, Found - StartIndex - 1).Trim;
+      SL.Clear;
+      SeparateValues(S[StartIndex + 1], Part, SL);
+      Result.AddStrings(SL);
+      StartIndex := Found;
+    end;
+  finally
+    SL.Free;
   end;
 end;
 
 function TSVGPath.ReadInAttr(SVGAttr: TSVGAttribute;
   const AttrValue: string): Boolean;
 var
+  S: string;
+  SL: TStrings;
   C: Integer;
-  Command: Char;
-  VListPos: Integer;
-
-  CommandList: TList<Char>;
-  ValueList: TList<TFloat>;
+  P: PChar;
 
   Element: TSVGPathElement;
   LastElement: TSVGPathElement;
@@ -3125,56 +3125,60 @@ function TSVGPath.ReadInAttr(SVGAttr: TSVGAttribute;
   Result := True;
   if SVGAttr = saD then
   begin
-    if AttrValue.Length = 0 then
-      Exit;
+    if AttrValue.Length > 0 then
+    begin
+      SetString(S, PChar(AttrValue), AttrValue.Length); // UniqueString
+      P := PChar(S);
+      while P^ <> #0 do
+      begin
+        if P^ = ',' then
+          P^ := ' ';
+        Inc(P);
+      end;
+    end;
   end else
-  begin
     Result := inherited;
-    Exit;
-  end;
 
-  CommandList := TList<Char>.Create;
-  ValueList := TList<TFloat>.Create;
-  try
-    Split(AttrValue, CommandList, ValueList);
+  if S = '' then Exit;
 
-    LastElement := nil;
-    VListPos := 0;
+  SL := Split(S);
 
-    for C := 0 to CommandList.Count-1 do
-    begin
-      Command := CommandList[C];
+  try
+    C := 0;
+    LastElement := nil;
 
-      case AnsiChar(Command) of
-        'M', 'm': Element := TSVGPathMove.Create(Self);
+    if SL.Count > 0 then
+      repeat
+        case SL[C][1] of
+          'M', 'm': Element := TSVGPathMove.Create(Self);
 
-        'L', 'l': Element := TSVGPathLine.Create(Self);
+          'L', 'l': Element := TSVGPathLine.Create(Self);
 
-        'H', 'h', 'V', 'v': Element := TSVGPathLine.Create(Self);
+          'H', 'h', 'V', 'v': Element := TSVGPathLine.Create(Self);
 
-        'C', 'c': Element := TSVGPathCurve.Create(Self);
+          'C', 'c': Element := TSVGPathCurve.Create(Self);
 
-        'S', 's', 'Q', 'q': Element := TSVGPathCurve.Create(Self);
+          'S', 's', 'Q', 'q': Element := TSVGPathCurve.Create(Self);
 
-        'T', 't': Element := TSVGPathCurve.Create(Self);
+          'T', 't': Element := TSVGPathCurve.Create(Self);
 
-        'A', 'a': Element := TSVGPathEllipticArc.Create(Self);
+          'A', 'a': Element := TSVGPathEllipticArc.Create(Self);
 
-        'Z', 'z': Element := TSVGPathClose.Create(Self);
+          'Z', 'z': Element := TSVGPathClose.Create(Self);
 
-      else
-        Element := nil;
-      end;
+        else
+          Element := nil;
+        end;
 
-      if Assigned(Element) then
-      begin
-        Element.Read(Command, ValueList, VListPos, LastElement);
-        LastElement := Element;
-      end;
-    end;
+        if Assigned(Element) then
+        begin
+          Element.Read(SL, C, LastElement);
+          LastElement := Element;
+        end;
+        Inc(C);
+      until C = SL.Count;
   finally
-    CommandList.Free;
-    ValueList.Free;
+    SL.Free;
   end;
 end;
 
@@ -4095,15 +4099,6 @@ function TSVGClipPath.GetClipPath: TGPGraphicsPath;
   Result := FClipPath;
 end;
 
-function TSVGClipPath.ReadInAttr(SVGAttr: TSVGAttribute;
-  const AttrValue: string): Boolean;
-begin
-  Result := inherited;
-  if FID <> '' then
-    if not Root.IdDict.ContainsKey(FID) then
-      Root.IdDict.Add(FID, Self);
-end;
-
 {$ENDREGION}
 
 {$REGION 'TSVGShape'}
diff --git a/Source/VCL/SVGIconImageList/Svg/SVGPath.pas b/Source/VCL/SVGIconImageList/Svg/SVGPath.pas
index 37c01bf6..1b79cc28 100644
--- a/Source/VCL/SVGIconImageList/Svg/SVGPath.pas
+++ b/Source/VCL/SVGIconImageList/Svg/SVGPath.pas
@@ -23,13 +23,9 @@
 interface
 
 uses
-  Winapi.Windows,
-  Winapi.GDIPOBJ,
-  System.Types,
-  System.Classes,
-  System.Generics.Collections,
-  SVGTypes,
-  SVG;
+  Winapi.Windows, Winapi.GDIPOBJ,
+  System.Types, System.Classes,
+  SVGTypes, SVG;
 
 type
   TSVGPathElement = class(TSVGObject)
@@ -43,7 +39,7 @@   TSVGPathElement = class(TSVGObject)
   public
     function GetBounds: TRectF; virtual; abstract;
     procedure AddToPath(Path: TGPGraphicsPath); virtual; abstract;
-    procedure Read(Command: Char; ValueList: TList<TFloat>;  var Position: Integer;
+    procedure Read(SL: TStrings; var Position: Integer;
       Previous: TSVGPathElement); virtual;
 
     procedure PaintToGraphics(Graphics: TGPGraphics); override;
@@ -59,7 +55,7 @@   TSVGPathMove = class(TSVGPathElement)
   public
     function GetBounds: TRectF; override;
     procedure AddToPath(Path: TGPGraphicsPath); override;
-    procedure Read(Command: Char; ValueList: TList<TFloat>;  var Position: Integer;
+    procedure Read(SL: TStrings; var Position: Integer;
       Previous: TSVGPathElement); override;
   end;
 
@@ -67,7 +63,7 @@   TSVGPathLine = class(TSVGPathElement)
   public
     function GetBounds: TRectF; override;
     procedure AddToPath(Path: TGPGraphicsPath); override;
-    procedure Read(Command: Char; ValueList: TList<TFloat>;  var Position: Integer;
+    procedure Read(SL: TStrings; var Position: Integer;
       Previous: TSVGPathElement); override;
   end;
 
@@ -82,7 +78,7 @@   TSVGPathCurve = class(TSVGPathElement)
   public
     function GetBounds: TRectF; override;
     procedure AddToPath(Path: TGPGraphicsPath); override;
-    procedure Read(Command: Char; ValueList: TList<TFloat>;  var Position: Integer;
+    procedure Read(SL: TStrings; var Position: Integer;
       Previous: TSVGPathElement); override;
 
     property Control1X: TFloat read FControl1X write FControl1X;
@@ -103,7 +99,7 @@   TSVGPathEllipticArc = class(TSVGPathElement)
   public
     function GetBounds: TRectF; override;
     procedure AddToPath(Path: TGPGraphicsPath); override;
-    procedure Read(Command: Char; ValueList: TList<TFloat>;  var Position: Integer;
+    procedure Read(SL: TStrings; var Position: Integer;
       Previous: TSVGPathElement); override;
 
     property RX: TFloat read FRX write FRX;
@@ -119,7 +115,7 @@   TSVGPathClose = class(TSVGPathElement)
   public
     function GetBounds: TRectF; override;
     procedure AddToPath(Path: TGPGraphicsPath); override;
-    procedure Read(Command: Char; ValueList: TList<TFloat>;  var Position: Integer;
+    procedure Read(SL: TStrings; var Position: Integer;
       Previous: TSVGPathElement); override;
   end;
 
@@ -151,8 +147,8 @@ procedure TSVGPathElement.AssignTo(Dest: TPersistent);
   end;
 end;
 
-procedure TSVGPathElement.Read(Command: Char; ValueList: TList<TFloat>;
-  var Position: Integer; Previous: TSVGPathElement);
+procedure TSVGPathElement.Read(SL: TStrings; var Position: Integer;
+  Previous: TSVGPathElement);
 begin
   if Assigned(Previous) then
   begin
@@ -185,14 +181,16 @@ procedure TSVGPathMove.AddToPath(Path: TGPGraphicsPath);
   Path.StartFigure;
 end;
 
-procedure TSVGPathMove.Read(Command: Char; ValueList: TList<TFloat>;
-  var Position: Integer; Previous: TSVGPathElement);
+procedure TSVGPathMove.Read(SL: TStrings; var Position: Integer;
+  Previous: TSVGPathElement);
 begin
   inherited;
-  FStopX := ValueList[Position];
-  FStopY := ValueList[Position + 1];
+  if not TryStrToTFloat(SL[Position + 1], FStopX) then
+    FStopX := 0;
+  if not TryStrToTFloat(SL[Position + 2], FStopY) then
+    FStopY := 0;
 
-  if Command = 'm' then
+  if SL[Position] = 'm' then
   begin
     FStopX := FStartX + FStopX;
     FStopY := FStartY + FStopY;
@@ -217,36 +215,46 @@ procedure TSVGPathLine.AddToPath(Path: TGPGraphicsPath);
   Path.AddLine(FStartX, FStartY, FStopX, FStopY);
 end;
 
-procedure TSVGPathLine.Read(Command: Char; ValueList: TList<TFloat>;
-  var Position: Integer; Previous: TSVGPathElement);
+procedure TSVGPathLine.Read(SL: TStrings; var Position: Integer;
+  Previous: TSVGPathElement);
+var
+  Command: string;
 begin
   inherited;
 
+  Command := SL[Position];
   if (Command = 'L') or (Command = 'l') then
   begin
-    FStopX := ValueList[Position];
-    FStopY := ValueList[Position + 1];
+    if not TryStrToTFloat(SL[Position + 1], FStopX) then
+      FStopX := 0;
+    if not TryStrToTFloat(SL[Position + 2], FStopY) then
+      FStopY := 0;
 
-    if Command = 'l' then
+    if SL[Position] = 'l' then
     begin
       FStopX := FStartX + FStopX;
       FStopY := FStartY + FStopY;
     end;
 
     Inc(Position, 2);
-  end
-  else if (Command = 'H') or (Command = 'h') then
+  end;
+
+  if (Command = 'H') or (Command = 'h') then
   begin
-    FStopX := ValueList[Position];
+    if not TryStrToTFloat(SL[Position + 1], FStopX) then
+      FStopX := 0;
 
     if Command = 'h' then
       FStopX := FStartX + FStopX;
     FStopY := FStartY;
     Inc(Position);
-  end
-  else if (Command = 'V') or (Command = 'v') then
+  end;
+
+
+  if (Command = 'V') or (Command = 'v') then
   begin
-    FStopY := ValueList[Position];
+    if not TryStrToTFloat(SL[Position + 1], FStopY) then
+      FStopY := 0;
 
     if Command = 'v' then
       FStopY := FStartY + FStopY;
@@ -289,19 +297,22 @@ procedure TSVGPathCurve.AddToPath(Path: TGPGraphicsPath);
     FControl2X, FControl2Y, FStopX, FStopY);
 end;
 
-procedure TSVGPathCurve.Read(Command: Char; ValueList: TList<TFloat>;
-  var Position: Integer; Previous: TSVGPathElement);
+procedure TSVGPathCurve.Read(SL: TStrings; var Position: Integer;
+  Previous: TSVGPathElement);
+var
+  Command: string;
 begin
   inherited;
 
+  Command := SL[Position];
   if (Command = 'C') or (Command = 'c') then
   begin
-    FControl1X := ValueList[Position];
-    FControl1Y := ValueList[Position + 1];
-    FControl2X := ValueList[Position + 2];
-    FControl2Y := ValueList[Position + 3];
-    FStopX := ValueList[Position + 4];
-    FStopY := ValueList[Position + 5];
+    TryStrToTFloat(SL[Position + 1], FControl1X);
+    TryStrToTFloat(SL[Position + 2], FControl1Y);
+    TryStrToTFloat(SL[Position + 3], FControl2X);
+    TryStrToTFloat(SL[Position + 4], FControl2Y);
+    TryStrToTFloat(SL[Position + 5], FStopX);
+    TryStrToTFloat(SL[Position + 6], FStopY);
     Inc(Position, 6);
 
     if Command = 'c' then
@@ -313,13 +324,16 @@ procedure TSVGPathCurve.Read(Command: Char; ValueList: TList<TFloat>;
       FStopX := FStartX + FStopX;
       FStopY := FStartY + FStopY;
     end;
-  end
-  else if (Command = 'S') or (Command = 's') then
+  end;
+
+  if (Command = 'S') or (Command = 's') then
   begin
-    FControl2X := ValueList[Position];
-    FControl2Y := ValueList[Position + 1];
-    FStopX := ValueList[Position + 2];
-    FStopY := ValueList[Position + 3];
+    FControl1X := FStartX;
+    FControl1Y := FStartY;
+    TryStrToTFloat(SL[Position + 1], FControl2X);
+    TryStrToTFloat(SL[Position + 2], FControl2Y);
+    TryStrToTFloat(SL[Position + 3], FStopX);
+    TryStrToTFloat(SL[Position + 4], FStopY);
     Inc(Position, 4);
 
     if Previous is TSVGPathCurve then
@@ -335,13 +349,14 @@ procedure TSVGPathCurve.Read(Command: Char; ValueList: TList<TFloat>;
       FStopX := FStartX + FStopX;
       FStopY := FStartY + FStopY;
     end;
-  end
-  else if (Command = 'Q') or (Command = 'q') then
+  end;
+
+  if (Command = 'Q') or (Command = 'q') then
   begin
-    FControl1X := ValueList[Position];
-    FControl1Y := ValueList[Position + 1];
-    FStopX := ValueList[Position + 2];
-    FStopY := ValueList[Position + 3];
+    TryStrToTFloat(SL[Position + 1], FControl1X);
+    TryStrToTFloat(SL[Position + 2], FControl1Y);
+    TryStrToTFloat(SL[Position + 3], FStopX);
+    TryStrToTFloat(SL[Position + 4], FStopY);
     FControl2X := FControl1X;
     FControl2Y := FControl1Y;
     Inc(Position, 4);
@@ -364,13 +379,14 @@ procedure TSVGPathCurve.Read(Command: Char; ValueList: TList<TFloat>;
     FControl1Y := 2 * FControl1Y / 3 + FStartY / 3;
     FControl2X := 2 * FControl2X / 3 + FStopX / 3;
     FControl2Y := 2 * FControl2Y / 3 + FStopY / 3;
-  end
-  else if (Command = 'T') or (Command = 't') then
+  end;
+
+  if (Command = 'T') or (Command = 't') then
   begin
     FControl1X := FStartX;
     FControl1Y := FStartY;
-    FStopX := ValueList[Position];
-    FStopY := ValueList[Position + 1];
+    TryStrToTFloat(SL[Position + 1], FStopX);
+    TryStrToTFloat(SL[Position + 2], FStopY);
     Inc(Position, 2);
 
     if Previous is TSVGPathCurve then
@@ -516,10 +532,10 @@ procedure TSVGPathEllipticArc.AddToPath(Path: TGPGraphicsPath);
   //
   // Step 4 : Compute the angleStart (angle1) and the angleExtent (dangle)
   //
-  ux := (x1 - CX1);
-  uy := (y1 - CY1);
-  vx := (-x1 - CX1);
-  vy := (-y1 - CY1);
+  ux := (x1 - CX1) / LRX;
+  uy := (y1 - CY1) / LRY;
+  vx := (-x1 - CX1) / LRX;
+  vy := (-y1 - CY1) / LRY;
 
   // Compute the angle start
   n := (ux * ux) + (uy * uy);
@@ -568,20 +584,22 @@ procedure TSVGPathEllipticArc.AddToPath(Path: TGPGraphicsPath);
   end;
 end;
 
-procedure TSVGPathEllipticArc.Read(Command: Char; ValueList: TList<TFloat>;
-  var Position: Integer; Previous: TSVGPathElement);
+procedure TSVGPathEllipticArc.Read(SL: TStrings; var Position: Integer; Previous: TSVGPathElement);
+var
+  Command: string;
 begin
   inherited;
 
+  Command := SL[Position];
   if (Command = 'A') or (Command = 'a') then
   begin
-    FRX := ValueList[Position];
-    FRY := ValueList[Position + 1];
-    FXRot := ValueList[Position + 2];
-    FLarge := Trunc(ValueList[Position + 3]);
-    FSweep := Trunc(ValueList[Position + 4]);
-    FStopX := ValueList[Position + 5];
-    FStopY := ValueList[Position + 6];
+    TryStrToTFloat(SL[Position + 1], FRX);
+    TryStrToTFloat(SL[Position + 2], FRY);
+    TryStrToTFloat(SL[Position + 3], FXRot);
+    TryStrToInt(SL[Position + 4], FLarge);
+    TryStrToInt(SL[Position + 5], FSweep);
+    TryStrToTFloat(SL[Position + 6], FStopX);
+    TryStrToTFloat(SL[Position + 7], FStopY);
     Inc(Position, 7);
 
     FRX := Abs(FRX);
@@ -628,8 +646,8 @@ function TSVGPathClose.GetBounds: TRectF;
   Result.Height := 0;
 end;
 
-procedure TSVGPathClose.Read(Command: Char; ValueList: TList<TFloat>;
-  var Position: Integer; Previous: TSVGPathElement);
+procedure TSVGPathClose.Read(SL: TStrings; var Position: Integer;
+  Previous: TSVGPathElement);
 var
   LastMoveTo: TSVGPathMove;
 begin
diff --git a/Source/VCL/vcl-styles-utils/Common/CompileResources.bat b/Source/VCL/vcl-styles-utils/Common/CompileResources.bat
index a960d388..207ff609 100644
--- a/Source/VCL/vcl-styles-utils/Common/CompileResources.bat
+++ b/Source/VCL/vcl-styles-utils/Common/CompileResources.bat
@@ -1,2 +1,2 @@
-"C:\Program Files (x86)\Embarcadero\Studio\21.0\bin\brcc32.exe" AwesomeFont.rc
+brcc32 AwesomeFont.rc
 Pause
\ No newline at end of file
diff --git a/Source/VCL/vcl-styles-utils/Common/CompileResources_zip.bat b/Source/VCL/vcl-styles-utils/Common/CompileResources_zip.bat
index a4a9855a..bde302e6 100644
--- a/Source/VCL/vcl-styles-utils/Common/CompileResources_zip.bat
+++ b/Source/VCL/vcl-styles-utils/Common/CompileResources_zip.bat
@@ -1,2 +1,2 @@
-"C:\Program Files (x86)\Embarcadero\Studio\21.0\bin\brcc32.exe" AwesomeFont_zip.rc
+brcc32 AwesomeFont_zip.rc
 Pause