diff --git a/platform/commonUI/general/res/templates/controls/action-button.html b/platform/commonUI/general/res/templates/controls/action-button.html
index beeb0627c8..169e015470 100644
--- a/platform/commonUI/general/res/templates/controls/action-button.html
+++ b/platform/commonUI/general/res/templates/controls/action-button.html
@@ -1,5 +1,4 @@
-<a href=""
-   class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+<a class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
    ng-class="{ labeled: parameters.labeled }"
    title="{{parameters.action.getMetadata().description}}"
    ng-click="parameters.action.perform()">
diff --git a/platform/forms/res/templates/controls/button.html b/platform/forms/res/templates/controls/button.html
index 730a67dd8b..c826738641 100644
--- a/platform/forms/res/templates/controls/button.html
+++ b/platform/forms/res/templates/controls/button.html
@@ -1,5 +1,4 @@
-<a href=""
-   class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+<a class="t-btn l-btn s-btn s-icon-btn s-very-subtle xxx"
    ng-class="{ labeled: structure.text }"
    ng-click="structure.click()">
     <span class="ui-symbol icon">
diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html
index 31f9f3bec2..aa2fd540bc 100644
--- a/platform/forms/res/templates/controls/color.html
+++ b/platform/forms/res/templates/controls/color.html
@@ -1,4 +1,4 @@
-<div class="s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
+<div class="t-btn l-btn s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
      ng-controller="ClickAwayController as toggle">
 
     <span ng-click="toggle.toggle()">
diff --git a/platform/forms/res/templates/controls/menu-button.html b/platform/forms/res/templates/controls/menu-button.html
index cb6b7e565b..aed7980cf6 100644
--- a/platform/forms/res/templates/controls/menu-button.html
+++ b/platform/forms/res/templates/controls/menu-button.html
@@ -1,4 +1,4 @@
-<div class="s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
+<div class="t-btn l-btn s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
      ng-controller="ClickAwayController as toggle">
 
     <span ng-click="toggle.toggle()">
diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html
index aa61bc3911..86b8abd45f 100644
--- a/platform/forms/res/templates/toolbar.html
+++ b/platform/forms/res/templates/toolbar.html
@@ -1,34 +1,29 @@
-<form name="tool-bar btn-bar contents" novalidate>
-
-<div class="form">
-    <span ng-repeat="section in structure.sections"
-          class="control-group coordinates"
-          ng-if="!section.hidden"
-          title="{{section.description}}">
-
-        <ng-form ng-repeat="item in section.items"
-                 ng-class="{ 'input-labeled': item.name }"
-                 ng-hide="item.hidden"
-                 class="inline"
-                 title="{{item.description}}"
-                 name="mctFormInner">
-
-            <label ng-if="item.name">
-                {{item.name}}:
-            </label>
-            <mct-control key="item.control"
-                         ng-class="{ disabled: item.disabled }"
-                         ng-model="ngModel"
-                         ng-required="item.required"
-                         ng-pattern="getRegExp(item.pattern)"
-                         options="item.options"
-                         structure="item"
-                         field="item.key">
-            </mct-control>
-
-        </ng-form>
-
-    </span>
-</div>
+<form novalidate>
+	<div class="tool-bar btn-bar contents abs">
+	    <span ng-repeat="section in structure.sections"
+	          class="control-group"
+	          ng-if="!section.hidden"
+	          title="{{section.description}}">
+	        <ng-form ng-repeat="item in section.items"
+	                 ng-class="{ 'input-labeled': item.name }"
+	                 ng-hide="item.hidden"
+	                 class="inline"
+	                 title="{{item.description}}"
+	                 name="mctFormInner">
 
+	            <label ng-if="item.name">
+	                {{item.name}}:
+	            </label>
+	            <mct-control key="item.control"
+	                         ng-class="{ disabled: item.disabled }"
+	                         ng-model="ngModel"
+	                         ng-required="item.required"
+	                         ng-pattern="getRegExp(item.pattern)"
+	                         options="item.options"
+	                         structure="item"
+	                         field="item.key">
+	            </mct-control>
+	        </ng-form>
+	    </span>
+	</div>
 </form>
\ No newline at end of file