diff --git a/static/editor.md/editormd.js b/static/editor.md/editormd.js
index 28838ad..8928a67 100644
--- a/static/editor.md/editormd.js
+++ b/static/editor.md/editormd.js
@@ -3382,7 +3382,8 @@
         atLink        : /@(\w+)/g,
         email         : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
         emailLink     : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
-        emoji         : /:([\w\+-]+):/g,
+        //emoji         : /:([\w\+-]+):/g,
+        emoji         : /:([A-Za-z]+):/g,
         emojiDatetime : /(\d{2}:\d{2}:\d{2})/g,
         twemoji       : /:(tw-([\w]+)-?(\w+)?):/g,
         fontAwesome   : /:(fa-([\w]+)(-(\w+)){0,}):/g,
diff --git a/template/app_doc/create_base_2.html b/template/app_doc/create_base_2.html
index 4aeb222..5c25cb9 100644
--- a/template/app_doc/create_base_2.html
+++ b/template/app_doc/create_base_2.html
@@ -240,10 +240,9 @@
         toolbarIcons : function() {
             return [
                 "undo", "redo", "|",
-                "bold", "del", "italic", "quote","kaiSpan", "|",
-                "h1", "h2", "h3", "|",
+                "h1", "bold", "del", "italic", "quote","kaiSpan",  "|",
                 "list-ul", "list-ol", "hr", "link", "reference-link", "|",
-                "mindmap","imgUpload", "attachment" ,"code", "code-block", "htmltable", "|","datetime", "emoji", "html-entities", "pagebreak", "|",
+                "mindmap","imgUpload", "attachment" ,"code", "code-block", "htmltable", "|", "emoji", "html-entities", "pagebreak", "|",
                 "watch", "preview", "|",
                 "help"
             ]