diff --git a/client/res/templates/dashlet.tpl b/client/res/templates/dashlet.tpl
index f826bcda3f..5a97e5a03f 100644
--- a/client/res/templates/dashlet.tpl
+++ b/client/res/templates/dashlet.tpl
@@ -4,7 +4,7 @@
             {{#each buttonList}}
             <button type="button" class="btn btn-{{#if ../../style}}{{../../style}}{{else}}link{{/if}} btn-sm action{{#if hidden}} hidden{{/if}}" data-action="{{name}}" title="{{#if title}}{{translate title}}{{/if}}">{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</button>
             {{/each}}
-            <button class="dropdown-toggle btn btn-link btn-sm menu-button" data-toggle="dropdown"><span class="caret"></span></button>
+            <button class="dropdown-toggle btn btn-link btn-sm menu-button" data-toggle="dropdown"><span class="fas fa-ellipsis-h"></span></button>
             <ul class="dropdown-menu dropdown-menu-with-icons" role="menu">
               {{#each actionList}}
                 <li><a data-action="{{name}}" class="action" href="{{#if url}}{{url}}{{else}}javascript:{{/if}}"{{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}}>{{#if iconHtml}}{{{iconHtml}}}{{else}}<span class="empty-icon">&nbsp;</span>{{/if}}<span class="item-text">{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</span></a></li>
diff --git a/client/res/templates/record/detail.tpl b/client/res/templates/record/detail.tpl
index 3ba1918f1d..b00fe25e47 100644
--- a/client/res/templates/record/detail.tpl
+++ b/client/res/templates/record/detail.tpl
@@ -5,7 +5,7 @@
             {{#each buttonList}}{{button name scope=../../entityType label=label style=style hidden=hidden html=html}}{{/each}}
             {{#if dropdownItemList}}
             <button type="button" class="btn btn-default dropdown-toggle dropdown-item-list-button{{#if dropdownItemListEmpty}} hidden{{/if}}" data-toggle="dropdown">
-                <span class="caret wide"></span>
+                <span class="fas fa-ellipsis-h"></span>
             </button>
             <ul class="dropdown-menu pull-left">
                 {{#each dropdownItemList}}
@@ -40,7 +40,7 @@
         {{#each buttonEditList}}{{button name scope=../../entityType label=label style=style hidden=hidden html=html}}{{/each}}
         {{#if dropdownEditItemList}}
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-            <span class="caret wide"></span>
+            <span class="fas fa-ellipsis-h"></span>
         </button>
         <ul class="dropdown-menu pull-left">
             {{#each dropdownEditItemList}}
diff --git a/client/res/templates/record/edit.tpl b/client/res/templates/record/edit.tpl
index 8ab7471689..8e64a61c4d 100644
--- a/client/res/templates/record/edit.tpl
+++ b/client/res/templates/record/edit.tpl
@@ -5,7 +5,7 @@
         {{#each buttonList}}{{button name scope=../../entityType label=label style=style html=html}}{{/each}}
         {{#if dropdownItemList}}
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-            <span class="caret wide"></span>
+            <span class="fas fa-ellipsis-h"></span>
         </button>
         <ul class="dropdown-menu pull-left">
             {{#each dropdownItemList}}
diff --git a/client/res/templates/record/panel-actions.tpl b/client/res/templates/record/panel-actions.tpl
index c51344be5c..210dde2023 100644
--- a/client/res/templates/record/panel-actions.tpl
+++ b/client/res/templates/record/panel-actions.tpl
@@ -4,7 +4,7 @@
 
 {{#if actionList}}
     <button type="button" class="btn btn-{{#if defs.style}}{{defs.style}}{{else}}default{{/if}} btn-sm dropdown-toggle" data-toggle="dropdown">
-        <span class="caret"></span>
+        <span class="fas fa-ellipsis-h"></span>
     </button>
     <ul class="dropdown-menu">
         {{#each actionList}}
diff --git a/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl
index 6fffbd9d31..787d943358 100644
--- a/client/res/templates/record/search.tpl
+++ b/client/res/templates/record/search.tpl
@@ -29,7 +29,7 @@
             </div>
             {{#unless textFilterDisabled}}<input type="text" class="form-control text-filter" name="textFilter" value="{{textFilter}}" tabindex="1">{{/unless}}
             <div class="input-group-btn">
-                <button type="button" class="btn btn-primary search btn-icon btn-icon-x-wide" data-action="search">
+                <button type="button" class="btn btn-primary search btn-icon btn-icon-x-wide" data-action="search" title="{{translate 'Search'}}">
                     <span class="fa fa-search"></span>
                 </button>
             </div>
@@ -37,11 +37,11 @@
     </div>
     <div class="form-group col-md-6 col-sm-5">
         <div class="btn-group search-right-buttons-group">
-            <button type="button" class="btn btn-default" data-action="reset">
-                <span class="fas fa-redo-alt fa-sm"></span>&nbsp;{{translate 'Reset'}}
+            <button type="button" class="btn btn-default btn-icon-x-wide" data-action="reset" title="{{translate 'Reset'}}">
+                <span class="fas fa-redo-alt"></span>
             </button>
-            <button type="button" class="btn btn-default dropdown-toggle add-filter-button" data-toggle="dropdown" tabindex="-1">
-                {{translate 'Add Field'}} <span class="caret"></span>
+            <button type="button" class="btn btn-default btn-icon-wide dropdown-toggle add-filter-button" data-toggle="dropdown" tabindex="-1" title="{{translate 'Add Field'}}">
+                <span class="fas fa-ellipsis-v"></span>
             </button>
             <ul class="dropdown-menu pull-right filter-list">
                 {{#each advancedFields}}
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index f9f148d238..c4ba4fd90c 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -1145,6 +1145,10 @@ table.less-padding td.cell[data-name="buttons"] > .btn-group {
     margin-right: -13px;
 }
 
+.panel > .panel-heading > .btn-group > .btn {
+    color: @gray-soft;
+}
+
 .dashboard-header .dashboard-buttons {
     margin-left: 10px;
 }
@@ -1159,10 +1163,6 @@ table.less-padding td.cell[data-name="buttons"] > .btn-group {
     cursor: default;
 }
 
-.panel.dashlet > .panel-heading > .btn-group .btn-link {
-    color: @text-color;
-}
-
 .panel.dashlet > .panel-heading > .btn-group > .btn + .dropdown-toggle {
     padding-left: @padding-small-horizontal;
     padding-right: @padding-small-horizontal;
@@ -2353,6 +2353,11 @@ a.field-info > span.fa-info-circle {
     }
 }
 
+.btn > .fa-ellipsis-v {
+    position: relative;
+    top: 1px;
+}
+
 .btn.btn-icon-wide  {
     width: 54px;
 }
diff --git a/frontend/less/espo/variables.less b/frontend/less/espo/variables.less
index 6abc1a0cac..bda6ed6b1a 100644
--- a/frontend/less/espo/variables.less
+++ b/frontend/less/espo/variables.less
@@ -94,6 +94,8 @@
 
 @white-color: #fafbfc;
 
+@gray-soft: lighten(@gray-base, 39.5%);
+
 @body-bg: #FEFEFE;
 @panel-bg: #FFF;
 
diff --git a/frontend/less/hazyblue-vertical/custom.less b/frontend/less/hazyblue-vertical/custom.less
index a4bbd7e7f6..5bf32f8221 100644
--- a/frontend/less/hazyblue-vertical/custom.less
+++ b/frontend/less/hazyblue-vertical/custom.less
@@ -23,6 +23,16 @@
     }
 }
 
+.btn-default > .fa,
+.btn-default > .fas {
+    color: @gray-soft;
+}
+
+.btn-default.disabled > .fa,
+.btn-default.disabled > .fas {
+    color: @gray-light;
+}
+
 .panel-heading {
     border-bottom-width: 0;
 }
@@ -32,16 +42,16 @@
     border-color: @btn-default-border;
 }
 
-.panel .panel-heading .btn-default {
+.panel > .panel-heading > .btn-group > .btn {
     background-color: @panel-default-heading-bg;
     border-color: @panel-default-heading-bg;
 }
 
-.panel .panel-heading .open .btn {
+.panel > .panel-heading .open .btn {
     border-color: transparent;
 }
 
-.panel .panel-heading .btn-default {
+.panel > .panel-heading .btn-default {
     &:active,
     &.active {
         .box-shadow(none);