Index: lcl/interfaces/win32/win32wsstdctrls.pp
===================================================================
--- lcl/interfaces/win32/win32wsstdctrls.pp	(revision 49165)
+++ lcl/interfaces/win32/win32wsstdctrls.pp	(working copy)
@@ -583,6 +583,9 @@
   WindowInfo: PWin32WindowInfo;
   NCCreateParams: PNCCreateParams;
   LMessage: TLMessage;
+  Count: LResult;
+  Top: Integer;
+  ARect: TRect;
 begin
   case Msg of
     WM_NCCREATE:
@@ -609,6 +612,26 @@
         LMessage.Result := 0;
         Exit(DeliverMessage(WindowInfo^.WinControl, LMessage));
       end;
+    WM_ERASEBKGND:
+      // Avoid unnecessary background paints to avoid flickering of the listbox
+      begin
+        WindowInfo := GetWin32WindowInfo(Window);
+        Count := SendMessage(Window, LB_GETCOUNT, 0, 0);
+        if Assigned(WindowInfo^.WinControl) and
+          (TCustomListBox(WindowInfo^.WinControl).Columns < 2) and
+          (Count <> LB_ERR) and (SendMessage(Window, LB_GETITEMRECT, Count - 1, Windows.LParam(@ARect)) <> LB_ERR) then
+        begin
+          Top := ARect.Bottom;
+          Windows.GetClientRect(Window, ARect);
+          ARect.Top := Top;
+          if not IsRectEmpty(ARect) then
+            Windows.FillRect(HDC(WParam), ARect, WindowInfo^.WinControl.Brush.Reference.Handle);
+          Result := 1;
+        end
+        else
+          Result := CallDefaultWindowProc(Window, Msg, WParam, LParam);
+        Exit;
+      end;
   end;
   // normal processing
   Result := WindowProc(Window, Msg, WParam, LParam);

Index: win32wsstdctrls.pp
===================================================================
--- win32wsstdctrls.pp	(revision 49559)
+++ win32wsstdctrls.pp	(working copy)
@@ -613,7 +613,8 @@
         Exit(DeliverMessage(WindowInfo^.WinControl, LMessage));
       end;
     WM_ERASEBKGND:
-      if WindowsVersion <= wvXP then   // Standardbehavior for XP
+      if (WindowsVersion <= wvXP) or not ThemeServices.ThemesEnabled then
+        // Standardbehavior for XP, or no themes
         Result := CallDefaultWindowProc(Window, Msg, WParam, LParam)
       else
       begin

Index: lcl/interfaces/win32/win32wsstdctrls.pp
===================================================================
--- lcl/interfaces/win32/win32wsstdctrls.pp	(revision 50095)
+++ lcl/interfaces/win32/win32wsstdctrls.pp	(working copy)
@@ -613,13 +613,19 @@
         Exit(DeliverMessage(WindowInfo^.WinControl, LMessage));
       end;
     WM_ERASEBKGND:
-      if (WindowsVersion <= wvXP) or not ThemeServices.ThemesEnabled then
-        // Standardbehavior for XP, or no themes
-        Result := CallDefaultWindowProc(Window, Msg, WParam, LParam)
-      else
       begin
+        WindowInfo := GetWin32WindowInfo(Window);
+        if ((WindowsVersion <= wvServer2003) or not ThemeServices.ThemesEnabled) then
+        begin
+          if Assigned(WindowInfo^.WinControl) and not
+             (TCustomListbox(WindowInfo^.WinControl).Style in [lbOwnerDrawFixed, lbOwnerDrawVariable])
+          then begin
+            // Standard behavior for XP/WinServer2003, no themes, no OwnerDraw
+            Result := CallDefaultWindowProc(Window, Msg, WParam, LParam);
+            exit;
+          end
+        end;
         // Avoid unnecessary background paints to avoid flickering of the listbox
-        WindowInfo := GetWin32WindowInfo(Window);
         Count := SendMessage(Window, LB_GETCOUNT, 0, 0);
         if Assigned(WindowInfo^.WinControl) and
           (TCustomListBox(WindowInfo^.WinControl).Columns < 2) and