diff --git a/IPython/frontend/html/notebook/static/notebook/js/outputarea.js b/IPython/frontend/html/notebook/static/notebook/js/outputarea.js
index dfbf581..a56ba4d 100644
--- a/IPython/frontend/html/notebook/static/notebook/js/outputarea.js
+++ b/IPython/frontend/html/notebook/static/notebook/js/outputarea.js
@@ -59,8 +59,7 @@ var IPython = (function (IPython) {
         this.wrapper.addClass('output_wrapper');
         this.element.addClass('output vbox');
         
-        this.collapse_button.button();
-        this.collapse_button.addClass('output_collapsed vbox');
+        this.collapse_button.addClass("btn output_collapsed");
         this.collapse_button.attr('title', 'click to expand output');
         this.collapse_button.html('. . .');
         
@@ -112,11 +111,6 @@ var IPython = (function (IPython) {
         this.collapse_button.click(function () {
             that.expand();
         });
-        this.collapse_button.hover(function () {
-            $(this).addClass("ui-state-hover");
-        }, function () {
-            $(this).removeClass("ui-state-hover");
-        });
     };
 
 
diff --git a/IPython/frontend/html/notebook/static/notebook/less/codecell.less b/IPython/frontend/html/notebook/static/notebook/less/codecell.less
index 2ca1dff..c4840f6 100644
--- a/IPython/frontend/html/notebook/static/notebook/less/codecell.less
+++ b/IPython/frontend/html/notebook/static/notebook/less/codecell.less
@@ -25,11 +25,9 @@ div.input_prompt {
 div.output_wrapper {
     /* This is a spacer between the input and output of each cell */
     margin-top: 5px;
-    margin-left: 5px;
-    /* FF needs explicit width to stretch */
-    width: 100%;
     /* this position must be relative to enable descendents to be absolute within it */
     position: relative;
+    .vbox()
 }
 
 /* class for the output area when it should be height-limited */
@@ -46,12 +44,14 @@ div.output_scroll {
 
 /* output div while it is collapsed */
 div.output_collapsed {
-  margin-right: 5px;
+  margin: 0px;
+  padding: 0px;
+  .vbox();
 }
 
 div.out_prompt_overlay {
   height: 100%;
-  padding: 0px;
+  padding: 0px 0.4em;
   position: absolute;
   .corner-all;
 }
@@ -64,6 +64,4 @@ div.out_prompt_overlay:hover {
 
 div.output_prompt {
     color: darkred;
-    /* 5px right shift to account for margin in parent container */
-    margin: 0 5px 0 -5px;
 }
diff --git a/IPython/frontend/html/notebook/static/notebook/less/outputarea.less b/IPython/frontend/html/notebook/static/notebook/less/outputarea.less
index fc6de48..225d3d7 100644
--- a/IPython/frontend/html/notebook/static/notebook/less/outputarea.less
+++ b/IPython/frontend/html/notebook/static/notebook/less/outputarea.less
@@ -25,6 +25,7 @@ div.output_area pre {
    the prompt div. */
 div.output_subarea {
     padding: 0.44em 0.4em 0.4em 1px;
+    margin-left: 6px;
     .box-flex1();
 }
 
diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css
index ca28ede..1e7f971 100644
--- a/IPython/frontend/html/notebook/static/style/style.min.css
+++ b/IPython/frontend/html/notebook/static/style/style.min.css
@@ -1272,12 +1272,12 @@ div.prompt{width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:
 div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
 div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;}
 div.input_prompt{color:navy;border-top:1px solid transparent;}
-div.output_wrapper{margin-top:5px;margin-left:5px;width:100%;position:relative;}
+div.output_wrapper{margin-top:5px;position:relative;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;}
 div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0, 0, 0, 0.8);-moz-box-shadow:inset 0 2px 8px rgba(0, 0, 0, 0.8);box-shadow:inset 0 2px 8px rgba(0, 0, 0, 0.8);}
-div.output_collapsed{margin-right:5px;}
-div.out_prompt_overlay{height:100%;padding:0px;position:absolute;border-radius:4px;}
+div.output_collapsed{margin:0px;padding:0px;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;}
+div.out_prompt_overlay{height:100%;padding:0px 0.4em;position:absolute;border-radius:4px;}
 div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000000;-moz-box-shadow:inset 0 0 1px #000000;box-shadow:inset 0 0 1px #000000;background:rgba(240, 240, 240, 0.5);}
-div.output_prompt{color:darkred;margin:0 5px 0 -5px;}
+div.output_prompt{color:darkred;}
 .CodeMirror{line-height:1.231em;height:auto;background:none;}
 .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto;}
 .CodeMirror-lines{padding:0.4em;}
@@ -1331,7 +1331,7 @@ p{margin-bottom:0;}
 .notification_widget{float:right;right:0px;top:1px;height:25px;padding:3px 6px;z-index:10;}
 div.output_area{padding:0px;page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;}
 div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit;}
-div.output_subarea{padding:0.44em 0.4em 0.4em 1px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
+div.output_subarea{padding:0.44em 0.4em 0.4em 1px;margin-left:6px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;}
 div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231em;}
 div.output_stream{padding-top:0.0em;padding-bottom:0.0em;}
 div.output_stderr{background:#fdd;}