diff --git a/platform/forms/bundle.json b/platform/forms/bundle.json
index 9b73d846a6..2e797fb7a0 100644
--- a/platform/forms/bundle.json
+++ b/platform/forms/bundle.json
@@ -34,6 +34,10 @@
                 "key": "textfield",
                 "templateUrl": "templates/controls/textfield.html"
             },
+            {
+                "key": "button",
+                "templateUrl": "templates/controls/button.html"
+            },
             {
                 "key": "composite",
                 "templateUrl": "templates/controls/composite.html"
diff --git a/platform/forms/res/templates/controls/button.html b/platform/forms/res/templates/controls/button.html
new file mode 100644
index 0000000000..730a67dd8b
--- /dev/null
+++ b/platform/forms/res/templates/controls/button.html
@@ -0,0 +1,11 @@
+<a href=""
+   class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+   ng-class="{ labeled: structure.text }"
+   ng-click="structure.click()">
+    <span class="ui-symbol icon">
+        {{structure.glyph}}
+    </span>
+    <span class="title-label" ng-if="structure.text">
+        {{structure.text}}
+    </span>
+</a>
diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html
index 2c7558eac2..49ac754421 100644
--- a/platform/forms/res/templates/toolbar.html
+++ b/platform/forms/res/templates/toolbar.html
@@ -3,12 +3,12 @@
 <div class="form">
     <span ng-repeat="section in structure.sections"
           class="control-group coordinates"
-          title="section.description">
+          title="{{section.description}}">
 
         <ng-form ng-repeat="item in section.items"
                  ng-class="{ 'input-labeled': item.name }"
                  class="inline"
-                 title="item.description"
+                 title="{{item.description}}"
                  name="mctFormInner">
 
             <label ng-if="item.name">