diff --git a/admin/css/screen.css b/admin/css/screen.css
index 3d62db2fb..5eaa453a4 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -231,7 +231,10 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
 /** ---------------------------------------------------- Grouped form fields ---------------------------------------------------- */
 .fieldgroup .fieldgroup-field { float: left; display: block; padding: 8px 8px 0 0; }
 .fieldgroup .fieldgroup-field .field { border: none; padding-bottom: 0; }
-.fieldgroup .fieldgroup-field label { margin-left: 0; margin-right: 1em; width: auto; }
+.fieldgroup .fieldgroup-field .fieldholder-small { padding: 0 0 8px 0; }
+.fieldgroup .fieldgroup-field .fieldgroup input.text, .fieldgroup .fieldgroup-field .fieldgroup textarea, .fieldgroup .fieldgroup-field .fieldgroup select, .fieldgroup .fieldgroup-field .fieldgroup .TreeDropdownField { margin-left: 0; }
+.fieldgroup .fieldgroup-field .fieldholder-small-label { display: block; }
+.fieldgroup .fieldgroup-field label { padding: 8px 8px 8px 0; margin-left: 0; margin-right: 1em; width: auto; }
 .fieldgroup.stacked .fieldgroup-field { float: none; }
 
 .ss-toggle { margin: 8px 0; }
diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss
index 292b7311e..7338bb032 100644
--- a/admin/scss/_forms.scss
+++ b/admin/scss/_forms.scss
@@ -508,7 +508,22 @@ form.small .field, .field.small {
 			padding-bottom: 0;
 		}
 
+		.fieldholder-small {
+			padding: 0 0 $grid-y 0;
+		}
+
+		.fieldgroup input.text, .fieldgroup textarea, .fieldgroup select, .fieldgroup .TreeDropdownField {
+			margin-left: 0;
+		}
+
+		// Style specific label with display block, otherwise
+		// checkbox falls under the text
+		.fieldholder-small-label {
+			display: block;
+		}
+
 		label {
+			padding: $grid-y $grid-x $grid-y 0;
 			margin-left: 0;
 			margin-right: 1em;
 			width: auto;
diff --git a/templates/forms/CompositeField_holder_small.ss b/templates/forms/CompositeField_holder_small.ss
index 9f5e38629..43e4c4586 100644
--- a/templates/forms/CompositeField_holder_small.ss
+++ b/templates/forms/CompositeField_holder_small.ss
@@ -1,4 +1,4 @@
-<$Tag class="field CompositeField $extraClass <% if ColumnCount %>multicolumn<% end_if %>">
+<$Tag class="CompositeField $extraClass <% if ColumnCount %>multicolumn<% end_if %>">
 	<% if $Tag == 'fieldset' && $Legend %>
 		<legend>$Legend</legend>
 	<% end_if %>
diff --git a/templates/forms/FormField_holder_small.ss b/templates/forms/FormField_holder_small.ss
index 101a190c5..5f91305b3 100644
--- a/templates/forms/FormField_holder_small.ss
+++ b/templates/forms/FormField_holder_small.ss
@@ -1,11 +1,5 @@
 <div class="fieldholder-small">
-	<% if $RightTitle %>
-		<label class="right fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$RightTitle</label>
-	<% else_if $LeftTitle %>
-		<label class="left fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$LeftTitle</label>
-	<% else_if $Title %>
-		<label class="fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$Title</label>
-	<% end_if %>
-	
+	<label class="fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$Title</label>
 	$Field
-</div>
+	<% if $RightTitle %><label class="right fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$RightTitle</label><% end_if %>
+</div>
\ No newline at end of file