diff --git a/components/lazmapviewer/images/imagelist.txt b/components/lazmapviewer/images/imagelist.txt
index 867b1b68c..71958ff94 100644
--- a/components/lazmapviewer/images/imagelist.txt
+++ b/components/lazmapviewer/images/imagelist.txt
@@ -13,3 +13,6 @@ tmvdesynapse_200.png
 tmvrgbgraphicsdrawingengine.png
 tmvrgbgraphicsdrawingengine_150.png
 tmvrgbgraphicsdrawingengine_200.png
+tmvbgradrawingengine.png
+tmvbgradrawingengine_150.png
+tmvbgradrawingengine_200.png
diff --git a/components/lazmapviewer/lazmapviewer_bgra.lpk b/components/lazmapviewer/lazmapviewer_bgra.lpk
index 2fa552fd3..596ba49a4 100644
--- a/components/lazmapviewer/lazmapviewer_bgra.lpk
+++ b/components/lazmapviewer/lazmapviewer_bgra.lpk
@@ -14,23 +14,23 @@
     </CompilerOptions>
     <Description Value="Add-on to LazMapViewer: Contains the drawing engine based on the BGRABitmap library."/>
     <Version Minor="2"/>
-    <Files Count="1">
-      <Item1>
+    <Files>
+      <Item>
         <Filename Value="source\addons\bgra_drawingengine\mvde_bgra.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="mvDE_BGRA"/>
-      </Item1>
+      </Item>
     </Files>
-    <RequiredPkgs Count="3">
-      <Item1>
+    <RequiredPkgs>
+      <Item>
         <PackageName Value="BGRABitmapPack"/>
-      </Item1>
-      <Item2>
+      </Item>
+      <Item>
         <PackageName Value="lazMapViewerPkg"/>
-      </Item2>
-      <Item3>
+      </Item>
+      <Item>
         <PackageName Value="FCL"/>
-      </Item3>
+      </Item>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
diff --git a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas
index db6120928..7258e059a 100644
--- a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas
+++ b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas
@@ -116,8 +116,6 @@ procedure TMvBGRADrawingEngine.DrawLazIntfImage(X, Y: Integer;
 //http://mantis.freepascal.org/view.php?id=27144
 var
   temp: TBGRABitmap;
-  rawImg: TRawImage;
-  intfImg: TLazIntfImage;
 begin
   temp:=TBGRABitmap.Create(AImg);
   try
@@ -354,7 +352,7 @@ begin
       img := bmp.CreateIntfImage;
       try
         fc := TColorToFPColor(bmp.Canvas.Font.Color);
-        intens0 := (fc.Red + fc.Green + fc.Blue);
+        intens0 := Int64(fc.Red) + fc.Green + fc.Blue;
         for j := 0 to img.Height - 1 do
           for i := 0 to img.Width - 1 do begin
             c := bmp.Canvas.Pixels[i, j];
@@ -364,7 +362,7 @@ begin
             else if c = FFontColor then
               tc.Alpha := alphaOpaque
             else begin
-              intens := tc.Red + tc.Green + tc.Blue;
+              intens := Int64(tc.Red) + tc.Green + tc.Blue;
               if intens0 = 0 then
                 alpha := (3 * alphaopaque - intens) / (3 * alphaOpaque - intens0)
               else
diff --git a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas
index 28a3301f2..0a39d4749 100644
--- a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas
+++ b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas
@@ -115,7 +115,6 @@ procedure TMvRGBGraphicsDrawingEngine.DrawLazIntfImage(X, Y: Integer;
   AImg: TLazIntfImage);
 //http://mantis.freepascal.org/view.php?id=27144
 var
-  temp: TRGB32Bitmap;
   rawImg: TRawImage;
   intfImg: TLazIntfImage;
 begin
@@ -363,7 +362,7 @@ begin
       img := bmp.CreateIntfImage;
       try
         fc := TColorToFPColor(bmp.Canvas.Font.Color);
-        intens0 := (fc.Red + fc.Green + fc.Blue);
+        intens0 := Int64(fc.Red) + fc.Green + fc.Blue;
         for j := 0 to img.Height - 1 do
           for i := 0 to img.Width - 1 do begin
             c := bmp.Canvas.Pixels[i, j];
@@ -373,7 +372,7 @@ begin
             else if c = FFontColor then
               tc.Alpha := alphaOpaque
             else begin
-              intens := tc.Red + tc.Green + tc.Blue;
+              intens := Int64(tc.Red) + tc.Green + tc.Blue;
               if intens0 = 0 then
                 alpha := (3 * alphaopaque - intens) / (3 * alphaOpaque - intens0)
               else
diff --git a/components/lazmapviewer/source/mvde_lcl.pas b/components/lazmapviewer/source/mvde_lcl.pas
index 76bb5be92..b1dcf71f6 100644
--- a/components/lazmapviewer/source/mvde_lcl.pas
+++ b/components/lazmapviewer/source/mvde_lcl.pas
@@ -33,7 +33,7 @@ type
       destructor Destroy; override;
       procedure CreateBuffer(AWidth, AHeight: Integer); override;
       procedure DrawBitmap(X, Y: Integer; ABitmap: TCustomBitmap;
-        UseAlphaChannel: Boolean); override;
+        {%H-}UseAlphaChannel: Boolean); override;
       procedure DrawLazIntfImage(X, Y: Integer; AImg: TLazIntfImage); override;
       procedure Ellipse(X1, Y1, X2, Y2: Integer); override;
       procedure FillRect(X1, Y1, X2, Y2: Integer); override;
diff --git a/components/lazmapviewer/source/mvgeonames.pas b/components/lazmapviewer/source/mvgeonames.pas
index 7bab828ef..f5529795e 100644
--- a/components/lazmapviewer/source/mvgeonames.pas
+++ b/components/lazmapviewer/source/mvgeonames.pas
@@ -156,7 +156,7 @@ end;
 
 procedure TMvGeoNames.FoundTextHandler(AText: String);
 var
-  code: Integer;
+  {%H-}code: Integer;
 begin
   if not FInDataRows or (AText = #10) then
     exit;
diff --git a/components/lazmapviewer/source/mvjobqueue.pas b/components/lazmapviewer/source/mvjobqueue.pas
index a26b1ce2b..77660936d 100644
--- a/components/lazmapviewer/source/mvjobqueue.pas
+++ b/components/lazmapviewer/source/mvjobqueue.pas
@@ -137,7 +137,7 @@ type
     FTask: integer;
   protected
     procedure DoCancel; override;
-    procedure pTaskStarted(aTask: integer); override;
+    procedure pTaskStarted({%H-}aTask: integer); override;
     procedure pTaskEnded(aTask: integer; aExcept: Exception); override;
     function pGetTask: integer; override;
   public
diff --git a/components/lazmapviewer/source/mvmapviewer.pas b/components/lazmapviewer/source/mvmapviewer.pas
index e08fc2add..85399de74 100644
--- a/components/lazmapviewer/source/mvmapviewer.pas
+++ b/components/lazmapviewer/source/mvmapviewer.pas
@@ -96,7 +96,7 @@ Type
       procedure ActivateEngine;
       procedure DblClick; override;
       procedure DoDrawTile(const TileId: TTileId; X,Y: integer; TileImg: TLazIntfImage);
-      procedure DoDrawTileInfo(const TileID: TTileID; X,Y: Integer);
+      procedure DoDrawTileInfo(const {%H-}TileID: TTileID; X,Y: Integer);
       function DoMouseWheel(Shift: TShiftState; WheelDelta: Integer;
         MousePos: TPoint): Boolean; override;
       procedure DoOnResize; override;
diff --git a/components/lazmapviewer/source/mvmapviewer_icons.res b/components/lazmapviewer/source/mvmapviewer_icons.res
index 8f663b0b4..bf425fe17 100644
Binary files a/components/lazmapviewer/source/mvmapviewer_icons.res and b/components/lazmapviewer/source/mvmapviewer_icons.res differ