diff --git a/admin/css/screen.css b/admin/css/screen.css
index 16339226d..cd6f303c2 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -227,8 +227,10 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
 .cms .ss-ui-loading-icon { background: url(../../images/network-save.gif) no-repeat; display: block; width: 16px; height: 16px; }
 
 /** ---------------------------------------------------- Grouped form fields ---------------------------------------------------- */
-.fieldgroup .fieldgroup-field { float: left; display: block; padding: 8px 0 0 8px; }
+.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 input, .fieldgroup .fieldgroup-field textarea { float: right; }
 .fieldgroup.stacked .fieldgroup-field { float: none; }
 
 .ss-toggle { margin: 8px 0; }
diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss
index ee53c3033..69f5de565 100644
--- a/admin/scss/_forms.scss
+++ b/admin/scss/_forms.scss
@@ -503,20 +503,22 @@ form.small .field, .field.small {
 	.fieldgroup-field {
 		float: left;
 		display: block;
-		padding: $grid-y 0 0 $grid-x;
+		padding: $grid-y $grid-x 0 0;
 
-		&.odd {
-			
-		}
-		
-		&.even {
-			
-		}
-		
 		.field {
 			border: none;
 			padding-bottom: 0;
 		}
+
+		label {
+			margin-left: 0;
+			margin-right: 1em;
+			width: auto;
+		}
+
+		input, textarea {
+			float: right;
+		}
 	}
 
 	&.stacked {