Index: core/admin_templates/incs/form_blocks.tpl
===================================================================
--- core/admin_templates/incs/form_blocks.tpl
+++ core/admin_templates/incs/form_blocks.tpl
@@ -883,11 +883,11 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_checkbox_item">
-	<input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><label for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><inp2:m_param name="option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
+	<label class="checkbox" for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><inp2:m_param name="option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_checkbox_phrase">
-	<input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><label for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><inp2:m_phrase label="$option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
+	<label class="checkbox" for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><input type="checkbox" <inp2:m_param name='checked'/> id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>" tabindex="<inp2:m_Get name='tab_index'/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field='$field' as_preg='1'/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field='$field'/>');"><inp2:m_phrase label="$option"/></label><inp2:m_if check="m_Param" name="has_br"><br/><inp2:m_else/>&nbsp;</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" has_br="0">
Index: core/admin_templates/incs/style_template.css
===================================================================
--- core/admin_templates/incs/style_template.css
+++ core/admin_templates/incs/style_template.css
@@ -549,6 +549,10 @@
 	border-collapse: separate
 }
 
+label.checkbox {
+    white-space: nowrap;
+}
+
 /* Uploader */
 .uploader-queue div.file {
 	font-size: 11px;
@@ -796,4 +800,4 @@
 	border-width: 0px !important;
 	-moz-border-radius: 0px !important;
 	-webkit-border-radius: 0px !important;
-}
\ No newline at end of file
+}
Index: core/install/upgrades.css
===================================================================
--- core/install/upgrades.css
+++ core/install/upgrades.css
@@ -681,7 +681,7 @@
 +++ style_template.css	(working copy)
 @@ -60,7 +60,7 @@
  }
- 
+
  .bordered, table.bordered, .bordered-no-bottom {
 -	border: 1px solid #000000;
 +	border: 1px solid #000000 !important;
@@ -690,7 +690,7 @@
  }
 @@ -269,7 +269,7 @@
  }
- 
+
  /* Main row definition */
 -.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {
 +.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2, .grid-edit-table .edit-form-odd > td, .grid-edit-table .edit-form-even > td {
@@ -709,7 +709,7 @@
 @@ -346,6 +346,29 @@
   background-color: #FFFF00;
  }
- 
+
 +div.filter, div.filter-active {
 +	background-color: white;
 +	border: 1px solid #AAAAAA;
@@ -748,7 +748,7 @@
 @@ -493,11 +516,18 @@
  	border-top-width: 0px;
  }
- 
+
 +.form-notice, .form-warning {
 +	font-size: 11px;
 +}
@@ -757,7 +757,7 @@
  	color: red;
 -	font-size: 11px;
  }
- 
+
 +.form-notice {
 +	color: green;
 +}
@@ -766,7 +766,7 @@
  	color: red;
  	padding-left: 1px;
 @@ -751,4 +781,17 @@
- 
+
  .summary-box li {
  	padding-bottom: 4px;
 +}
@@ -791,7 +791,7 @@
 --- style_template.css	(revision 15359)
 +++ style_template.css	(working copy)
 @@ -424,7 +424,7 @@
- 
+
  .grid-status-bar td {
  	background-color: @@TitleBarBgColor@@;
 -  color: @@TitleBarColor@@;
@@ -802,7 +802,7 @@
 @@ -610,11 +610,13 @@
  	text-decoration: none;
  }
- 
+
 -/* Left side of bluebar */
 -.header_left_bg {
 +/* Page header (bluebar) */
@@ -815,5 +815,23 @@
 +	font-weight: normal;
 +	padding: 2px 8px 2px 8px;
  }
- 
+
  /* Right side of bluebar */
+
+# ===== v 5.2.2 =====
+Index: style_template.css
+===================================================================
+--- style_template.css	(revision 16300)
++++ style_template.css	(working copy)
+@@ -549,6 +549,10 @@
+border-collapse: separate
+}
+
++label.checkbox {
+ +    white-space: nowrap;
+ +}
++
+/* Uploader */
+.uploader-queue div.file {
+    font-size: 11px;
+