diff --git a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
index 4a59d2085..91ce203c6 100644
--- a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
+++ b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
@@ -11,7 +11,7 @@
   filter: alpha(opacity=0);
 }
 .field-codeeditor.editor-focus {
-  border: 2px solid #cccccc;
+  border: 2px solid #808c8d;
 }
 .field-codeeditor.size-tiny {
   min-height: 50px;
@@ -41,7 +41,7 @@
 }
 .field-codeeditor .editor-toolbar {
   position: absolute;
-  top: 0;
+  top: 3px;
   right: 3px;
   z-index: 150;
 }
@@ -53,15 +53,18 @@
 }
 .field-codeeditor .editor-toolbar > ul > li {
   float: left;
-  padding: 2px 5px;
-  height: 25px;
 }
 .field-codeeditor .editor-toolbar > ul > li > a {
+  display: block;
+  height: 25px;
+  width: 25px;
   color: #666;
   font-size: 20px;
+  text-align: center;
   text-decoration: none;
 }
 .field-codeeditor .editor-toolbar > ul > li > a > abbr {
+  position: absolute;
   font: 0/0 a;
   color: transparent;
   text-shadow: none;
diff --git a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
index 1bd6387c7..bf5073c9e 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
@@ -26,7 +26,7 @@
         this.$toolbar  = this.$el.find('>.editor-toolbar:first')
         this.$code     = null
         this.editor    = null
-        
+
         // Toolbar links
         this.isFullscreen = false
         this.$fullscreenEnable = this.$toolbar.find('li.fullscreen-enable')
@@ -221,6 +221,10 @@
         return this.editor
     }
 
+    CodeEditor.prototype.getToolbar = function() {
+        return this.$toolbar
+    }
+
     CodeEditor.prototype.toggleFullscreen = function() {
         this.$el.toggleClass('editor-fullscreen')
         this.$fullscreenEnable.toggle()
diff --git a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
index a0fcbac58..0757ab7af 100644
--- a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
+++ b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
@@ -30,20 +30,25 @@
 
     .editor-toolbar {
         position: absolute;
-        top: 0;
+        top: 3px;
         right: 3px;
         z-index: @codeeditor-zindex;
         > ul, ul > li { list-style-type: none; padding: 0; margin: 0; }
         > ul > li {
             float: left;
-            padding: 2px 5px;
-            height: 25px;
         }
         > ul > li > a {
+            display: block;
+            height: 25px;
+            width: 25px;
             color: #666;
             font-size: 20px;
+            text-align: center;
             text-decoration: none;
-            > abbr { .text-hide(); }
+            > abbr {
+                position: absolute;
+                .text-hide();
+            }
             > i {
                 .opacity(.4);
                 display: block;