diff --git a/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css b/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css
index a80a66559..958c5a2ba 100644
--- a/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css
+++ b/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css
@@ -1,7 +1,7 @@
 .field-markdowneditor {
   width: 100%;
   position: relative;
-  border: 1px solid #e0e0e0;
+  border: 1px solid #d1d6d9;
   background: #fff;
   -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
   transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
@@ -18,7 +18,7 @@
   border-top-left-radius: 5px;
 }
 .field-markdowneditor.editor-focus {
-  border: 1px solid #808c8d;
+  border: 1px solid #d1d6d9;
 }
 .field-markdowneditor.size-tiny .editor-write {
   min-height: 50px;
diff --git a/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js b/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js
index 1969c1634..740f86284 100644
--- a/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js
+++ b/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js
@@ -91,7 +91,7 @@
     //
 
     MarkdownEditor.prototype.onClickToolbarButton = function(ev) {
-        var $button = $(ev.target),
+        var $button = $(ev.target).closest('.btn'),
             action = $button.data('button-action'),
             template = $button.data('button-template')
 
@@ -251,7 +251,7 @@
             $button.addClass(button.cssClass)
         }
         else {
-            $button.addClass('tb-icon tb-' + button.icon)
+            $button.append('<i class="icon-' + button.icon + '"></i>')
         }
 
         return $button
@@ -705,7 +705,7 @@
 
         formatting: {
             label: 'markdowneditor.formatting',
-            icon: 'formatting',
+            icon: 'paragraph',
             dropdown: {
                 quote: {
                     label: 'markdowneditor.quote',
@@ -771,13 +771,13 @@
         },
         unorderedlist: {
             label: 'markdowneditor.unorderedlist',
-            icon: 'unorderedlist',
+            icon: 'list-ul',
             action: 'formatBlockMulti',
             template: '* $1'
         },
         orderedlist: {
             label: 'markdowneditor.orderedlist',
-            icon: 'orderedlist',
+            icon: 'list-ol',
             action: 'formatBlockMulti',
             template: '1. $1'
         },
@@ -795,7 +795,7 @@
         },
         horizontalrule: {
             label: 'markdowneditor.horizontalrule',
-            icon: 'horizontalrule',
+            icon: 'minus',
             action: 'insertLine',
             template: '\n\n---\n'
         },
@@ -813,13 +813,13 @@
         },
         fullscreen: {
             label: 'markdowneditor.fullscreen',
-            icon: 'fullscreen',
+            icon: 'expand',
             action: 'toggleFullscreen',
             fixed: true
         },
         preview: {
             label: 'markdowneditor.preview',
-            cssClass: 'oc-button oc-icon-eye',
+            icon: 'eye',
             action: 'togglePreview',
             fixed: true
         }