diff --git a/components/lazmapviewer/source/mvde_intfgraphics.pas b/components/lazmapviewer/source/mvde_intfgraphics.pas
index 4caa974d5..9ec15a492 100644
--- a/components/lazmapviewer/source/mvde_intfgraphics.pas
+++ b/components/lazmapviewer/source/mvde_intfgraphics.pas
@@ -694,7 +694,9 @@ procedure TMvIntfGraphicsDrawingEngine.SetBrushColor(AValue: TColor);
 begin
   if FCanvas <> nil then
   begin
-    FCanvas.Brush.FPColor := TColorToFPColor(AValue);
+    FCanvas.Brush.FPColor := TColorToFPColor(ColorToRGB(AValue));
+    if AValue = clNone then
+      FCanvas.Brush.Style := bsClear;
     AddAlphaToColors;
   end;
 end;
@@ -826,8 +828,8 @@ begin
     bmp.Canvas.Brush.Color := maskClr;
     bmp.Canvas.FillRect(0, 0, bmp.Width, bmp.Height);
 
-    // Draw background of opaque text
-    if GetBrushStyle <> bsClear then
+    // Draw background of text
+    if (GetBrushStyle <> bsClear) and (Opacity > 0) then
     begin
       savedBrush := GetBrush;
       savedPen := GetPen;
diff --git a/components/lazmapviewer/source/mvdrawingengine.pas b/components/lazmapviewer/source/mvdrawingengine.pas
index 7d0e823c8..ae21e8fc7 100644
--- a/components/lazmapviewer/source/mvdrawingengine.pas
+++ b/components/lazmapviewer/source/mvdrawingengine.pas
@@ -44,14 +44,18 @@ type
     Color: TColor;
   end;
 
+  TMvState = record
+    Brush: TMvBrush;
+    Font: TMvFont;
+    Pen: TMvPen;
+    Opacity: single;
+  end;
+
   { TMvCustomDrawingEngine }
 
   TMvCustomDrawingEngine = class(TComponent)
   private
-    FSavedBrush: TMvBrush;
-    FSavedFont: TMvFont;
-    FSavedOpacity: Single;
-    FSavedPen: TMvPen;
+    FStateStack: array of TMvState;
   protected
     function GetBrushColor: TColor; virtual; abstract;
     function GetBrushStyle: TBrushStyle; virtual; abstract;
@@ -771,19 +775,36 @@ begin
 end;
 
 procedure TMvCustomDrawingEngine.RestoreState;
+var
+  n: integer;
 begin
-  SetPen(FSavedPen);
-  SetBrush(FSavedBrush);
-  SetFont(FSavedFont);
-  SetOpacity(FSavedOpacity);
+  n := Length(FStateStack);
+  if n > 0 then
+  begin
+    with FStateStack[n-1] do
+    begin
+      SetPen(Pen);
+      SetBrush(Brush);
+      SetFont(Font);
+      SetOpacity(Opacity);
+    end;
+    SetLength(FStateStack, n-1);
+  end;
 end;
 
 procedure TMvCustomDrawingEngine.StoreState;
+var
+  n: Integer;
 begin
-  FSavedPen := GetPen;
-  FSavedBrush := GetBrush;
-  FSavedFont := GetFont;
-  FSavedOpacity := GetOpacity;
+  n := Length(FStateStack);
+  SetLength(FStateStack, n+1);
+  with FStateStack[n] do
+  begin
+    Pen := GetPen;
+    Brush := GetBrush;
+    Font := GetFont;
+    Opacity := GetOpacity;
+  end;
 end;
 
 procedure TMvCustomDrawingEngine.SetBrush(ABrush: TMvBrush);