diff --git a/NEWS b/NEWS
index a2ea31925..061158b10 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ New features
 Enhancements
  - [web] avoid saving an empty calendar name
  - [web] prohibit duplicate contact categories in Preferences module
+ - [web] improve constrat of text in toolbar with input fields
 
 Bug fixes
  - [web] properly handle Windows-1256 charaset (#4781)
diff --git a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox
index f341e9ced..da69c3f8c 100644
--- a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox
+++ b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox
@@ -8,7 +8,7 @@
     >
   <md-dialog flex="40" flex-md="60" flex-sm="90">
 
-    <md-toolbar>
+    <md-toolbar class="md-hue-1">
       <div class="md-toolbar-tools">
         <!-- name -->
         <md-input-container class="md-block md-flex">
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 5231d616e..e280b9d3c 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -15,7 +15,7 @@
              uploader="editor.uploader"
              var:sg-labels="framework">
     <form name="messageForm">
-      <md-toolbar>
+      <md-toolbar class="md-hue-1">
         <div class="md-toolbar-tools">
           <!-- expand dialog -->
           <md-button ng-click="editor.toggleFullscreen($event)"
diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index b3dec3f18..6f68a3b07 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -9,7 +9,7 @@
     xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
 <md-dialog flex="50" flex-sm="80" flex-xs="100">
   <form id="accountForm" name="accountForm" var:href="ownPath">
-    <md-toolbar>
+    <md-toolbar class="md-hue-1">
       <div class="md-toolbar-tools">
         <md-icon class="material-icons sg-icon-toolbar-bg">account_box</md-icon>
         <md-input-container class="md-block md-flex">
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index dc02b9d1b..f65d380bf 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -9,7 +9,7 @@
     xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
 <md-dialog flex="50" flex-sm="80" flex-xs="100">
   <form id="filterForm" name="filterForm" class="md-inline-form" ng-submit="filterEditor.save(filterForm)">
-    <md-toolbar>
+    <md-toolbar class="md-hue-1">
       <div class="md-toolbar-tools">
         <md-icon class="material-icons sg-icon-toolbar-bg">filter_list</md-icon>
         <md-input-container class="md-block md-flex">
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
index bd1ec3c01..86453c1e6 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
@@ -6,7 +6,7 @@
     xmlns:label="OGo:label">
   <md-dialog flex="60" flex-sm="80" flex-xs="100">
     <form name="eventForm" class="md-inline-form" ng-submit="editor.save(eventForm)">
-      <md-toolbar>
+      <md-toolbar class="md-hue-1">
         <div class="md-toolbar-tools">
           <md-icon class="material-icons sg-icon-toolbar-bg">event</md-icon>
           <!-- summary -->
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index a58157ed7..682b2c701 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -9,7 +9,7 @@
   <md-dialog flex="50" flex-sm="70" flex-xs="100">
     <form name="calendarPropertiesForm" ng-submit="properties.saveProperties(calendarPropertiesForm)">
 
-      <md-toolbar ng-class="properties.calendar.getClassName('bg')">
+      <md-toolbar class="md-hue-1">
         <div class="md-toolbar-tools">
           <!-- color -->
           <sg-color-picker ng-model="properties.calendar.color"><!-- color picker --></sg-color-picker>
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
index 3eda93b1d..9b59bdbff 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
@@ -6,7 +6,7 @@
     xmlns:label="OGo:label">
   <md-dialog flex="60" flex-sm="80" flex-xs="100">
     <form name="eventForm" ng-submit="editor.save(eventForm)">
-      <md-toolbar>
+      <md-toolbar class="md-hue-1">
         <div class="md-toolbar-tools">
           <md-icon class="material-icons sg-icon-toolbar-bg">assignment_turned_in</md-icon>
           <!-- summary -->
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 586778b0c..47fb694e2 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -14,7 +14,7 @@
           <label class="pseudo-input-label"><var:string label:value="Access Rights"/></label>
           <div layout="row" layout-align="start center">
             <div class="sg-color-chip"
-                 ng-class="::acl.folderClassName()"><!-- color --></div>
+                 ng-show="::acl.folderClassName()" ng-class="::acl.folderClassName()"><!-- color --></div>
             <div class="sg-md-title" ng-bind="::acl.folder.name"><!-- calendar --></div>
           </div>
         </div>