diff --git a/components/exctrls/exctrlspkg.lpk b/components/exctrls/exctrlspkg.lpk
index c03d408fe..80a1a8ad7 100644
--- a/components/exctrls/exctrlspkg.lpk
+++ b/components/exctrls/exctrlspkg.lpk
@@ -10,7 +10,7 @@
       <SearchPaths>
         <IncludeFiles Value="source"/>
         <OtherUnitFiles Value="source"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\runtime\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Extended standard controls: 
diff --git a/components/exctrls/exctrlspkg_dsgn.lpk b/components/exctrls/exctrlspkg_dsgn.lpk
index 4ae148ac7..d36cb9aa1 100644
--- a/components/exctrls/exctrlspkg_dsgn.lpk
+++ b/components/exctrls/exctrlspkg_dsgn.lpk
@@ -9,9 +9,8 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="source"/>
-        <OtherUnitFiles Value="source"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <OtherUnitFiles Value="source\design"/>
+        <UnitOutputDirectory Value="lib\designtime\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Designtime package for the extended standard controls (ExCtrls) runtime package
@@ -19,9 +18,9 @@
     <License Value="LGPL with linking exception (like Lazarus LCL)."/>
     <Files Count="1">
       <Item1>
-        <Filename Value="source\exctrlsreg.pas"/>
+        <Filename Value="source\design\exctrlsreg.pas"/>
         <HasRegisterProc Value="True"/>
-        <UnitName Value="exctrlsreg"/>
+        <UnitName Value="ExCtrlsReg"/>
       </Item1>
     </Files>
     <CompatibilityMode Value="True"/>
diff --git a/components/exctrls/fpdoc/exbuttons.xml b/components/exctrls/fpdoc/exbuttons.xml
new file mode 100644
index 000000000..d159852eb
--- /dev/null
+++ b/components/exctrls/fpdoc/exbuttons.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fpdoc-descriptions><package name="ExCtrlsPkg"><module name="ExButtons"><element name="TButtonEx.Alignment"><short>Determines the alignment of the caption within the button (left, right, centered)</short>
+      </element><element name="TButtonEx.FontDisabled"><short>Font to be used when the button is disabled. <var>DefaultDrawing</var> must be active for this to become active.</short>
+      </element>
+    <element name="TButtonEx.DefaultDrawing"><short>Activate non-widgetset drawing routines for the button and gives access to many of the new properties</short>
+      </element>
+    </module>
+  </package>
+</fpdoc-descriptions>
diff --git a/components/exctrls/images/make_res.bat b/components/exctrls/images/make_res.bat
index 8167e3d7e..cb1809015 100644
--- a/components/exctrls/images/make_res.bat
+++ b/components/exctrls/images/make_res.bat
@@ -1 +1 @@
-lazres ..\source\exctrlsreg.res @imagelist.txt
\ No newline at end of file
+lazres ..\source\design\exctrlsreg.res @imagelist.txt
\ No newline at end of file
diff --git a/components/exctrls/source/exctrlsreg.pas b/components/exctrls/source/design/exctrlsreg.pas
similarity index 100%
rename from components/exctrls/source/exctrlsreg.pas
rename to components/exctrls/source/design/exctrlsreg.pas
diff --git a/components/exctrls/source/design/exctrlsreg.res b/components/exctrls/source/design/exctrlsreg.res
new file mode 100644
index 000000000..f2e0df71f
Binary files /dev/null and b/components/exctrls/source/design/exctrlsreg.res differ
diff --git a/components/exctrls/source/excheckcombo.pas b/components/exctrls/source/excheckcombo.pas
index 87079855a..4ebae80a1 100644
--- a/components/exctrls/source/excheckcombo.pas
+++ b/components/exctrls/source/excheckcombo.pas
@@ -84,7 +84,7 @@ type
     FOnItemChange: TCheckItemChange;
     FOnItemClick: TCheckListClicked;
     procedure ButtonMouseDownHandler(Sender: TObject;
-      AButton: TMouseButton; Shift: TShiftState; X, Y: Integer);
+      {%H-}AButton: TMouseButton; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
     procedure CheckComboBoxFormCloseHandler(Sender: TObject; var CloseAction: TCloseAction);
     function GetButtonWidth: Integer;
     function GetChecked(AIndex: Integer): Boolean;
diff --git a/components/exctrls/source/exquestiondlg.pas b/components/exctrls/source/exquestiondlg.pas
index 05b345d35..1e579a1a9 100644
--- a/components/exctrls/source/exquestiondlg.pas
+++ b/components/exctrls/source/exquestiondlg.pas
@@ -468,7 +468,7 @@ begin
     else if QuestionDlgEx_CustomIcon.Icon <> nil then
       FImage := TIcon.Create
     else if QuestionDlgEx_CustomIcon.Graphic <> nil then
-      FImage := TGraphic(QuestionDlgEx_CustomIcon.ClassType).Create
+      FImage := TGraphicClass(QuestionDlgEx_CustomIcon.ClassType).Create
     else
       exit;
     Fimage.Assign(QuestionDlgEx_CustomIcon);