diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl
index cf1ee86..6ee3008 100755
--- a/admin/panels/entry/admin.entry.write.tpl
+++ b/admin/panels/entry/admin.entry.write.tpl
@@ -52,6 +52,7 @@
 						<script src="{$smarty.const.BLOG_BASEURL}/fp-interface/lang/{$lang_locale}/sceditor.js"></script>
 						<script src="{$smarty.const.BLOG_BASEURL}/admin/res/sceditor/plugins/flatPressFileManager.js"></script>
 						<script src="{$smarty.const.BLOG_BASEURL}/admin/res/sceditor/plugins/flatPressCustomBBCodes.js"></script>
+						<script src="{$smarty.const.BLOG_BASEURL}/admin/res/sceditor/plugins/flatPressEmojis.js"></script>
 						<script>
 						// Replace the textarea #example with SCEditor
 						var lang_editor = "{$lang_locale}";
@@ -60,7 +61,7 @@
 						var textarea = document.getElementById('content_textarea');
 						sceditor.create(textarea, {
 							plugins: 'flatPressFileManager',
-							toolbar: 'bold,italic,underline,strike,subscript,superscript|left,center,right,justify|font,size,color,removeformat|cut,copy,pastetext|bulletlist,orderedlist,indent,outdent|table|code,quote|horizontalrule,flatPressFileManager,email,link,unlink|emoticon,youtube,date,time|ltr,rtl|print,maximize,source',
+							toolbar: 'bold,italic,underline,strike,subscript,superscript|left,center,right,justify|font,size,color,removeformat|cut,copy,pastetext|bulletlist,orderedlist,indent,outdent|table|code,quote|horizontalrule,flatPressFileManager,email,link,unlink|emojis,youtube,date,time|ltr,rtl|print,maximize,source',
 							emoticonsRoot: eRoot,
 							format: 'bbcode',
 							height: "400px",
diff --git a/admin/panels/static/admin.static.write.tpl b/admin/panels/static/admin.static.write.tpl
index da9d24c..0087b0e 100755
--- a/admin/panels/static/admin.static.write.tpl
+++ b/admin/panels/static/admin.static.write.tpl
@@ -44,6 +44,7 @@
 						<script src="{$smarty.const.BLOG_BASEURL}/fp-interface/lang/{$lang_locale}/sceditor.js"></script>
 						<script src="{$smarty.const.BLOG_BASEURL}/admin/res/sceditor/plugins/flatPressFileManager.js"></script>
 						<script src="{$smarty.const.BLOG_BASEURL}/admin/res/sceditor/plugins/flatPressCustomBBCodes.js"></script>
+						<script src="{$smarty.const.BLOG_BASEURL}/admin/res/sceditor/plugins/flatPressEmojis.js"></script>
 						<script>
 						// Replace the textarea #example with SCEditor
 						var lang_editor = "{$lang_locale}";
@@ -53,7 +54,7 @@
 						var textarea = document.getElementById('content_textarea');
 						sceditor.create(textarea, {
 							plugins: 'flatPressFileManager',
-							toolbar: 'bold,italic,underline,strike,subscript,superscript|left,center,right,justify|font,size,color,removeformat|cut,copy,pastetext|bulletlist,orderedlist,indent,outdent|table|code,quote|horizontalrule,flatPressFileManager,email,link,unlink|emoticon,youtube,date,time|ltr,rtl|print,maximize,source',
+							toolbar: 'bold,italic,underline,strike,subscript,superscript|left,center,right,justify|font,size,color,removeformat|cut,copy,pastetext|bulletlist,orderedlist,indent,outdent|table|code,quote|horizontalrule,flatPressFileManager,email,link,unlink|emojis,youtube,date,time|ltr,rtl|print,maximize,source',
 							emoticonsRoot: eRoot,
 							format: 'bbcode',
 							height: "400px",
diff --git a/admin/res/admin.css b/admin/res/admin.css
index 3fa7ac8..5395f14 100755
--- a/admin/res/admin.css
+++ b/admin/res/admin.css
@@ -716,6 +716,20 @@ img {
   color: #111 !important;
 }
 
+#sceditor-Emojis {
+  text-align: center;
+}
+
+#sceditor-Emojis a {
+  margin: 0.2rem;
+  cursor: pointer;
+  display: inline-block;
+}
+
+.sceditor-button-emojis div {
+  background-position: 0px -480px !important;
+}
+
 /* Modal to upload files */
 
 #flatpress-files-modal .modal-header {
diff --git a/admin/res/sceditor/emoticons/alien.png b/admin/res/sceditor/emoticons/alien.png
deleted file mode 100644
index 58a0767..0000000
Binary files a/admin/res/sceditor/emoticons/alien.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/angel.png b/admin/res/sceditor/emoticons/angel.png
deleted file mode 100644
index 4792225..0000000
Binary files a/admin/res/sceditor/emoticons/angel.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/angry.png b/admin/res/sceditor/emoticons/angry.png
deleted file mode 100644
index 7bec8e4..0000000
Binary files a/admin/res/sceditor/emoticons/angry.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/blink.png b/admin/res/sceditor/emoticons/blink.png
deleted file mode 100644
index ff529f1..0000000
Binary files a/admin/res/sceditor/emoticons/blink.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/blush.png b/admin/res/sceditor/emoticons/blush.png
deleted file mode 100644
index 8ff7d1d..0000000
Binary files a/admin/res/sceditor/emoticons/blush.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/cheerful.png b/admin/res/sceditor/emoticons/cheerful.png
deleted file mode 100644
index c7c5cb8..0000000
Binary files a/admin/res/sceditor/emoticons/cheerful.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/cool.png b/admin/res/sceditor/emoticons/cool.png
deleted file mode 100644
index d21c544..0000000
Binary files a/admin/res/sceditor/emoticons/cool.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/credits.txt b/admin/res/sceditor/emoticons/credits.txt
deleted file mode 100644
index 96b3e7a..0000000
--- a/admin/res/sceditor/emoticons/credits.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Presenting, Nomicons: The Full Monty :o
-
-Credits:
-Oscar Gruno, aka Nominell v. 2.0 -> oscargruno@mac.com
-Andy Fedosjeenko, aka Nightwolf -> bobo@animevanguard.com
-
-Copyright (C) 2001-Infinity, Oscar Gruno & Andy Fedosjeenko
-
-You can redistribute these files as much as you like, as long as you keep this file with them and give us the proper credit. You may even rape them if you please, just give us credit for our work.
\ No newline at end of file
diff --git a/admin/res/sceditor/emoticons/cwy.png b/admin/res/sceditor/emoticons/cwy.png
deleted file mode 100644
index 58ee08f..0000000
Binary files a/admin/res/sceditor/emoticons/cwy.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/devil.png b/admin/res/sceditor/emoticons/devil.png
deleted file mode 100644
index 7d8226a..0000000
Binary files a/admin/res/sceditor/emoticons/devil.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/dizzy.png b/admin/res/sceditor/emoticons/dizzy.png
deleted file mode 100644
index 8218464..0000000
Binary files a/admin/res/sceditor/emoticons/dizzy.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/ermm.png b/admin/res/sceditor/emoticons/ermm.png
deleted file mode 100644
index 122c10f..0000000
Binary files a/admin/res/sceditor/emoticons/ermm.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/face.png b/admin/res/sceditor/emoticons/face.png
deleted file mode 100644
index 04ad4b7..0000000
Binary files a/admin/res/sceditor/emoticons/face.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/getlost.png b/admin/res/sceditor/emoticons/getlost.png
deleted file mode 100644
index ac87dce..0000000
Binary files a/admin/res/sceditor/emoticons/getlost.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/grin.png b/admin/res/sceditor/emoticons/grin.png
deleted file mode 100644
index 69cf5a3..0000000
Binary files a/admin/res/sceditor/emoticons/grin.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/happy.png b/admin/res/sceditor/emoticons/happy.png
deleted file mode 100644
index 54b9131..0000000
Binary files a/admin/res/sceditor/emoticons/happy.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/heart.png b/admin/res/sceditor/emoticons/heart.png
deleted file mode 100644
index 451058d..0000000
Binary files a/admin/res/sceditor/emoticons/heart.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/kissing.png b/admin/res/sceditor/emoticons/kissing.png
deleted file mode 100644
index 28d7752..0000000
Binary files a/admin/res/sceditor/emoticons/kissing.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/laughing.png b/admin/res/sceditor/emoticons/laughing.png
deleted file mode 100644
index d65f35e..0000000
Binary files a/admin/res/sceditor/emoticons/laughing.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/ninja.png b/admin/res/sceditor/emoticons/ninja.png
deleted file mode 100644
index 952f811..0000000
Binary files a/admin/res/sceditor/emoticons/ninja.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/pinch.png b/admin/res/sceditor/emoticons/pinch.png
deleted file mode 100644
index f6f6e53..0000000
Binary files a/admin/res/sceditor/emoticons/pinch.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/pouty.png b/admin/res/sceditor/emoticons/pouty.png
deleted file mode 100644
index f3cef70..0000000
Binary files a/admin/res/sceditor/emoticons/pouty.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/sad.png b/admin/res/sceditor/emoticons/sad.png
deleted file mode 100644
index d08666e..0000000
Binary files a/admin/res/sceditor/emoticons/sad.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/shocked.png b/admin/res/sceditor/emoticons/shocked.png
deleted file mode 100644
index f3dfb11..0000000
Binary files a/admin/res/sceditor/emoticons/shocked.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/sick.png b/admin/res/sceditor/emoticons/sick.png
deleted file mode 100644
index 3a47381..0000000
Binary files a/admin/res/sceditor/emoticons/sick.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/sideways.png b/admin/res/sceditor/emoticons/sideways.png
deleted file mode 100644
index b3dd09a..0000000
Binary files a/admin/res/sceditor/emoticons/sideways.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/silly.png b/admin/res/sceditor/emoticons/silly.png
deleted file mode 100644
index d4497d9..0000000
Binary files a/admin/res/sceditor/emoticons/silly.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/sleeping.png b/admin/res/sceditor/emoticons/sleeping.png
deleted file mode 100644
index 2b97a80..0000000
Binary files a/admin/res/sceditor/emoticons/sleeping.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/smile.png b/admin/res/sceditor/emoticons/smile.png
deleted file mode 100644
index c11821e..0000000
Binary files a/admin/res/sceditor/emoticons/smile.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/tongue.png b/admin/res/sceditor/emoticons/tongue.png
deleted file mode 100644
index 73da3e3..0000000
Binary files a/admin/res/sceditor/emoticons/tongue.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/unsure.png b/admin/res/sceditor/emoticons/unsure.png
deleted file mode 100644
index 87c7599..0000000
Binary files a/admin/res/sceditor/emoticons/unsure.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/w00t.png b/admin/res/sceditor/emoticons/w00t.png
deleted file mode 100644
index fa08831..0000000
Binary files a/admin/res/sceditor/emoticons/w00t.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/wassat.png b/admin/res/sceditor/emoticons/wassat.png
deleted file mode 100644
index 201733b..0000000
Binary files a/admin/res/sceditor/emoticons/wassat.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/whistling.png b/admin/res/sceditor/emoticons/whistling.png
deleted file mode 100644
index 3940f0d..0000000
Binary files a/admin/res/sceditor/emoticons/whistling.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/wink.png b/admin/res/sceditor/emoticons/wink.png
deleted file mode 100644
index 3d1a9cc..0000000
Binary files a/admin/res/sceditor/emoticons/wink.png and /dev/null differ
diff --git a/admin/res/sceditor/emoticons/wub.png b/admin/res/sceditor/emoticons/wub.png
deleted file mode 100644
index d5faa2b..0000000
Binary files a/admin/res/sceditor/emoticons/wub.png and /dev/null differ
diff --git a/admin/res/sceditor/plugins/flatPressCustomBBCodes.js b/admin/res/sceditor/plugins/flatPressCustomBBCodes.js
index 5e86ca0..95f1bde 100644
--- a/admin/res/sceditor/plugins/flatPressCustomBBCodes.js
+++ b/admin/res/sceditor/plugins/flatPressCustomBBCodes.js
@@ -67,4 +67,17 @@ sceditor.formats.bbcode.set('img', {
             return '<img' + attribs + ' src="' + sceditor.escapeUriScheme(content) + '" />';
         }
     }
-});
\ No newline at end of file
+});
+
+// Header tag (From h1 to h6)
+
+for(let i = 1; i < 7; ++i) { // Headers: h1 to h6
+    sceditor.formats.bbcode.set('h' + i, {
+        tags: {
+            ['h' + i] : null,
+        },
+        isInline: false,
+        format: '[h'+ i +']{0}[/h' + i + ']',
+        html: '<h' + i + '>{0}</h' + i + '>',
+    });
+}
\ No newline at end of file
diff --git a/admin/res/sceditor/plugins/flatpressEmojis.js b/admin/res/sceditor/plugins/flatpressEmojis.js
new file mode 100644
index 0000000..e0ab91e
--- /dev/null
+++ b/admin/res/sceditor/plugins/flatpressEmojis.js
@@ -0,0 +1,41 @@
+
+
+const EMOJIS = [
+    '😀', '😃', '😄', '😁', '😆', '😅', '😂', '🤣', '😊', '😇', 
+    '🙂', '🙃', '😉', '😌', '😍', '🥰', '😘', '😗', '😙', '😚', 
+    '😋', '😛', '😝', '😜', '🤪', '🤨', '🧐', '🤓', '😎', '🤩', 
+    '🥳', '😏', '😒', '😞', '😔', '😟', '😕', '🙁', '☹️', '😣',
+    '😖', '😫', '😩', '🥺', '😢', '😭', '😤', '😠', '😡', '🤬', 
+    '🤯', '😳', '🥵', '🥶', '😱', '😨', '😰', '😥', '😓', '🤗', 
+    '🤔', '🤭', '🤫', '🤥', '😶', '😐', '😑', '😬', '🙄', '😯', 
+    '😦', '😧', '😮', '😲', '🥱', '😴', '🤤', '😪', '😵', '🤐', 
+    '🥴', '🤢', '🤮', '🤧', '😷', '🤒', '🤕', '🤑', '🤠', '😈', 
+    '👿'
+];
+
+sceditor.command.set('emojis', {
+    exec: function(caller) {
+
+        const sceditorInsert = this.insert;
+
+        const createEmojiLink = function(emoji) {
+            let link = document.createElement('a');
+            const linkText = document.createTextNode(emoji);
+            link.appendChild(linkText);
+            link.onclick = () => { sceditorInsert(emoji) };
+            return link;
+        };
+
+        const emojisShowListContent = function() {
+            let content = document.createElement('div');
+            content.id = 'sceditor-Emojis';
+            EMOJIS.forEach(function(emoji) {
+                content.appendChild(createEmojiLink(emoji));
+            });
+            return content;
+        };
+
+        this.createDropDown(caller, 'emojis-list', emojisShowListContent());
+    },
+    tooltip: 'Insert a emoji emoticon'
+});
\ No newline at end of file