diff --git a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html
index c87f74735..f1113aadb 100644
--- a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html
+++ b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/azure/views/containerinstances/containerinstances.html b/app/azure/views/containerinstances/containerinstances.html
index 489d6b807..af3990f8e 100644
--- a/app/azure/views/containerinstances/containerinstances.html
+++ b/app/azure/views/containerinstances/containerinstances.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Container list">
+  <rd-header-title title-text="Container list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="azure.containerinstances" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <containergroups-datatable
-    title="Containers" title-icon="fa-server"
+    title-text="Containers" title-icon="fa-server"
     dataset="containerGroups" table-key="containergroups"
     order-by="Name" show-text-filter="true"
     remove-action="deleteAction"
diff --git a/app/azure/views/containerinstances/create/createcontainerinstance.html b/app/azure/views/containerinstances/create/createcontainerinstance.html
index 001461341..54346eef6 100644
--- a/app/azure/views/containerinstances/create/createcontainerinstance.html
+++ b/app/azure/views/containerinstances/create/createcontainerinstance.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create container instance"></rd-header-title>
+  <rd-header-title title-text="Create container instance"></rd-header-title>
   <rd-header-content>
     <a ui-sref="azure.containerinstances">Container instances</a> &gt; Add container
   </rd-header-content>
diff --git a/app/azure/views/dashboard/dashboard.html b/app/azure/views/dashboard/dashboard.html
index 5726304c1..eaa60a53e 100644
--- a/app/azure/views/dashboard/dashboard.html
+++ b/app/azure/views/dashboard/dashboard.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Home"></rd-header-title>
+  <rd-header-title title-text="Home"></rd-header-title>
   <rd-header-content>Dashboard</rd-header-content>
 </rd-header>
 
diff --git a/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html b/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html
index 7012bb15c..8d8cafc34 100644
--- a/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html
+++ b/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfo.html
@@ -1,5 +1,5 @@
 <rd-widget>
-  <rd-widget-header icon="fa-tachometer-alt" title="Cluster information"></rd-widget-header>
+  <rd-widget-header icon="fa-tachometer-alt" title-text="Cluster information"></rd-widget-header>
   <rd-widget-body classes="no-padding">
     <table class="table">
       <tbody>
diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.html b/app/docker/components/datatables/configs-datatable/configsDatatable.html
index f41830f44..76b5ec683 100644
--- a/app/docker/components/datatables/configs-datatable/configsDatatable.html
+++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.js b/app/docker/components/datatables/configs-datatable/configsDatatable.js
index 66f774419..5b31c965e 100644
--- a/app/docker/components/datatables/configs-datatable/configsDatatable.js
+++ b/app/docker/components/datatables/configs-datatable/configsDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('configsDatatable', {
   templateUrl: 'app/docker/components/datatables/configs-datatable/configsDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html
index 5eddcae40..0b4ba9454 100644
--- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html
+++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
       </div>
       <div class="actionBar">
diff --git a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js
index 2b294141b..d807b7019 100644
--- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js
+++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('containerNetworksDatatable', {
   templateUrl: 'app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html
index 004f9721f..3284f3e22 100644
--- a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html
+++ b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js
index 51afee8be..621ff7bf3 100644
--- a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js
+++ b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('containerProcessesDatatable', {
   templateUrl: 'app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '=',
     headerset: '<',
diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html
index 9ce58d5f7..e07e89dbd 100644
--- a/app/docker/components/datatables/containers-datatable/containersDatatable.html
+++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.js b/app/docker/components/datatables/containers-datatable/containersDatatable.js
index 4e806b415..8d04ef011 100644
--- a/app/docker/components/datatables/containers-datatable/containersDatatable.js
+++ b/app/docker/components/datatables/containers-datatable/containersDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('containersDatatable', {
   templateUrl: 'app/docker/components/datatables/containers-datatable/containersDatatable.html',
   controller: 'ContainersDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/events-datatable/eventsDatatable.html b/app/docker/components/datatables/events-datatable/eventsDatatable.html
index b9554be4c..90625950b 100644
--- a/app/docker/components/datatables/events-datatable/eventsDatatable.html
+++ b/app/docker/components/datatables/events-datatable/eventsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/events-datatable/eventsDatatable.js b/app/docker/components/datatables/events-datatable/eventsDatatable.js
index 9db4141fe..d81d10314 100644
--- a/app/docker/components/datatables/events-datatable/eventsDatatable.js
+++ b/app/docker/components/datatables/events-datatable/eventsDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('eventsDatatable', {
   templateUrl: 'app/docker/components/datatables/events-datatable/eventsDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.html b/app/docker/components/datatables/images-datatable/imagesDatatable.html
index bded973b1..6816f375b 100644
--- a/app/docker/components/datatables/images-datatable/imagesDatatable.html
+++ b/app/docker/components/datatables/images-datatable/imagesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.js b/app/docker/components/datatables/images-datatable/imagesDatatable.js
index d2e5305d4..e3d0477a5 100644
--- a/app/docker/components/datatables/images-datatable/imagesDatatable.js
+++ b/app/docker/components/datatables/images-datatable/imagesDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('imagesDatatable', {
   templateUrl: 'app/docker/components/datatables/images-datatable/imagesDatatable.html',
   controller: 'ImagesDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.html b/app/docker/components/datatables/networks-datatable/networksDatatable.html
index 6ccf496f6..eee23d6d4 100644
--- a/app/docker/components/datatables/networks-datatable/networksDatatable.html
+++ b/app/docker/components/datatables/networks-datatable/networksDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.js b/app/docker/components/datatables/networks-datatable/networksDatatable.js
index 1f7527890..5bd04f1aa 100644
--- a/app/docker/components/datatables/networks-datatable/networksDatatable.js
+++ b/app/docker/components/datatables/networks-datatable/networksDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('networksDatatable', {
   templateUrl: 'app/docker/components/datatables/networks-datatable/networksDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html
index 22d3d7cbf..f5d6aa285 100644
--- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html
+++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js
index 9a022baa5..6df455b9c 100644
--- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js
+++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('nodeTasksDatatable', {
   templateUrl: 'app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
index ab825e5fa..1dc48abd1 100644
--- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
+++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.js b/app/docker/components/datatables/nodes-datatable/nodesDatatable.js
index dbf8d2d87..d3e42449b 100644
--- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.js
+++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('nodesDatatable', {
   templateUrl: 'app/docker/components/datatables/nodes-datatable/nodesDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
index 300466505..6aecaf077 100644
--- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
+++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js
index 7c55738a9..e572901f4 100644
--- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js
+++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('secretsDatatable', {
   templateUrl: 'app/docker/components/datatables/secrets-datatable/secretsDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.html b/app/docker/components/datatables/services-datatable/servicesDatatable.html
index 12794918d..c0bc7720e 100644
--- a/app/docker/components/datatables/services-datatable/servicesDatatable.html
+++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.js b/app/docker/components/datatables/services-datatable/servicesDatatable.js
index e87726251..5280d5261 100644
--- a/app/docker/components/datatables/services-datatable/servicesDatatable.js
+++ b/app/docker/components/datatables/services-datatable/servicesDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('servicesDatatable', {
   templateUrl: 'app/docker/components/datatables/services-datatable/servicesDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
index abe642d60..287be66b3 100644
--- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
+++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.js b/app/docker/components/datatables/tasks-datatable/tasksDatatable.js
index 991c328ec..58e54f134 100644
--- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.js
+++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('tasksDatatable', {
   templateUrl: 'app/docker/components/datatables/tasks-datatable/tasksDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
index 3d896409c..1a271dfaa 100644
--- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
+++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatable.js b/app/docker/components/datatables/volumes-datatable/volumesDatatable.js
index 8d1707fe5..da8119da9 100644
--- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.js
+++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.docker').component('volumesDatatable', {
   templateUrl: 'app/docker/components/datatables/volumes-datatable/volumesDatatable.html',
   controller: 'VolumesDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/docker/components/log-viewer/logViewer.html b/app/docker/components/log-viewer/logViewer.html
index 6f6140d4f..8abda6ee5 100644
--- a/app/docker/components/log-viewer/logViewer.html
+++ b/app/docker/components/log-viewer/logViewer.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-file-alt" title="Log viewer settings"></rd-widget-header>
+      <rd-widget-header icon="fa-file-alt" title-text="Log viewer settings"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <div class="form-group">
diff --git a/app/docker/views/configs/configs.html b/app/docker/views/configs/configs.html
index c8bcedac4..45cc474c5 100644
--- a/app/docker/views/configs/configs.html
+++ b/app/docker/views/configs/configs.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Configs list">
+  <rd-header-title title-text="Configs list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.configs" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <configs-datatable
-    title="Configs" title-icon="fa-file-code"
+    title-text="Configs" title-icon="fa-file-code"
     dataset="configs" table-key="configs"
     order-by="Name" show-text-filter="true"
     show-ownership-column="applicationState.application.authentication"
diff --git a/app/docker/views/configs/create/createconfig.html b/app/docker/views/configs/create/createconfig.html
index d55343dcb..18cfc51ac 100644
--- a/app/docker/views/configs/create/createconfig.html
+++ b/app/docker/views/configs/create/createconfig.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create config"></rd-header-title>
+  <rd-header-title title-text="Create config"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.configs">Configs</a> &gt; Add config
   </rd-header-content>
diff --git a/app/docker/views/configs/edit/config.html b/app/docker/views/configs/edit/config.html
index c15bbdbbc..376bd2014 100644
--- a/app/docker/views/configs/edit/config.html
+++ b/app/docker/views/configs/edit/config.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Config details">
+  <rd-header-title title-text="Config details">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.configs.config({id: config.Id})" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -12,7 +12,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-file-code" title="Config details"></rd-widget-header>
+      <rd-widget-header icon="fa-file-code" title-text="Config details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -65,7 +65,7 @@
 <div class="row" ng-if="config">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-file-code" title="Config content"></rd-widget-header>
+      <rd-widget-header icon="fa-file-code" title-text="Config content"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <div class="form-group">
diff --git a/app/docker/views/containers/console/containerconsole.html b/app/docker/views/containers/console/containerconsole.html
index 9432c3a6f..f8b4e7e54 100644
--- a/app/docker/views/containers/console/containerconsole.html
+++ b/app/docker/views/containers/console/containerconsole.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Container console"></rd-header-title>
+  <rd-header-title title-text="Container console"></rd-header-title>
   <rd-header-content ng-if="state.loaded">
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Console
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row" ng-if="state.loaded">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-terminal" title="Console"></rd-widget-header>
+      <rd-widget-header icon="fa-terminal" title-text="Console"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <div ng-if="!state.connected">
diff --git a/app/docker/views/containers/containers.html b/app/docker/views/containers/containers.html
index f04727b6d..2e831c7ef 100644
--- a/app/docker/views/containers/containers.html
+++ b/app/docker/views/containers/containers.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Container list">
+  <rd-header-title title-text="Container list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.containers" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12" ng-if="containers">
     <containers-datatable
-      title="Containers" title-icon="fa-server"
+      title-text="Containers" title-icon="fa-server"
       dataset="containers" table-key="containers"
       order-by="Status" show-text-filter="true"
       show-ownership-column="applicationState.application.authentication"
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 9ef898d8a..a4c753088 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create container"></rd-header-title>
+  <rd-header-title title-text="Create container"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.containers">Containers</a> &gt; Add container
   </rd-header-content>
@@ -138,7 +138,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-cog" title="Advanced container settings"></rd-widget-header>
+      <rd-widget-header icon="fa-cog" title-text="Advanced container settings"></rd-widget-header>
       <rd-widget-body>
         <ul class="nav nav-pills nav-justified">
           <li class="active interactive"><a data-target="#command" data-toggle="tab">Command</a></li>
diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html
index a84a1ab8d..85e5c16bf 100644
--- a/app/docker/views/containers/edit/container.html
+++ b/app/docker/views/containers/edit/container.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Container details">
+  <rd-header-title title-text="Container details">
   </rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a>
@@ -9,7 +9,7 @@
   <div class="row">
     <div class="col-lg-12 col-md-12 col-xs-12">
       <rd-widget>
-        <rd-widget-header icon="fa-cogs" title="Actions"></rd-widget-header>
+        <rd-widget-header icon="fa-cogs" title-text="Actions"></rd-widget-header>
         <rd-widget-body classes="padding">
           <div class="btn-group" role="group" aria-label="...">
             <button class="btn btn-success btn-sm" ng-click="start()" ng-disabled="container.State.Running"><i class="fa fa-play space-right" aria-hidden="true"></i>Start</button>
@@ -35,7 +35,7 @@
   <div class="row">
     <div class="col-lg-12 col-md-12 col-xs-12">
       <rd-widget>
-        <rd-widget-header icon="fa-server" title="Container status"></rd-widget-header>
+        <rd-widget-header icon="fa-server" title-text="Container status"></rd-widget-header>
         <rd-widget-body classes="no-padding">
           <table class="table">
             <tbody>
@@ -110,7 +110,7 @@
   <div ng-if="container.State.Health" class="row">
     <div class="col-lg-12 col-md-12 col-xs-12">
       <rd-widget>
-        <rd-widget-header icon="fa-server" title="Container health"></rd-widget-header>
+        <rd-widget-header icon="fa-server" title-text="Container health"></rd-widget-header>
         <rd-widget-body classes="no-padding">
           <table class="table">
             <tbody>
@@ -139,7 +139,7 @@
   <div class="row">
     <div class="col-lg-12 col-md-12 col-xs-12">
       <rd-widget>
-        <rd-widget-header icon="fa-clone" title="Create image"></rd-widget-header>
+        <rd-widget-header icon="fa-clone" title-text="Create image"></rd-widget-header>
         <rd-widget-body>
           <form class="form-horizontal">
             <!-- tag-description -->
@@ -178,7 +178,7 @@
   <div class="row">
     <div class="col-lg-12 col-md-12 col-xs-12">
       <rd-widget>
-        <rd-widget-header icon="fa-server" title="Container details"></rd-widget-header>
+        <rd-widget-header icon="fa-server" title-text="Container details"></rd-widget-header>
         <rd-widget-body classes="no-padding">
           <table class="table">
             <tbody>
@@ -247,7 +247,7 @@
   <div class="row" ng-if="container.Mounts.length > 0">
     <div class="col-lg-12 col-md-12 col-xs-12">
       <rd-widget>
-        <rd-widget-header icon="fa-cubes" title="Volumes"></rd-widget-header>
+        <rd-widget-header icon="fa-cubes" title-text="Volumes"></rd-widget-header>
         <rd-widget-body classes="no-padding">
           <table class="table">
             <thead>
@@ -272,7 +272,7 @@
   <div class="row">
     <div class="col-sm-12">
       <container-networks-datatable
-      title="Connected networks" title-icon="fa-sitemap"
+      title-text="Connected networks" title-icon="fa-sitemap"
       dataset="container.NetworkSettings.Networks" table-key="container-networks"
       container="container"
       available-networks="availableNetworks"
diff --git a/app/docker/views/containers/inspect/containerinspect.html b/app/docker/views/containers/inspect/containerinspect.html
index 2289eeb4a..b381ed2bb 100644
--- a/app/docker/views/containers/inspect/containerinspect.html
+++ b/app/docker/views/containers/inspect/containerinspect.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Container inspect">
+  <rd-header-title title-text="Container inspect">
   </rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: containerInfo.Id})">{{ containerInfo.Name|trimcontainername }}</a> &gt; Inspect
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-icon-circle" title="Inspect">
+      <rd-widget-header icon="fa-icon-circle" title-text="Inspect">
         <span class="btn-group btn-group-sm">
           <label class="btn btn-primary" ng-model="state.DisplayTextView" uib-btn-radio="false"><i class="fa fa-code space-right" aria-hidden="true"></i>Tree</label>
           <label class="btn btn-primary" ng-model="state.DisplayTextView" uib-btn-radio="true"><i class="fa fa-file-alt space-right" aria-hidden="true"></i>Text</label>
diff --git a/app/docker/views/containers/logs/containerlogs.html b/app/docker/views/containers/logs/containerlogs.html
index a569f203a..804731ec5 100644
--- a/app/docker/views/containers/logs/containerlogs.html
+++ b/app/docker/views/containers/logs/containerlogs.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Container logs"></rd-header-title>
+  <rd-header-title title-text="Container logs"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Logs
   </rd-header-content>
diff --git a/app/docker/views/containers/stats/containerstats.html b/app/docker/views/containers/stats/containerstats.html
index f0a974956..99ccf06a4 100644
--- a/app/docker/views/containers/stats/containerstats.html
+++ b/app/docker/views/containers/stats/containerstats.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Container statistics"></rd-header-title>
+  <rd-header-title title-text="Container statistics"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.containers">Containers</a> &gt; <a ui-sref="docker.containers.container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Stats
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-md-12">
     <rd-widget>
-      <rd-widget-header icon="fa-info-circle" title="About statistics">
+      <rd-widget-header icon="fa-info-circle" title-text="About statistics">
       </rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
@@ -52,7 +52,7 @@
 <div class="row">
   <div ng-class="{true: 'col-md-6 col-sm-12', false: 'col-lg-4 col-md-6 col-sm-12'}[state.networkStatsUnavailable]">
     <rd-widget>
-      <rd-widget-header icon="fa-chart-area" title="Memory usage"></rd-widget-header>
+      <rd-widget-header icon="fa-chart-area" title-text="Memory usage"></rd-widget-header>
       <rd-widget-body>
         <div class="chart-container" style="position: relative;">
           <canvas id="memoryChart" width="770" height="300"></canvas>
@@ -62,7 +62,7 @@
   </div>
   <div ng-class="{true: 'col-md-6 col-sm-12', false: 'col-lg-4 col-md-6 col-sm-12'}[state.networkStatsUnavailable]">
     <rd-widget>
-      <rd-widget-header icon="fa-chart-area" title="CPU usage"></rd-widget-header>
+      <rd-widget-header icon="fa-chart-area" title-text="CPU usage"></rd-widget-header>
       <rd-widget-body>
         <div class="chart-container" style="position: relative;">
           <canvas id="cpuChart" width="770" height="300"></canvas>
@@ -72,7 +72,7 @@
   </div>
   <div class="col-lg-4 col-md-12 col-sm-12" ng-if="!state.networkStatsUnavailable">
     <rd-widget>
-      <rd-widget-header icon="fa-chart-area" title="Network usage"></rd-widget-header>
+      <rd-widget-header icon="fa-chart-area" title-text="Network usage"></rd-widget-header>
       <rd-widget-body>
         <div class="chart-container" style="position: relative;">
           <canvas id="networkChart" width="770" height="300"></canvas>
@@ -83,7 +83,7 @@
 
   <div class="col-sm-12" ng-if="applicationState.endpoint.mode.provider !== 'VMWARE_VIC'">
     <container-processes-datatable
-    title="Processes" title-icon="fa-tasks"
+    title-text="Processes" title-icon="fa-tasks"
     dataset="processInfo.Processes" headerset="processInfo.Titles"
     table-key="container-processes"
     show-text-filter="true"
diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html
index 93789d4b1..efc82348d 100644
--- a/app/docker/views/dashboard/dashboard.html
+++ b/app/docker/views/dashboard/dashboard.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Home"></rd-header-title>
+  <rd-header-title title-text="Home"></rd-header-title>
   <rd-header-content>Dashboard</rd-header-content>
 </rd-header>
 
@@ -38,7 +38,7 @@
 
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tachometer-alt" title="Node info"></rd-widget-header>
+      <rd-widget-header icon="fa-tachometer-alt" title-text="Node info"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/docker/views/engine/engine.html b/app/docker/views/engine/engine.html
index cecdf8f51..73b1248b2 100644
--- a/app/docker/views/engine/engine.html
+++ b/app/docker/views/engine/engine.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Engine overview">
+  <rd-header-title title-text="Engine overview">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.engine" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row" ng-if="info && version">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-code" title="Engine version"></rd-widget-header>
+      <rd-widget-header icon="fa-code" title-text="Engine version"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -52,7 +52,7 @@
 <div class="row" ng-if="info && version">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-th" title="Engine status"></rd-widget-header>
+      <rd-widget-header icon="fa-th" title-text="Engine status"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -94,7 +94,7 @@
 <div class="row" ng-if="info && info.Plugins">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-plug" title="Engine plugins"></rd-widget-header>
+      <rd-widget-header icon="fa-plug" title-text="Engine plugins"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/docker/views/events/events.html b/app/docker/views/events/events.html
index 96613262f..87ebb9af8 100644
--- a/app/docker/views/events/events.html
+++ b/app/docker/views/events/events.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Event list">
+  <rd-header-title title-text="Event list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.events" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <events-datatable
-    title="Events" title-icon="fa-history"
+    title-text="Events" title-icon="fa-history"
     dataset="events" table-key="events"
     order-by="Time" reverse-order="true"
     show-text-filter="true"
diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html
index 9a6e23b51..f5451cc28 100644
--- a/app/docker/views/images/build/buildimage.html
+++ b/app/docker/views/images/build/buildimage.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Build image"></rd-header-title>
+  <rd-header-title title-text="Build image"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.images">Images</a> &gt; Build image
   </rd-header-content>
diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html
index 1cc50a61b..352784788 100644
--- a/app/docker/views/images/edit/image.html
+++ b/app/docker/views/images/edit/image.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Image details"></rd-header-title>
+  <rd-header-title title-text="Image details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.images">Images</a> &gt; <a ui-sref="docker.images.image({id: image.Id})">{{ image.Id }}</a>
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row" ng-if="image.RepoTags.length > 0">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa fa-tags" title="Image tags"></rd-widget-header>
+      <rd-widget-header icon="fa fa-tags" title-text="Image tags"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <div class="form-group">
@@ -59,7 +59,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tag" title="Tag the image"></rd-widget-header>
+      <rd-widget-header icon="fa-tag" title-text="Tag the image"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <!-- image-and-registry -->
@@ -88,7 +88,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-clone" title="Image details"></rd-widget-header>
+      <rd-widget-header icon="fa-clone" title-text="Image details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -129,7 +129,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-clone" title="Dockerfile details"></rd-widget-header>
+      <rd-widget-header icon="fa-clone" title-text="Dockerfile details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -178,7 +178,7 @@
 <div class="row" ng-if="history.length > 0">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-clone" title="Image layers"></rd-widget-header>
+      <rd-widget-header icon="fa-clone" title-text="Image layers"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table id="image-layers" class="table">
           <thead>
diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html
index 1b6c807c3..9150a3a05 100644
--- a/app/docker/views/images/images.html
+++ b/app/docker/views/images/images.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Image list">
+  <rd-header-title title-text="Image list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.images" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-download" title="Pull image ">
+      <rd-widget-header icon="fa-download" title-text="Pull image ">
       </rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
@@ -53,7 +53,7 @@
 <div class="row">
   <div class="col-sm-12">
     <images-datatable
-    title="Images" title-icon="fa-clone"
+    title-text="Images" title-icon="fa-clone"
     dataset="images" table-key="images"
     order-by="RepoTags" show-text-filter="true"
     show-host-column="applicationState.endpoint.mode.agentProxy"
diff --git a/app/docker/views/networks/create/createnetwork.html b/app/docker/views/networks/create/createnetwork.html
index 1b331a5f0..08838fc3a 100644
--- a/app/docker/views/networks/create/createnetwork.html
+++ b/app/docker/views/networks/create/createnetwork.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create network"></rd-header-title>
+  <rd-header-title title-text="Create network"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.networks">Networks</a> &gt; Add network
   </rd-header-content>
diff --git a/app/docker/views/networks/edit/network.html b/app/docker/views/networks/edit/network.html
index b9e269187..08db62c3f 100644
--- a/app/docker/views/networks/edit/network.html
+++ b/app/docker/views/networks/edit/network.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Network details"></rd-header-title>
+  <rd-header-title title-text="Network details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.networks">Networks</a> &gt; <a ui-sref="docker.networks.network({id: network.Id})">{{ network.Name }}</a>
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-sitemap" title="Network details"></rd-widget-header>
+      <rd-widget-header icon="fa-sitemap" title-text="Network details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -58,7 +58,7 @@
 <div class="row" ng-if="!(network.Options | emptyobject)">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-cogs" title="Network options"></rd-widget-header>
+      <rd-widget-header icon="fa-cogs" title-text="Network options"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -77,7 +77,7 @@
 <div class="row" ng-if="containersInNetwork.length > 0">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-server" title="Containers in network"></rd-widget-header>
+      <rd-widget-header icon="fa-server" title-text="Containers in network"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <thead>
diff --git a/app/docker/views/networks/networks.html b/app/docker/views/networks/networks.html
index 1c224f0da..9137d518d 100644
--- a/app/docker/views/networks/networks.html
+++ b/app/docker/views/networks/networks.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Network list">
+  <rd-header-title title-text="Network list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.networks" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <networks-datatable
-    title="Networks" title-icon="fa-sitemap"
+    title-text="Networks" title-icon="fa-sitemap"
     dataset="networks" table-key="networks"
     order-by="Name" show-text-filter="true"
     remove-action="removeAction"
diff --git a/app/docker/views/nodes/edit/node.html b/app/docker/views/nodes/edit/node.html
index adb744070..6a62bbe4e 100644
--- a/app/docker/views/nodes/edit/node.html
+++ b/app/docker/views/nodes/edit/node.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Node details">
+  <rd-header-title title-text="Node details">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.nodes.node({id: node.Id})" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -16,7 +16,7 @@
     </div>
 
     <rd-widget ng-if="!loading">
-      <rd-widget-header icon="fa-object-group" title="Node does not exist"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Node does not exist"></rd-widget-header>
       <rd-widget-body>
         <p>It looks like the node you wish to inspect does not exist.</p>
       </rd-widget-body>
@@ -27,7 +27,7 @@
 <div class="row" ng-if="node">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Node specification"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Node specification"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -87,7 +87,7 @@
 <div class="row" ng-if="node && node.Role === 'manager'">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Manager status"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Manager status"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -116,7 +116,7 @@
 <div class="row" ng-if="node">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Node description"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Node description"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -146,7 +146,7 @@
 <div class="row" ng-if="node">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Engine labels"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Engine labels"></rd-widget-header>
       <rd-widget-body ng-if="!node.EngineLabels || node.EngineLabels.length === 0">
         <p>There are no engine labels for this node.</p>
       </rd-widget-body>
@@ -173,7 +173,7 @@
 <div class="row" ng-if="node">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tasks" title="Node labels">
+      <rd-widget-header icon="fa-tasks" title-text="Node labels">
         <div class="nopadding">
           <a class="btn btn-default btn-sm pull-right" ng-click="addLabel(node)">
             <i class="fa fa-plus-circle" aria-hidden="true"></i> label
@@ -234,7 +234,7 @@
 <div class="row" ng-if="node && tasks.length > 0">
   <div class="col-sm-12">
     <node-tasks-datatable
-    title="Tasks" title-icon="fa-tasks"
+    title-text="Tasks" title-icon="fa-tasks"
     dataset="tasks" table-key="node-tasks"
     order-by="Updated" reverse-order="true"
     show-text-filter="true"
diff --git a/app/docker/views/secrets/create/createsecret.html b/app/docker/views/secrets/create/createsecret.html
index 189ca2a80..167e373f7 100644
--- a/app/docker/views/secrets/create/createsecret.html
+++ b/app/docker/views/secrets/create/createsecret.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create secret"></rd-header-title>
+  <rd-header-title title-text="Create secret"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.secrets">Secrets</a> &gt; Add secret
   </rd-header-content>
diff --git a/app/docker/views/secrets/edit/secret.html b/app/docker/views/secrets/edit/secret.html
index 0489137e9..c8c5fa3de 100644
--- a/app/docker/views/secrets/edit/secret.html
+++ b/app/docker/views/secrets/edit/secret.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Secret details">
+  <rd-header-title title-text="Secret details">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.secrets.secret({id: secret.Id})" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -12,7 +12,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-user-secret" title="Secret details"></rd-widget-header>
+      <rd-widget-header icon="fa-user-secret" title-text="Secret details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/docker/views/secrets/secrets.html b/app/docker/views/secrets/secrets.html
index e8d5fc3e0..19f5bfb3c 100644
--- a/app/docker/views/secrets/secrets.html
+++ b/app/docker/views/secrets/secrets.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Secrets list">
+  <rd-header-title title-text="Secrets list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.secrets" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <secrets-datatable
-    title="Secrets" title-icon="fa-user-secret"
+    title-text="Secrets" title-icon="fa-user-secret"
     dataset="secrets" table-key="secrets"
     order-by="Name" show-text-filter="true"
     show-ownership-column="applicationState.application.authentication"
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index 6cebf0f3c..11128ea49 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create service"></rd-header-title>
+  <rd-header-title title-text="Create service"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.services">Services</a> &gt; Add service
   </rd-header-content>
diff --git a/app/docker/views/services/edit/includes/configs.html b/app/docker/views/services/edit/includes/configs.html
index 0a8c7cc0e..db36d0edb 100644
--- a/app/docker/views/services/edit/includes/configs.html
+++ b/app/docker/views/services/edit/includes/configs.html
@@ -1,6 +1,6 @@
 <form ng-if="applicationState.endpoint.apiVersion >= 1.30" id="service-configs" ng-submit="updateService(service)">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Configs">
+    <rd-widget-header icon="fa-tasks" title-text="Configs">
     </rd-widget-header>
     <rd-widget-body classes="no-padding">
       <div class="form-inline" style="padding: 10px;">
diff --git a/app/docker/views/services/edit/includes/constraints.html b/app/docker/views/services/edit/includes/constraints.html
index 3817f939d..496ea1492 100644
--- a/app/docker/views/services/edit/includes/constraints.html
+++ b/app/docker/views/services/edit/includes/constraints.html
@@ -1,6 +1,6 @@
 <div ng-if="service.ServiceConstraints" id="service-placement-constraints">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Placement constraints">
+    <rd-widget-header icon="fa-tasks" title-text="Placement constraints">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating || addPlacementConstraint(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> placement constraint
diff --git a/app/docker/views/services/edit/includes/container-specs.html b/app/docker/views/services/edit/includes/container-specs.html
index d8b9ad97f..4cc6b1b5f 100644
--- a/app/docker/views/services/edit/includes/container-specs.html
+++ b/app/docker/views/services/edit/includes/container-specs.html
@@ -1,6 +1,6 @@
 <div>
   <rd-widget>
-    <rd-widget-header icon="fa-list-alt" title="Container spec"></rd-widget-header>
+    <rd-widget-header icon="fa-list-alt" title-text="Container spec"></rd-widget-header>
     <rd-widget-body classes="no-padding">
       <table class="table">
         <tbody>
diff --git a/app/docker/views/services/edit/includes/containerlabels.html b/app/docker/views/services/edit/includes/containerlabels.html
index 78607b23d..5e8290a27 100644
--- a/app/docker/views/services/edit/includes/containerlabels.html
+++ b/app/docker/views/services/edit/includes/containerlabels.html
@@ -1,6 +1,6 @@
 <div id="service-container-labels">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Container labels">
+    <rd-widget-header icon="fa-tasks" title-text="Container labels">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating ||addContainerLabel(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> container label
diff --git a/app/docker/views/services/edit/includes/environmentvariables.html b/app/docker/views/services/edit/includes/environmentvariables.html
index 4b594a8fb..a1a5d415e 100644
--- a/app/docker/views/services/edit/includes/environmentvariables.html
+++ b/app/docker/views/services/edit/includes/environmentvariables.html
@@ -1,6 +1,6 @@
 <div ng-if="service.EnvironmentVariables" id="service-env-variables">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Environment variables">
+    <rd-widget-header icon="fa-tasks" title-text="Environment variables">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating ||addEnvironmentVariable(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> environment variable
diff --git a/app/docker/views/services/edit/includes/hosts.html b/app/docker/views/services/edit/includes/hosts.html
index 7d9ab78c7..a425f2282 100644
--- a/app/docker/views/services/edit/includes/hosts.html
+++ b/app/docker/views/services/edit/includes/hosts.html
@@ -1,6 +1,6 @@
 <div>
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Hosts file entries">
+    <rd-widget-header icon="fa-tasks" title-text="Hosts file entries">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating ||addHostsEntry(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> add host entry
diff --git a/app/docker/views/services/edit/includes/logging.html b/app/docker/views/services/edit/includes/logging.html
index 2172ac902..b7eb2b7e8 100644
--- a/app/docker/views/services/edit/includes/logging.html
+++ b/app/docker/views/services/edit/includes/logging.html
@@ -1,6 +1,6 @@
 <div id="service-logging-driver">
     <rd-widget>
-      <rd-widget-header icon="fa-tasks" title="Logging driver">        
+      <rd-widget-header icon="fa-tasks" title-text="Logging driver">        
       </rd-widget-header>      
       <rd-widget-body classes="no-padding">
         <div class="form-inline" style="padding: 10px;">
diff --git a/app/docker/views/services/edit/includes/mounts.html b/app/docker/views/services/edit/includes/mounts.html
index e8a7b181c..9a88e86e7 100644
--- a/app/docker/views/services/edit/includes/mounts.html
+++ b/app/docker/views/services/edit/includes/mounts.html
@@ -1,6 +1,6 @@
 <div ng-if="service.ServiceMounts" id="service-mounts">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Mounts">
+    <rd-widget-header icon="fa-tasks" title-text="Mounts">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating ||addMount(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> mount
diff --git a/app/docker/views/services/edit/includes/networks.html b/app/docker/views/services/edit/includes/networks.html
index d4d1daf62..6fab8b638 100644
--- a/app/docker/views/services/edit/includes/networks.html
+++ b/app/docker/views/services/edit/includes/networks.html
@@ -1,6 +1,6 @@
 <div id="service-network-specs">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Networks"></rd-widget-header>
+    <rd-widget-header icon="fa-tasks" title-text="Networks"></rd-widget-header>
     <rd-widget-body ng-if="!service.VirtualIPs || service.VirtualIPs.length === 0">
       <p>This service is not connected to any networks.</p>
     </rd-widget-body>
diff --git a/app/docker/views/services/edit/includes/placementPreferences.html b/app/docker/views/services/edit/includes/placementPreferences.html
index d92fae5d9..0890a0d78 100644
--- a/app/docker/views/services/edit/includes/placementPreferences.html
+++ b/app/docker/views/services/edit/includes/placementPreferences.html
@@ -1,6 +1,6 @@
 <div ng-if="service.ServicePreferences" id="service-placement-preferences">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Placement preferences">
+    <rd-widget-header icon="fa-tasks" title-text="Placement preferences">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating || addPlacementPreference(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> placement preference
diff --git a/app/docker/views/services/edit/includes/ports.html b/app/docker/views/services/edit/includes/ports.html
index 95e4b232d..9bf7f5784 100644
--- a/app/docker/views/services/edit/includes/ports.html
+++ b/app/docker/views/services/edit/includes/ports.html
@@ -1,6 +1,6 @@
 <div>
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Published ports">
+    <rd-widget-header icon="fa-tasks" title-text="Published ports">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating ||addPublishedPort(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> port mapping
diff --git a/app/docker/views/services/edit/includes/resources.html b/app/docker/views/services/edit/includes/resources.html
index 9d7f610f6..ff6bee475 100644
--- a/app/docker/views/services/edit/includes/resources.html
+++ b/app/docker/views/services/edit/includes/resources.html
@@ -1,6 +1,6 @@
 <div id="service-resources">
   <rd-widget>
-    <rd-widget-header icon="fa-list-alt" title="Resource limits and reservations">
+    <rd-widget-header icon="fa-list-alt" title-text="Resource limits and reservations">
     </rd-widget-header>
     <rd-widget-body classes="no-padding">
       <table class="table">
diff --git a/app/docker/views/services/edit/includes/restart.html b/app/docker/views/services/edit/includes/restart.html
index e42de0173..450791c7d 100644
--- a/app/docker/views/services/edit/includes/restart.html
+++ b/app/docker/views/services/edit/includes/restart.html
@@ -1,6 +1,6 @@
 <div id="service-restart-policy">
   <rd-widget>
-    <rd-widget-header icon="fa-list-alt" title="Restart policy">
+    <rd-widget-header icon="fa-list-alt" title-text="Restart policy">
     </rd-widget-header>
     <rd-widget-body classes="no-padding">
       <table class="table">
diff --git a/app/docker/views/services/edit/includes/secrets.html b/app/docker/views/services/edit/includes/secrets.html
index 57b21aa3c..04444aa6d 100644
--- a/app/docker/views/services/edit/includes/secrets.html
+++ b/app/docker/views/services/edit/includes/secrets.html
@@ -1,6 +1,6 @@
 <div ng-if="applicationState.endpoint.apiVersion >= 1.25" id="service-secrets">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Secrets">
+    <rd-widget-header icon="fa-tasks" title-text="Secrets">
     </rd-widget-header>
     <rd-widget-body classes="no-padding">
       <div class="form-inline" style="padding: 10px;">
diff --git a/app/docker/views/services/edit/includes/servicelabels.html b/app/docker/views/services/edit/includes/servicelabels.html
index 0857dbe30..b3d447142 100644
--- a/app/docker/views/services/edit/includes/servicelabels.html
+++ b/app/docker/views/services/edit/includes/servicelabels.html
@@ -1,6 +1,6 @@
 <div id="service-labels">
   <rd-widget>
-    <rd-widget-header icon="fa-tasks" title="Service labels">
+    <rd-widget-header icon="fa-tasks" title-text="Service labels">
       <div class="nopadding">
         <a class="btn btn-default btn-sm pull-right" ng-click="isUpdating || addLabel(service)" ng-disabled="isUpdating">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> label
diff --git a/app/docker/views/services/edit/includes/tasks.html b/app/docker/views/services/edit/includes/tasks.html
index 703317187..bda4694c3 100644
--- a/app/docker/views/services/edit/includes/tasks.html
+++ b/app/docker/views/services/edit/includes/tasks.html
@@ -1,6 +1,6 @@
 <div ng-if="tasks.length > 0 && nodes" id="service-tasks">
   <tasks-datatable
-    title="Tasks" title-icon="fa-tasks"
+    title-text="Tasks" title-icon="fa-tasks"
     dataset="tasks" table-key="service-tasks"
     order-by="Updated" reverse-order="true"
     nodes="nodes"
diff --git a/app/docker/views/services/edit/includes/updateconfig.html b/app/docker/views/services/edit/includes/updateconfig.html
index 3a1d7801b..315c7a5dd 100644
--- a/app/docker/views/services/edit/includes/updateconfig.html
+++ b/app/docker/views/services/edit/includes/updateconfig.html
@@ -1,6 +1,6 @@
 <div id="service-update-config">
   <rd-widget>
-    <rd-widget-header icon="fa-list-alt" title="Update configuration">
+    <rd-widget-header icon="fa-list-alt" title-text="Update configuration">
     </rd-widget-header>
     <rd-widget-body classes="no-padding">
       <table class="table">
diff --git a/app/docker/views/services/edit/service.html b/app/docker/views/services/edit/service.html
index 6669f53a4..e0b2b49de 100644
--- a/app/docker/views/services/edit/service.html
+++ b/app/docker/views/services/edit/service.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Service details">
+  <rd-header-title title-text="Service details">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.services.service({id: service.Id})" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -21,7 +21,7 @@
 <div class="row">
   <div class="col-lg-9 col-md-9 col-xs-9">
     <rd-widget>
-      <rd-widget-header icon="fa-list-alt" title="Service details"></rd-widget-header>
+      <rd-widget-header icon="fa-list-alt" title-text="Service details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -109,7 +109,7 @@
 
   <div class="col-lg-3 col-md-3 col-xs-3">
     <rd-widget>
-      <rd-widget-header icon="fa-bars" title="Quick navigation"></rd-widget-header>
+      <rd-widget-header icon="fa-bars" title-text="Quick navigation"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <ul class="nav nav-pills nav-stacked">
           <li><a href ng-click="goToItem('service-env-variables')">Environment variables</a></li>
diff --git a/app/docker/views/services/logs/servicelogs.html b/app/docker/views/services/logs/servicelogs.html
index 0f40106f0..511732046 100644
--- a/app/docker/views/services/logs/servicelogs.html
+++ b/app/docker/views/services/logs/servicelogs.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Service logs"></rd-header-title>
+  <rd-header-title title-text="Service logs"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.services">Services</a> > <a ui-sref="docker.services.service({id: service.Id})">{{ service.Name }}</a> &gt; Logs
   </rd-header-content>
diff --git a/app/docker/views/services/services.html b/app/docker/views/services/services.html
index fc1393331..801d59635 100644
--- a/app/docker/views/services/services.html
+++ b/app/docker/views/services/services.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Service list">
+  <rd-header-title title-text="Service list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.services" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <services-datatable
-    title="Services" title-icon="fa-list-alt"
+    title-text="Services" title-icon="fa-list-alt"
     dataset="services" table-key="services"
     order-by="Name" show-text-filter="true"
     show-ownership-column="applicationState.application.authentication"
diff --git a/app/docker/views/stacks/create/createstack.html b/app/docker/views/stacks/create/createstack.html
index 887dd2228..823b5291f 100644
--- a/app/docker/views/stacks/create/createstack.html
+++ b/app/docker/views/stacks/create/createstack.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create stack"></rd-header-title>
+  <rd-header-title title-text="Create stack"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.stacks">Stacks</a> > Add stack
   </rd-header-content>
diff --git a/app/docker/views/stacks/edit/stack.html b/app/docker/views/stacks/edit/stack.html
index 931ba087b..3c9ea5cb0 100644
--- a/app/docker/views/stacks/edit/stack.html
+++ b/app/docker/views/stacks/edit/stack.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Stack details">
+  <rd-header-title title-text="Stack details">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.stacks.stack({id: stack.Id})" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -21,7 +21,7 @@
 <div class="row">
   <div class="col-sm-12">
     <stack-services-datatable
-      title="Services" title-icon="fa-list-alt"
+      title-text="Services" title-icon="fa-list-alt"
       dataset="services" table-key="stack-services"
       order-by="Name"
       nodes="nodes"
@@ -35,7 +35,7 @@
 <div class="row">
   <div class="col-sm-12">
     <tasks-datatable
-      title="Tasks" title-icon="fa-tasks"
+      title-text="Tasks" title-icon="fa-tasks"
       dataset="tasks" table-key="stack-tasks"
       order-by="Updated" reverse-order="true"
       nodes="nodes"
@@ -50,7 +50,7 @@
 <div class="row" ng-if="stackFileContent">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-pencil-alt" title="Stack editor"></rd-widget-header>
+      <rd-widget-header icon="fa-pencil-alt" title-text="Stack editor"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <div class="form-group">
diff --git a/app/docker/views/stacks/stacks.html b/app/docker/views/stacks/stacks.html
index 8038bc3d8..556de366f 100644
--- a/app/docker/views/stacks/stacks.html
+++ b/app/docker/views/stacks/stacks.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Stacks list">
+  <rd-header-title title-text="Stacks list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.stacks" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row" ng-if="state.displayInformationPanel">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-info-circle" title="Information"></rd-widget-header>
+      <rd-widget-header icon="fa-info-circle" title-text="Information"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <div class="form-group">
@@ -40,7 +40,7 @@
 <div class="row">
   <div class="col-sm-12">
     <stacks-datatable
-    title="Stacks" title-icon="fa-th-list"
+    title-text="Stacks" title-icon="fa-th-list"
     dataset="stacks" table-key="stacks"
     order-by="Name" show-text-filter="true"
     remove-action="removeAction"
diff --git a/app/docker/views/swarm/swarm.html b/app/docker/views/swarm/swarm.html
index 4e77f6140..7dbe6ca99 100644
--- a/app/docker/views/swarm/swarm.html
+++ b/app/docker/views/swarm/swarm.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Cluster overview">
+  <rd-header-title title-text="Cluster overview">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.swarm" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Cluster status"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Cluster status"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -47,7 +47,7 @@
 <div class="row">
   <div class="col-sm-12">
     <nodes-datatable
-    title="Nodes" title-icon="fa-hdd"
+    title-text="Nodes" title-icon="fa-hdd"
     dataset="nodes" table-key="nodes"
     order-by="Hostname" show-text-filter="true"
     show-ip-address-column="applicationState.endpoint.apiVersion >= 1.25"
diff --git a/app/docker/views/swarm/visualizer/swarmvisualizer.html b/app/docker/views/swarm/visualizer/swarmvisualizer.html
index 7f06564c1..4f9e7f358 100644
--- a/app/docker/views/swarm/visualizer/swarmvisualizer.html
+++ b/app/docker/views/swarm/visualizer/swarmvisualizer.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Swarm visualizer">
+  <rd-header-title title-text="Swarm visualizer">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.swarm.visualizer" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -12,7 +12,7 @@
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Cluster information">
+      <rd-widget-header icon="fa-object-group" title-text="Cluster information">
         <div class="pull-right">
           <button type="button" class="btn btn-sm btn-primary" ng-click="changeShowInformationPanel(true)" ng-if="!state.ShowInformationPanel">Show</button>
           <button type="button" class="btn btn-sm btn-primary" ng-click="changeShowInformationPanel(false)" ng-if="state.ShowInformationPanel">Hide</button>
@@ -77,7 +77,7 @@
 <div class="row" ng-if="visualizerData">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Cluster visualizer"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Cluster visualizer"></rd-widget-header>
       <rd-widget-body>
         <div class="visualizer_container">
           <div class="node" ng-repeat="node in visualizerData.nodes track by $index">
diff --git a/app/docker/views/tasks/edit/task.html b/app/docker/views/tasks/edit/task.html
index e61bc62dd..7bef3c52f 100644
--- a/app/docker/views/tasks/edit/task.html
+++ b/app/docker/views/tasks/edit/task.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Task details"></rd-header-title>
+  <rd-header-title title-text="Task details"></rd-header-title>
   <rd-header-content ng-if="task && service">
     <a ui-sref="docker.services">Services</a> &gt; <a ui-sref="docker.services.service({id: service.Id })">{{ service.Name }}</a> &gt; {{ task.Id }}
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row" ng-if="task && service">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tasks" title="Task status"></rd-widget-header>
+      <rd-widget-header icon="fa-tasks" title-text="Task status"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/docker/views/tasks/logs/tasklogs.html b/app/docker/views/tasks/logs/tasklogs.html
index 6c5a15f41..abfaa6d45 100644
--- a/app/docker/views/tasks/logs/tasklogs.html
+++ b/app/docker/views/tasks/logs/tasklogs.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Task details"></rd-header-title>
+  <rd-header-title title-text="Task details"></rd-header-title>
   <rd-header-content ng-if="task && service">
     <a ui-sref="docker.services">Services</a> &gt; <a ui-sref="docker.services.service({id: service.Id })">{{ service.Name }}</a> &gt; <a ui-sref="docker.tasks.task({id: task.Id })">{{ task.Id }}</a> &gt; Logs
   </rd-header-content>
diff --git a/app/docker/views/templates/templates.html b/app/docker/views/templates/templates.html
index 5dcec4d26..3c029d719 100644
--- a/app/docker/views/templates/templates.html
+++ b/app/docker/views/templates/templates.html
@@ -1,5 +1,5 @@
 <rd-header id="view-top">
-  <rd-header-title title="Application templates list">
+  <rd-header-title title-text="Application templates list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.templates" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -11,7 +11,7 @@
   <!-- stack-form -->
   <div class="col-sm-12" ng-if="state.selectedTemplate && state.filters.Type === 'stack'">
     <rd-widget>
-      <rd-widget-custom-header icon="state.selectedTemplate.Logo" title="state.selectedTemplate.Title">
+      <rd-widget-custom-header icon="state.selectedTemplate.Logo" title-text="state.selectedTemplate.Title">
         <div class="pull-right">
           <button type="button" class="btn btn-sm btn-primary" ng-click="unselectTemplate()">Hide</button>
         </div>
@@ -81,7 +81,7 @@
   <!-- container-form -->
   <div class="col-sm-12" ng-if="state.selectedTemplate && state.filters.Type === 'container'">
     <rd-widget>
-      <rd-widget-custom-header icon="state.selectedTemplate.Logo" title="state.selectedTemplate.Image">
+      <rd-widget-custom-header icon="state.selectedTemplate.Logo" title-text="state.selectedTemplate.Image">
         <div class="pull-right">
           <button type="button" class="btn btn-sm btn-primary" ng-click="unselectTemplate()">Hide</button>
         </div>
@@ -350,7 +350,7 @@
 <div class="row">
   <div class="col-sm-12" style="height: 100%">
     <rd-template-widget>
-      <rd-widget-header icon="fa-rocket" title="Templates">
+      <rd-widget-header icon="fa-rocket" title-text="Templates">
         <div ng-if="availableCategories.length > 0" class="pull-right">
           Category
           <select ng-model="state.filters.Categories">
diff --git a/app/docker/views/volumes/create/createvolume.html b/app/docker/views/volumes/create/createvolume.html
index 27046bc97..7a4c0401d 100644
--- a/app/docker/views/volumes/create/createvolume.html
+++ b/app/docker/views/volumes/create/createvolume.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create volume"></rd-header-title>
+  <rd-header-title title-text="Create volume"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.volumes">Volumes</a> &gt; Add volume
   </rd-header-content>
diff --git a/app/docker/views/volumes/edit/volume.html b/app/docker/views/volumes/edit/volume.html
index 0392e8cb3..9d191de5b 100644
--- a/app/docker/views/volumes/edit/volume.html
+++ b/app/docker/views/volumes/edit/volume.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Volume details"></rd-header-title>
+  <rd-header-title title-text="Volume details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="docker.volumes">Volumes</a> &gt; <a ui-sref="docker.volumes.volume({id: volume.Id})">{{ volume.Id }}</a>
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row" ng-if="volume">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-cube" title="Volume details"></rd-widget-header>
+      <rd-widget-header icon="fa-cube" title-text="Volume details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -57,7 +57,7 @@
 <div class="row" ng-if="!(volume.Options | emptyobject)">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-cogs" title="Volume options"></rd-widget-header>
+      <rd-widget-header icon="fa-cogs" title-text="Volume options"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -74,7 +74,7 @@
 <div class="row" ng-if="containersUsingVolume.length > 0">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-server" title="Containers using volume"></rd-widget-header>
+      <rd-widget-header icon="fa-server" title-text="Containers using volume"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <thead>
diff --git a/app/docker/views/volumes/volumes.html b/app/docker/views/volumes/volumes.html
index b31614b21..309dd6686 100644
--- a/app/docker/views/volumes/volumes.html
+++ b/app/docker/views/volumes/volumes.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Volume list">
+  <rd-header-title title-text="Volume list">
     <a data-toggle="tooltip" title="Refresh" ui-sref="docker.volumes" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <volumes-datatable
-    title="Volumes" title-icon="fa-cubes"
+    title-text="Volumes" title-icon="fa-cubes"
     dataset="volumes" table-key="volumes"
     order-by="Id" show-text-filter="true"
     remove-action="removeAction"
diff --git a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html
index 6ce9e3f1f..7c0e27679 100644
--- a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html
+++ b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
index 973b517d7..ca9fd327b 100644
--- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
+++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html
index 642f69a03..24497f375 100644
--- a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html
+++ b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html
index 9f40e7035..86bfb95af 100644
--- a/app/extensions/storidge/views/cluster/cluster.html
+++ b/app/extensions/storidge/views/cluster/cluster.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Storidge cluster">
+  <rd-header-title title-text="Storidge cluster">
     <a data-toggle="tooltip" title="Refresh" ui-sref="storidge.cluster" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -12,7 +12,7 @@
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-bolt" title="Cluster details"></rd-widget-header>
+      <rd-widget-header icon="fa-bolt" title-text="Cluster details"></rd-widget-header>
       <rd-widget-body>
         <table class="table">
           <tbody>
@@ -55,7 +55,7 @@
 <div class="row">
   <div class="col-sm-12">
     <storidge-nodes-datatable
-    title="Storage nodes" title-icon="fa-object-group"
+    title-text="Storage nodes" title-icon="fa-object-group"
     dataset="clusterNodes" table-key="storidge_nodes"
     order-by="Name" show-text-filter="true"
     ></storidge-nodes-datatable>
@@ -65,7 +65,7 @@
 <!-- <div class="row" ng-if="clusterInfo">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Storage nodes">
+      <rd-widget-header icon="fa-object-group" title-text="Storage nodes">
         <div class="pull-right">
           Items per page:
           <select ng-model="state.pagination_count" ng-change="changePaginationCount()">
diff --git a/app/extensions/storidge/views/monitor/monitor.html b/app/extensions/storidge/views/monitor/monitor.html
index 2101294ce..dea587435 100644
--- a/app/extensions/storidge/views/monitor/monitor.html
+++ b/app/extensions/storidge/views/monitor/monitor.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Storidge monitor">
+  <rd-header-title title-text="Storidge monitor">
     <a data-toggle="tooltip" title="Refresh" ui-sref="storidge.monitor" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -12,7 +12,7 @@
 <div class="row">
   <div class="col-md-4 col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tachometer-alt" title="Cluster capacity"></rd-widget-header>
+      <rd-widget-header icon="fa-tachometer-alt" title-text="Cluster capacity"></rd-widget-header>
       <rd-widget-body>
         <div class="chart-container" style="position: relative;">
           <canvas id="capacityChart" width="770" height="400"></canvas>
@@ -45,7 +45,7 @@
   </div>
   <div class="col-md-4 col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-chart-area" title="IOPS usage"></rd-widget-header>
+      <rd-widget-header icon="fa-chart-area" title-text="IOPS usage"></rd-widget-header>
       <rd-widget-body>
         <div class="chart-container" style="position: relative;">
           <canvas id="iopsChart" width="770" height="400"></canvas>
@@ -78,7 +78,7 @@
   </div>
   <div class="col-md-4 col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-chart-area" title="Bandwith usage"></rd-widget-header>
+      <rd-widget-header icon="fa-chart-area" title-text="Bandwith usage"></rd-widget-header>
       <rd-widget-body>
         <div class="chart-container" style="position: relative;">
           <canvas id="bandwithChart" width="770" height="400"></canvas>
@@ -114,7 +114,7 @@
 <div class="row">
   <div class="col-sm-12">
     <storidge-cluster-events-datatable
-    title="Cluster events" title-icon="fa-history"
+    title-text="Cluster events" title-icon="fa-history"
     dataset="events" table-key="storidge_cluster_events"
     order-by="Time" show-text-filter="true" reverse-order="true"
     ></storidge-cluster-events-datatable>
@@ -124,7 +124,7 @@
 <!-- <div class="row">
   <div class="col-md-12">
     <rd-widget>
-      <rd-widget-header icon="fa-history" title="Cluster events">
+      <rd-widget-header icon="fa-history" title-text="Cluster events">
         <div class="pull-right">
           Items per page:
           <select ng-model="state.pagination_count" ng-change="changePaginationCount()">
diff --git a/app/extensions/storidge/views/profiles/create/createprofile.html b/app/extensions/storidge/views/profiles/create/createprofile.html
index 621a8332c..33c1f0bb5 100644
--- a/app/extensions/storidge/views/profiles/create/createprofile.html
+++ b/app/extensions/storidge/views/profiles/create/createprofile.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create profile"></rd-header-title>
+  <rd-header-title title-text="Create profile"></rd-header-title>
   <rd-header-content>
     <a ui-sref="storidge.cluster">Storidge</a> &gt; <a ui-sref="storidge.profiles">Profiles</a> &gt; Add profile
   </rd-header-content>
diff --git a/app/extensions/storidge/views/profiles/edit/profile.html b/app/extensions/storidge/views/profiles/edit/profile.html
index 8aca0bbb6..73d7d4a2f 100644
--- a/app/extensions/storidge/views/profiles/edit/profile.html
+++ b/app/extensions/storidge/views/profiles/edit/profile.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Profile details"></rd-header-title>
+  <rd-header-title title-text="Profile details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="storidge.cluster">Storidge</a> &gt; <a ui-sref="storidge.profiles">Profiles</a> &gt; {{ profile.Name }}
   </rd-header-content>
diff --git a/app/extensions/storidge/views/profiles/profiles.html b/app/extensions/storidge/views/profiles/profiles.html
index d6a5dcfce..cec3a8ddc 100644
--- a/app/extensions/storidge/views/profiles/profiles.html
+++ b/app/extensions/storidge/views/profiles/profiles.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Storidge profiles">
+  <rd-header-title title-text="Storidge profiles">
     <a data-toggle="tooltip" title="Refresh" ui-sref="storidge.profiles" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -12,7 +12,7 @@
 <div class="row">
   <div class="col-md-12">
     <rd-widget>
-      <rd-widget-header icon="fa-plus" title="Add a profile">
+      <rd-widget-header icon="fa-plus" title-text="Add a profile">
       </rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
@@ -49,7 +49,7 @@
 <div class="row">
   <div class="col-sm-12">
     <storidge-profiles-datatable
-    title="Profiles" title-icon="fa-sticky-note"
+    title-text="Profiles" title-icon="fa-sticky-note"
     dataset="profiles" table-key="storidge_profiles"
     order-by="Name" show-text-filter="true"
     remove-action="removeAction"
@@ -61,7 +61,7 @@
 <!-- <div class="row">
   <div class="col-md-12">
     <rd-widget>
-      <rd-widget-header icon="fa-sticky-note" title="Profiles">
+      <rd-widget-header icon="fa-sticky-note" title-text="Profiles">
         <div class="pull-right">
           Items per page:
           <select ng-model="state.pagination_count" ng-change="changePaginationCount()">
diff --git a/app/portainer/components/accessControlPanel/porAccessControlPanel.html b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
index 47585f55b..1f5752f0d 100644
--- a/app/portainer/components/accessControlPanel/porAccessControlPanel.html
+++ b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-sm-12" ng-if="$ctrl.state.displayAccessControlPanel">
     <rd-widget>
-      <rd-widget-header icon="fa-eye" title="Access control"></rd-widget-header>
+      <rd-widget-header icon="fa-eye" title-text="Access control"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/portainer/components/accessManagement/porAccessManagement.html b/app/portainer/components/accessManagement/porAccessManagement.html
index 903f73128..e51a8d4d6 100644
--- a/app/portainer/components/accessManagement/porAccessManagement.html
+++ b/app/portainer/components/accessManagement/porAccessManagement.html
@@ -1,5 +1,5 @@
 <rd-widget>
-  <rd-widget-header icon="fa-users" title="Access management"></rd-widget-header>
+  <rd-widget-header icon="fa-users" title-text="Access management"></rd-widget-header>
   <rd-widget-body>
     <form class="form-horizontal">
       <div class="small text-muted">
diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
index b18084d6e..d9bd809b8 100644
--- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
+++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js
index 22c280cee..55ef50a3f 100644
--- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js
+++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.app').component('endpointsDatatable', {
   templateUrl: 'app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html b/app/portainer/components/datatables/groups-datatable/groupsDatatable.html
index 29c46e32f..ea9812b01 100644
--- a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html
+++ b/app/portainer/components/datatables/groups-datatable/groupsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/portainer/components/datatables/groups-datatable/groupsDatatable.js b/app/portainer/components/datatables/groups-datatable/groupsDatatable.js
index 1ce8e9fba..58808ba04 100644
--- a/app/portainer/components/datatables/groups-datatable/groupsDatatable.js
+++ b/app/portainer/components/datatables/groups-datatable/groupsDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.app').component('groupsDatatable', {
   templateUrl: 'app/portainer/components/datatables/groups-datatable/groupsDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html
index d45e2bff3..5c3cae905 100644
--- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html
+++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.js b/app/portainer/components/datatables/registries-datatable/registriesDatatable.js
index de6c2c49e..1ddd0730f 100644
--- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.js
+++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.app').component('registriesDatatable', {
   templateUrl: 'app/portainer/components/datatables/registries-datatable/registriesDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.html b/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.html
index f17042fb3..b1ea5c372 100644
--- a/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.html
+++ b/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.js b/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.js
index db28a3b76..59c437d7f 100644
--- a/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.js
+++ b/app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.app').component('stackServicesDatatable', {
   templateUrl: 'app/portainer/components/datatables/stack-services-datatable/stackServicesDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
index f1c254a57..4d0039df2 100644
--- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
+++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js
index 202dd785c..121a1977c 100644
--- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js
+++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.app').component('stacksDatatable', {
   templateUrl: 'app/portainer/components/datatables/stacks-datatable/stacksDatatable.html',
   controller: 'StacksDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/portainer/components/datatables/teams-datatable/teamsDatatable.html b/app/portainer/components/datatables/teams-datatable/teamsDatatable.html
index c79412e3d..fe11302e3 100644
--- a/app/portainer/components/datatables/teams-datatable/teamsDatatable.html
+++ b/app/portainer/components/datatables/teams-datatable/teamsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/portainer/components/datatables/teams-datatable/teamsDatatable.js b/app/portainer/components/datatables/teams-datatable/teamsDatatable.js
index d031ed459..e08f52917 100644
--- a/app/portainer/components/datatables/teams-datatable/teamsDatatable.js
+++ b/app/portainer/components/datatables/teams-datatable/teamsDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.app').component('teamsDatatable', {
   templateUrl: 'app/portainer/components/datatables/teams-datatable/teamsDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.html b/app/portainer/components/datatables/users-datatable/usersDatatable.html
index 605d6380c..f4eb00bbc 100644
--- a/app/portainer/components/datatables/users-datatable/usersDatatable.html
+++ b/app/portainer/components/datatables/users-datatable/usersDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.js b/app/portainer/components/datatables/users-datatable/usersDatatable.js
index ac4650859..d4129c187 100644
--- a/app/portainer/components/datatables/users-datatable/usersDatatable.js
+++ b/app/portainer/components/datatables/users-datatable/usersDatatable.js
@@ -2,7 +2,7 @@ angular.module('portainer.app').component('usersDatatable', {
   templateUrl: 'app/portainer/components/datatables/users-datatable/usersDatatable.html',
   controller: 'GenericDatatableController',
   bindings: {
-    title: '@',
+    titleText: '@',
     titleIcon: '@',
     dataset: '<',
     tableKey: '@',
diff --git a/app/portainer/components/header-title.js b/app/portainer/components/header-title.js
index e2eaa1945..c79cd1f2d 100644
--- a/app/portainer/components/header-title.js
+++ b/app/portainer/components/header-title.js
@@ -3,13 +3,13 @@ angular.module('portainer.app')
   var directive = {
     requires: '^rdHeader',
     scope: {
-      title: '@'
+      titleText: '@'
     },
     link: function (scope, iElement, iAttrs) {
       scope.username = Authentication.getUserDetails().username;
     },
     transclude: true,
-    template: '<div class="page white-space-normal">{{title}}<span class="header_title_content" ng-transclude></span><span class="pull-right user-box" ng-if="username"><i class="fa fa-user-circle" aria-hidden="true"></i> {{username}}</span><a ui-sref="portainer.support" class="pull-right" style="font-size:14px;margin-right:15px;margin-top:2px;"><span class="fa fa-life-ring fa-fw red-icon"></span>  Portainer support</a></div>',
+    template: '<div class="page white-space-normal">{{titleText}}<span class="header_title_content" ng-transclude></span><span class="pull-right user-box" ng-if="username"><i class="fa fa-user-circle" aria-hidden="true"></i> {{username}}</span><a ui-sref="portainer.support" class="pull-right" style="font-size:14px;margin-right:15px;margin-top:2px;"><span class="fa fa-life-ring fa-fw red-icon"></span>  Portainer support</a></div>',
     restrict: 'E'
   };
   return directive;
diff --git a/app/portainer/components/widget-custom-header.js b/app/portainer/components/widget-custom-header.js
index ab4aa8827..8b309a26e 100644
--- a/app/portainer/components/widget-custom-header.js
+++ b/app/portainer/components/widget-custom-header.js
@@ -3,11 +3,11 @@ angular.module('portainer.app')
   var directive = {
     requires: '^rdWidget',
     scope: {
-      title: '=',
+      titleText: '=',
       icon: '='
     },
     transclude: true,
-    template: '<div class="widget-header"><div class="row"><span class="pull-left"><img class="custom-header-ico" ng-src="{{icon}}"></img> <span class="text-muted"> {{title}} </span> </span><span class="pull-right col-xs-6 col-sm-4" ng-transclude></span></div></div>',
+    template: '<div class="widget-header"><div class="row"><span class="pull-left"><img class="custom-header-ico" ng-src="{{icon}}"></img> <span class="text-muted"> {{titleText}} </span> </span><span class="pull-right col-xs-6 col-sm-4" ng-transclude></span></div></div>',
     restrict: 'E'
   };
   return directive;
diff --git a/app/portainer/components/widget-header.js b/app/portainer/components/widget-header.js
index 0755341dc..eea0ae760 100644
--- a/app/portainer/components/widget-header.js
+++ b/app/portainer/components/widget-header.js
@@ -3,12 +3,12 @@ angular.module('portainer.app')
   var directive = {
     requires: '^rdWidget',
     scope: {
-      title: '@',
+      titleText: '@',
       icon: '@',
       classes: '@?'
     },
     transclude: true,
-    template: '<div class="widget-header"><div class="row"><span ng-class="classes" class="pull-left"><i class="fa" ng-class="icon"></i> {{title}} </span><span ng-class="classes" class="pull-right" ng-transclude></span></div></div>',
+    template: '<div class="widget-header"><div class="row"><span ng-class="classes" class="pull-left"><i class="fa" ng-class="icon"></i> {{titleText}} </span><span ng-class="classes" class="pull-right" ng-transclude></span></div></div>',
     restrict: 'E'
   };
   return directive;
diff --git a/app/portainer/views/about/about.html b/app/portainer/views/about/about.html
index 96bca4322..d7b249c65 100644
--- a/app/portainer/views/about/about.html
+++ b/app/portainer/views/about/about.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="About">
+  <rd-header-title title-text="About">
   </rd-header-title>
   <rd-header-content>
     About Portainer
diff --git a/app/portainer/views/account/account.html b/app/portainer/views/account/account.html
index 745caa91b..588631954 100644
--- a/app/portainer/views/account/account.html
+++ b/app/portainer/views/account/account.html
@@ -1,12 +1,12 @@
 <rd-header>
-  <rd-header-title title="User settings"></rd-header-title>
+  <rd-header-title title-text="User settings"></rd-header-title>
   <rd-header-content>User settings</rd-header-content>
 </rd-header>
 
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-lock" title="Change user password"></rd-widget-header>
+      <rd-widget-header icon="fa-lock" title-text="Change user password"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal" style="margin-top: 15px;">
           <!-- current-password-input -->
diff --git a/app/portainer/views/endpoints/access/endpointAccess.html b/app/portainer/views/endpoints/access/endpointAccess.html
index eae43d390..ed60af804 100644
--- a/app/portainer/views/endpoints/access/endpointAccess.html
+++ b/app/portainer/views/endpoints/access/endpointAccess.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Endpoint access"></rd-header-title>
+  <rd-header-title title-text="Endpoint access"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.endpoints">Endpoints</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a> &gt; Access management
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row" ng-if="endpoint">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-plug" title="Endpoint"></rd-widget-header>
+      <rd-widget-header icon="fa-plug" title-text="Endpoint"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html
index 3afc1f55e..a4053d8f1 100644
--- a/app/portainer/views/endpoints/create/createendpoint.html
+++ b/app/portainer/views/endpoints/create/createendpoint.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create endpoint"></rd-header-title>
+  <rd-header-title title-text="Create endpoint"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.endpoints">Endpoints</a> &gt; Add endpoint
   </rd-header-content>
diff --git a/app/portainer/views/endpoints/edit/endpoint.html b/app/portainer/views/endpoints/edit/endpoint.html
index a8ef8c7a4..c225d34fa 100644
--- a/app/portainer/views/endpoints/edit/endpoint.html
+++ b/app/portainer/views/endpoints/edit/endpoint.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Endpoint details"></rd-header-title>
+  <rd-header-title title-text="Endpoint details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.endpoints">Endpoints</a> &gt; <a ui-sref="portainer.endpoints.endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a>
   </rd-header-content>
diff --git a/app/portainer/views/endpoints/endpoints.html b/app/portainer/views/endpoints/endpoints.html
index 75459a89a..cb37ae53e 100644
--- a/app/portainer/views/endpoints/endpoints.html
+++ b/app/portainer/views/endpoints/endpoints.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Endpoints">
+  <rd-header-title title-text="Endpoints">
     <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.endpoints" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row" ng-if="!applicationState.application.endpointManagement">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-exclamation-triangle" title="Endpoint management is not available">
+      <rd-widget-header icon="fa-exclamation-triangle" title-text="Endpoint management is not available">
       </rd-widget-header>
       <rd-widget-body>
         <span class="small text-muted">Portainer has been started using the <code>--external-endpoints</code> flag.
@@ -25,7 +25,7 @@
 <div class="row">
   <div class="col-sm-12">
     <endpoints-datatable
-    title="Endpoints" title-icon="fa-plug"
+    title-text="Endpoints" title-icon="fa-plug"
     dataset="endpoints" table-key="endpoints"
     order-by="Name" show-text-filter="true"
     endpoint-management="applicationState.application.endpointManagement"
diff --git a/app/portainer/views/groups/access/groupAccess.html b/app/portainer/views/groups/access/groupAccess.html
index 9a857acb2..092f647c4 100644
--- a/app/portainer/views/groups/access/groupAccess.html
+++ b/app/portainer/views/groups/access/groupAccess.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Endpoint group access"></rd-header-title>
+  <rd-header-title title-text="Endpoint group access"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.groups">Groups</a> &gt; <a ui-sref="portainer.groups.group({id: group.Id})">{{ group.Name }}</a> &gt; Access management
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row" ng-if="group">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-object-group" title="Group"></rd-widget-header>
+      <rd-widget-header icon="fa-object-group" title-text="Group"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/portainer/views/groups/create/creategroup.html b/app/portainer/views/groups/create/creategroup.html
index e4938e6ff..8d307d40a 100644
--- a/app/portainer/views/groups/create/creategroup.html
+++ b/app/portainer/views/groups/create/creategroup.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create endpoint group"></rd-header-title>
+  <rd-header-title title-text="Create endpoint group"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.groups">Endpoint groups</a> &gt; Add group
   </rd-header-content>
diff --git a/app/portainer/views/groups/edit/group.html b/app/portainer/views/groups/edit/group.html
index 4d5861d80..1ea4c7ab5 100644
--- a/app/portainer/views/groups/edit/group.html
+++ b/app/portainer/views/groups/edit/group.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Endpoint group details"></rd-header-title>
+  <rd-header-title title-text="Endpoint group details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.groups">Groups</a> &gt; <a ui-sref="portainer.groups.group({id: group.Id})">{{ group.Name }}</a>
   </rd-header-content>
diff --git a/app/portainer/views/groups/groups.html b/app/portainer/views/groups/groups.html
index 2e6f91c39..ccf33790b 100644
--- a/app/portainer/views/groups/groups.html
+++ b/app/portainer/views/groups/groups.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Endpoint groups">
+  <rd-header-title title-text="Endpoint groups">
     <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.groups" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-sm-12">
     <groups-datatable
-    title="Endpoint groups" title-icon="fa-object-group"
+    title-text="Endpoint groups" title-icon="fa-object-group"
     dataset="groups" table-key="groups"
     order-by="Name" show-text-filter="true"
     access-management="applicationState.application.authentication"
diff --git a/app/portainer/views/registries/access/registryAccess.html b/app/portainer/views/registries/access/registryAccess.html
index 18758a7ab..b5485f4cb 100644
--- a/app/portainer/views/registries/access/registryAccess.html
+++ b/app/portainer/views/registries/access/registryAccess.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Registry access"></rd-header-title>
+  <rd-header-title title-text="Registry access"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.registries">Registries</a> &gt; <a ui-sref="portainer.registries.registry({id: registry.Id})">{{ registry.Name }}</a> &gt; Access management
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row" ng-if="registry">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-plug" title="Registry"></rd-widget-header>
+      <rd-widget-header icon="fa-plug" title-text="Registry"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
diff --git a/app/portainer/views/registries/create/createregistry.html b/app/portainer/views/registries/create/createregistry.html
index 632a09d12..e4e1499b0 100644
--- a/app/portainer/views/registries/create/createregistry.html
+++ b/app/portainer/views/registries/create/createregistry.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Create registry"></rd-header-title>
+  <rd-header-title title-text="Create registry"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.registries">Registries</a> &gt; Add registry
   </rd-header-content>
diff --git a/app/portainer/views/registries/edit/registry.html b/app/portainer/views/registries/edit/registry.html
index 9e794548c..c4d8ba9df 100644
--- a/app/portainer/views/registries/edit/registry.html
+++ b/app/portainer/views/registries/edit/registry.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Registry details"></rd-header-title>
+  <rd-header-title title-text="Registry details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.registries">Registries</a> &gt; <a ui-sref="portainer.registries.registry({id: registry.Id})">{{ registry.Name }}</a>
   </rd-header-content>
diff --git a/app/portainer/views/registries/registries.html b/app/portainer/views/registries/registries.html
index 8c822d8ee..72a7561d3 100644
--- a/app/portainer/views/registries/registries.html
+++ b/app/portainer/views/registries/registries.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Registries">
+  <rd-header-title title-text="Registries">
     <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.registries" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row" ng-if="dockerhub">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-database" title="DockerHub">
+      <rd-widget-header icon="fa-database" title-text="DockerHub">
       </rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
@@ -71,7 +71,7 @@
 <div class="row">
   <div class="col-sm-12">
     <registries-datatable
-    title="Registries" title-icon="fa-database"
+    title-text="Registries" title-icon="fa-database"
     dataset="registries" table-key="registries"
     order-by="Name" show-text-filter="true"
     access-management="applicationState.application.authentication"
diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html
index ce5b6798d..9017b2470 100644
--- a/app/portainer/views/settings/authentication/settingsAuthentication.html
+++ b/app/portainer/views/settings/authentication/settingsAuthentication.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Authentication settings"></rd-header-title>
+  <rd-header-title title-text="Authentication settings"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.settings">Settings</a> &gt; Authentication
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-users" title="Authentication"></rd-widget-header>
+      <rd-widget-header icon="fa-users" title-text="Authentication"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <div class="col-sm-12 form-section-title">
diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html
index dc9671746..83195f3e7 100644
--- a/app/portainer/views/settings/settings.html
+++ b/app/portainer/views/settings/settings.html
@@ -1,12 +1,12 @@
 <rd-header>
-  <rd-header-title title="Settings"></rd-header-title>
+  <rd-header-title title-text="Settings"></rd-header-title>
   <rd-header-content>Settings</rd-header-content>
 </rd-header>
 
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-cogs" title="Application settings"></rd-widget-header>
+      <rd-widget-header icon="fa-cogs" title-text="Application settings"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
           <!-- logo -->
@@ -123,7 +123,7 @@
 <div class="row">
   <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-tags" title="Hidden containers"></rd-widget-header>
+      <rd-widget-header icon="fa-tags" title-text="Hidden containers"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal" ng-submit="addFilteredContainerLabel()" name="addTagForm">
           <div class="form-group">
diff --git a/app/portainer/views/support/support.html b/app/portainer/views/support/support.html
index cbedc28cb..fd76f5297 100644
--- a/app/portainer/views/support/support.html
+++ b/app/portainer/views/support/support.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Support">
+  <rd-header-title title-text="Support">
   </rd-header-title>
   <rd-header-content>
     Portainer support
diff --git a/app/portainer/views/teams/edit/team.html b/app/portainer/views/teams/edit/team.html
index f0b4ca3be..dcd1eb1f8 100644
--- a/app/portainer/views/teams/edit/team.html
+++ b/app/portainer/views/teams/edit/team.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Team details"></rd-header-title>
+  <rd-header-title title-text="Team details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.teams">Teams</a> &gt; <a ui-sref="portainer.teams.team({id: team.Id})">{{ team.Name }}</a>
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-users" title="Team details"></rd-widget-header>
+      <rd-widget-header icon="fa-users" title-text="Team details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -37,7 +37,7 @@
 <div class="row" ng-if="team">
   <div class="col-sm-6">
     <rd-widget>
-      <rd-widget-header classes="col-sm-12 col-md-6 nopadding" icon="fa-users" title="Users">
+      <rd-widget-header classes="col-sm-12 col-md-6 nopadding" icon="fa-users" title-text="Users">
         <div class="pull-md-right pull-lg-right">
           Items per page:
           <select ng-model="state.pagination_count_users" ng-change="changePaginationCountUsers()">
@@ -97,7 +97,7 @@
   </div>
   <div class="col-sm-6">
     <rd-widget>
-      <rd-widget-header classes="col-sm-12 col-md-6 nopadding" icon="fa-users" title="Team members">
+      <rd-widget-header classes="col-sm-12 col-md-6 nopadding" icon="fa-users" title-text="Team members">
         <div class="pull-md-right pull-lg-right">
           Items per page:
           <select ng-model="state.pagination_count_members" ng-change="changePaginationCountGroupMembers()">
diff --git a/app/portainer/views/teams/teams.html b/app/portainer/views/teams/teams.html
index 66c4b6e54..ab1088faa 100644
--- a/app/portainer/views/teams/teams.html
+++ b/app/portainer/views/teams/teams.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Teams">
+  <rd-header-title title-text="Teams">
     <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.teams" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row" ng-if="isAdmin">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-plus" title="Add a new team">
+      <rd-widget-header icon="fa-plus" title-text="Add a new team">
       </rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
@@ -67,7 +67,7 @@
 <div class="row">
   <div class="col-sm-12">
     <teams-datatable
-    title="Teams" title-icon="fa-users"
+    title-text="Teams" title-icon="fa-users"
     dataset="teams" table-key="teams"
     order-by="Name" show-text-filter="true"
     remove-action="removeAction"
diff --git a/app/portainer/views/users/edit/user.html b/app/portainer/views/users/edit/user.html
index 5c8ab61a6..4c82b4b83 100644
--- a/app/portainer/views/users/edit/user.html
+++ b/app/portainer/views/users/edit/user.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="User details"></rd-header-title>
+  <rd-header-title title-text="User details"></rd-header-title>
   <rd-header-content>
     <a ui-sref="portainer.users">Users</a> &gt; <a ui-sref="portainer.users.user({id: user.Id})">{{ user.Username }}</a>
   </rd-header-content>
@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-user" title="User details"></rd-widget-header>
+      <rd-widget-header icon="fa-user" title-text="User details"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -40,7 +40,7 @@
 <div class="row" ng-if="AuthenticationMethod === 1">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-lock" title="Change user password"></rd-widget-header>
+      <rd-widget-header icon="fa-lock" title-text="Change user password"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal" style="margin-top: 15px;">
           <!-- new-password-input -->
diff --git a/app/portainer/views/users/users.html b/app/portainer/views/users/users.html
index 047721771..78ae271b9 100644
--- a/app/portainer/views/users/users.html
+++ b/app/portainer/views/users/users.html
@@ -1,5 +1,5 @@
 <rd-header>
-  <rd-header-title title="Users">
+  <rd-header-title title-text="Users">
     <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.users" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-plus" title="Add a new user">
+      <rd-widget-header icon="fa-plus" title-text="Add a new user">
       </rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal">
@@ -115,7 +115,7 @@
 <div class="row">
   <div class="col-sm-12">
     <users-datatable
-    title="Users" title-icon="fa-user"
+    title-text="Users" title-icon="fa-user"
     dataset="users" table-key="users"
     order-by="Username" show-text-filter="true"
     authentication-method="AuthenticationMethod"