diff --git a/core.css b/core.css
index b27c303..dfc5fd5 100644
--- a/core.css
+++ b/core.css
@@ -220,12 +220,6 @@ table tr.draggable span.tabledrag-changed { display:none; }
   margin-bottom: 10px;
   }
 
-.form-wrapper .form-item,
-.form-wrapper .form-wrapper {
-  border:0;
-  margin-bottom:0;
-  }
-
 .media-widget.form-wrapper{
   padding-bottom:10px;
   }
@@ -503,22 +497,23 @@ body.page-admin div.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane field
   .collapsible .fieldset-legend a { padding-bottom:4px; }
 
   /* Explicit height for IE */
-  .collapsible .fieldset-legend a { height:20px; }
+  .collapsible .fieldset-legend a { 
+    height:20px;
+    padding-left:28px;
+    }
 
   .collapsible .fieldset-legend span.icon {
     position:absolute;
-    left:-20px;
-    top:4px;
-    background:url(images/bleeds.png) -20px -180px no-repeat;
-    width:20px;
-    height:20px;
+    left:6px;
+    top:6px;
+    background:url(images/bleeds.png) -80px -120px no-repeat;
+    width:15px;
+    height:15px;
     display:block;
     cursor:pointer;
     }
 
-    html.js .collapsed .fieldset-legend span.icon { background-position:0px -180px; }
-
-    .fieldset .collapsible .fieldset-legend span.icon { display:none; }
+    html.js .collapsed .fieldset-legend span.icon { background-position:-60px -120px; }
 
   .collapsed .fieldset-legend a {
     background:#eee;
diff --git a/images/bleeds.png b/images/bleeds.png
index e202e25..429c305 100644
Binary files a/images/bleeds.png and b/images/bleeds.png differ
diff --git a/template.php b/template.php
index 8953da2..1151acd 100644
--- a/template.php
+++ b/template.php
@@ -134,7 +134,8 @@ function rubik_preprocess_page(&$vars) {
  * Preprocessor for theme('fieldset').
  */
 function rubik_preprocess_fieldset(&$vars) {
-  if (!empty($vars['element']['#collapsible'])) {
+  if (isset($vars['element']['#collapsible']) && $vars['element']['#collapsible']) {
+    dpm($vars);
     $vars['title'] = "<span class='icon'></span>" . $vars['title'];
   }
 }