diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index de0ba4d0..32449578 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -165,6 +165,10 @@
 }
 
 .ace_line .ace_fold {
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    
     display: inline-block;
     height: 11px;
     margin-top: -2px;
@@ -179,9 +183,9 @@
     color: transparent;
 
     border: 1px solid black;
-    -moz-border-radius: 1px;
-    -webkit-border-radius: 1px;
-    border-radius: 1px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
     
     cursor: pointer;
     pointer-events: auto;
@@ -213,9 +217,9 @@
 
     margin: 0 -12px 1px 1px;
     display: inline-block;
-    height: 15px;
+    height: 14px;
     width: 11px;
-    vertical-align: middle;
+    vertical-align: text-bottom;
     
     background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82");
     background-repeat: no-repeat;
diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js
index b7612d17..b1007427 100644
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@@ -388,7 +388,10 @@ var Text = function(parentEl) {
 
         if (!this.$textToken[token.type]) {
             var classes = "ace_" + token.type.replace(/\./g, " ace_");
-            stringBuilder.push("<span class='", classes, "'>", output, "</span>");
+            var style = "";
+            if (token.type == "fold")
+                style = " style='width:" + (token.value.length * this.config.characterWidth) + "px;' ";
+            stringBuilder.push("<span class='", classes, "'", style, ">", output, "</span>");
         }
         else {
             stringBuilder.push(output);
@@ -400,7 +403,6 @@ var Text = function(parentEl) {
         var chars = 0;
         var split = 0;
         var splitChars;
-        var characterWidth = this.config.characterWidth;
         var screenColumn = 0;
         var self = this;