diff --git a/www/code/app-code.less b/www/code/app-code.less
index 8772a2653..d625da0da 100644
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -3,10 +3,12 @@
 @import (once) "../../customize/src/less2/include/markdown.less";
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/tokenfield.less';
 
 .toolbar_main();
 .fileupload_main();
 .alertify_main();
+.tokenfield_main();
 
 // body
 &.cp-app-code {
diff --git a/www/code/inner.js b/www/code/inner.js
index 8a7dde080..c4917e6fc 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -374,6 +374,9 @@ define([
                     };
                     common.openFilePicker(pickerCfg);
                 }).appendTo($rightside);
+
+                var $tags = common.createButton('hashtag', true);
+                $rightside.append($tags);
             }
         };
 
diff --git a/www/slide/app-slide.less b/www/slide/app-slide.less
index 0d54fa710..f6ebf8cf0 100644
--- a/www/slide/app-slide.less
+++ b/www/slide/app-slide.less
@@ -4,11 +4,13 @@
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) "../../customize/src/less2/include/mediatag.less";
+@import (once) '../../customize/src/less2/include/tokenfield.less';
 
 .mediatag_base();
 .toolbar_main();
 .fileupload_main();
 .alertify_main();
+.tokenfield_main();
 
 // body
 font-size: unset;
diff --git a/www/slide/inner.js b/www/slide/inner.js
index 91830b749..0efe35d1c 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -516,6 +516,9 @@ define([
                     };
                     common.openFilePicker(pickerCfg);
                 }).appendTo($rightside);
+
+                var $tags = common.createButton('hashtag', true);
+                $rightside.append($tags);
             }
 
             metadataMgr.onChange(function () {