diff --git themes/bartik/css/style.css themes/bartik/css/style.css
index d7920b4..7c7bafc 100644
--- themes/bartik/css/style.css
+++ themes/bartik/css/style.css
@@ -1123,20 +1123,18 @@ a.button:active {
 fieldset {
   background: #ffffff;
   border: 1px solid #cccccc;
-  margin-top: 10px;
-  margin-bottom: 32px;
+  margin: 2.9em 0px 1em 1px; /* Leave room for the legend. */
   padding: 0 0 10px;
   position: relative;
-  top: 12px; /* Offsets the negative margin of legends */
   -khtml-border-radius: 4px;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
 .fieldset-wrapper {
-  margin-top: 25px;
+  margin-top: 10px;
 }
-.node-form .fieldset-wrapper {
+.node-form .filter-wrapper .fieldset-wrapper {
   margin-top: 0;
 }
 .filter-wrapper {
@@ -1185,7 +1183,7 @@ fieldset legend {
   position: absolute;
   text-indent: 10px;
   text-shadow: 0 1px 0 #fff;
-  top: -12px;
+  top: -1.9em;
   width: 100%;
   -khtml-border-radius-topleft: 4px;
   -moz-border-radius-topleft: 4px;
@@ -1434,6 +1432,9 @@ div.password-suggestions {
 div.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane {
   padding: 1em;
 }
+div.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane .fieldset-wrapper {
+  margin-top: 0;
+}
 #forum tr td.forum {
   padding-left: 35px;
 }