diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index 054ac0bf..36900245 100644
--- a/Contrib/Modern UI/Readme.html	
+++ b/Contrib/Modern UI/Readme.html	
@@ -178,9 +178,6 @@ will also help you to learn more about the Modern UI.</p>
   The icon of the installer.<br /><i>Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico</i></p>
   <p class="text"><span class="bold">MUI_UNICON </span><span class="parameter">icon_file</span><br />
   The icon of the uninstaller.<br /><i>Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico</i></p>
-  <p class="text"><span class="bold">MUI_CHECKBITMAP </span><span class="parameter">bitmap_file</span><br />
-  The bitmap with images for the checks of the component select treeview.<br />
-  <i>Default: ${NSISDIR}\Contrib\Graphics\Checks\modern.bmp</i></p>
   <p class="text"><span class="bold">MUI_HEADERIMAGE</span><br />
   Display an image on the header of page.</p>
   <div class="margin">
@@ -217,7 +214,14 @@ will also help you to learn more about the Modern UI.</p>
   The interface files with a customized dialog resource IDD_SELCOM without a description area.<br />
   <i>Default: {NSISDIR}\Contrib\UIs\modern-nodesc.exe</i></p>
   </div>
+  <p class="sub2header">Components Page Interface Settings</p>
+  <div class="margin">
+  <p class="text"><span class="bold">MUI_COMPONENTSPAGE_CHECKBITMAP </span><span class="parameter">bitmap_file</span><br />
+  The bitmap with images for the checks of the component select treeview.<br />
+  <i>Default: ${NSISDIR}\Contrib\Graphics\Checks\modern.bmp</i></p>
+  </div>
   <p class="sub2header">Welcome/Finish Page Interface Settings</p>
+  <div class="margin">
   <p class="text"><span class="bold">MUI_WELCOMEFINISHPAGE_3LINES </span><span class="parameter">ini_file</span><br />
   Create a bigger area for the title on the Welcome- and Finish page, to allow displaying 3 lines of text
   (with the default font). This setting has no effect when using a custom INI file.</p>
@@ -235,7 +239,9 @@ will also help you to learn more about the Modern UI.</p>
   bitmap that fits exactly, you should not use this option because the size of the field will be different
   if the user has a custom DPI setting.</p>
   </div>
+  </div>
   <p class="sub2header">Uninstaller Welcome/Finish Page Interface Settings</p>
+  <div class="margin">
   <p class="text"><span class="bold">MUI_UNWELCOMEFINISHPAGE_3LINES </span><span class="parameter">ini_file</span><br />
   Create a bigger area for the title on the uninstaller Welcome- and Finish page, to allow displaying 3 lines of text
   (with the default font). This setting has no effect when using a custom INI file.</p>
@@ -253,6 +259,7 @@ will also help you to learn more about the Modern UI.</p>
   bitmap that fits exactly, you should not use this option because the size of the field will be different
   if the user has a custom DPI setting.</p>
   </div>
+  </div>
   <p class="sub2header">License Page Interface Settings</p>
   <div class="margin">
   <p class="text"><span class="bold">MUI_LICENSEPAGE_BGCOLOR </span><span class="parameter">
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index b8298bbd..b910c4db 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -59,8 +59,8 @@ Var MUI_TEMP2
     !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
   !endif
 
-  !ifndef MUI_CHECKBITMAP
-    !define MUI_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
+  !ifndef MUI_COMPONENTSPAGE_CHECKBITMAP
+    !define MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
   !endif
   
   !ifndef MUI_LICENSEPAGE_BGCOLOR
@@ -128,7 +128,7 @@ Var MUI_TEMP2
   Icon "${MUI_ICON}"
   UninstallIcon "${MUI_UNICON}"
   
-  CheckBitmap "${MUI_CHECKBITMAP}"
+  CheckBitmap "${MUI_COMPONENTSPAGE_CHECKBITMAP}"
   LicenseBkColor "${MUI_LICENSEPAGE_BGCOLOR}"
   InstallColors ${MUI_INSTFILESPAGE_COLORS}
   InstProgressFlags ${MUI_INSTFILESPAGE_PROGRESSBAR}