diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index 7ad75de2bb..28fe103bd7 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -22,9 +22,9 @@
 
 { TCustomForm }
 
-{------------------------------------------------------------------------------}
-{       TCustomForm ClientWndProc                                              }
-{------------------------------------------------------------------------------}
+{------------------------------------------------------------------------------
+       TCustomForm ClientWndProc
+------------------------------------------------------------------------------}
 Procedure TCustomForm.ClientWndProc(var Message: TLMessage);
 
   procedure CallDefault;
@@ -283,7 +283,7 @@ end;
 function TCustomForm.GetIconHandle: HICON;
 begin
   //DebugLn('[TCustomForm.GetIconHandle] ',ClassName,' ',FIcon<>nil);
-  if (FIcon<>nil) and not Icon.Empty then
+  if (FIcon<>nil) and (not Icon.Empty) then
     Result := FIcon.Handle
   else
     Result := Application.GetIconHandle;
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index f2af2026e9..48786ed378 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -4998,7 +4998,6 @@ begin
   if HandleAllocated then begin
     FinalizeWnd;
     TWSWinControlClass(WidgetSetClass).DestroyHandle(Self);
-    InvalidatePreferredSize;
     Handle := 0;
   end;
 end;