diff --git a/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.lfm b/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.lfm
index 8cedc78e8..53eec6720 100644
--- a/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.lfm
+++ b/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.lfm
@@ -67,7 +67,7 @@ object JvThumbnailChildForm: TJvThumbnailChildForm
       BorderSpacing.Right = 4
       Color = clDefault
       HideSelection = False
-      Mask = '*.ICO;*.BMP;*.EMF;*.WMF;*.JPG;*.JPEG'
+      Mask = '*.ico;*.bmp;*.jpg;*.jpeg;*.png'
       ReadOnly = True
       SortType = stText
       TabOrder = 1
@@ -312,7 +312,7 @@ object JvThumbnailChildForm: TJvThumbnailChildForm
         Top = 0
         Width = 230
         Anchors = [akTop, akLeft, akRight]
-        Filter = 'All Known Formats|*.ICO;*.BMP;*.EMF;*.WMF;*.JPG;*.JPEG;|All Files (*.*)|*.*|JPEG Files|*.JPG;*.JPEG;|BMP Files|*.BMP|WMF Files|*.WMF|EMF Files |*.EMF|ICONS |*.ICO'
+        Filter = 'All Known Formats|*.ico;*.bmp;*.jpg;*.jpeg;*.png|All Files (*.*)|*.*|JPEG Files|*.jpg;*.jpeg;|BMP Files|*.bmp|PNG Files|*.png|ICONS|*.ico'
         ItemIndex = 0
         ShellListView = ShellListView
         TabOrder = 0
diff --git a/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.pas b/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.pas
index 066f36ca2..2c9f8aaec 100644
--- a/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.pas
+++ b/components/jvcllaz/examples/JvThumbnail/JvThumbnailChildFormU.pas
@@ -237,6 +237,8 @@ begin
   ThumbImage.Parent.DoubleBuffered := true;
   ShellListView.DoubleBuffered := true;
   {$ENDIF}
+  FilterCombobox.ItemIndex := 0;
+  ShellListView.Mask := FilterCombobox.Mask;
 end;
 
 procedure TJvThumbnailChildForm.GbTitlePlacementClick(Sender: TObject);
diff --git a/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas b/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas
index 3fce5a328..eaf36facb 100644
--- a/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas
+++ b/components/jvcllaz/examples/JvThumbnail/JvThumbnailMainFormU.pas
@@ -307,10 +307,8 @@ var
 begin
   F := TJvThumbnailChildForm.Create(Self);
   try
-    F.ShellListView.Mask := GraphicFileMask(TCustomBitmap);
     {$IFNDEF Windows}
     F.ShellListView.Mask := Uppercase(F.ShellListView.Mask)+';'+Lowercase(F.ShellListView.Mask);
-    // ShellListView, by default, has an uppercase Mask which is usually not good for Linux.
     {$ENDIF}
     F.ShelLTreeView.Path := ShellTreeView.Path;
     if Sender is TJvThumbView then
diff --git a/components/jvcllaz/run/JvCustomControls/JvThumbImage.pas b/components/jvcllaz/run/JvCustomControls/JvThumbImage.pas
index 057e2e88f..15de211cd 100644
--- a/components/jvcllaz/run/JvCustomControls/JvThumbImage.pas
+++ b/components/jvcllaz/run/JvCustomControls/JvThumbImage.pas
@@ -771,7 +771,7 @@ begin
         Bmp.SetSize(w, h);
         Bmp.Canvas.Brush.Color := clWhite;
         Bmp.Canvas.FillRect(0, 0, w, h);
-        Bmp.Assign(Picture);
+        Bmp.Assign(Picture.Graphic);
         SrcIntfImg.LoadFromBitmap(Bmp.Handle, Bmp.MaskHandle);
         DestIntfImg.LoadFromBitmap(Bmp.Handle, Bmp.MaskHandle);
         TransformProc(SrcIntfImg, DestIntfImg, ARedData, AGreenData, ABlueData);