diff --git a/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl
index 9b185bf0c6..c8645ffaff 100644
--- a/client/res/templates/record/list.tpl
+++ b/client/res/templates/record/list.tpl
@@ -8,14 +8,41 @@
{{/if}}
- {{#if checkboxes}}
- {{#if massActionList}}
+ {{#if displayActionsButtonGroup}}
-
+
+
+
+
+ {{translate 'Actions'}}
+
+
+
+
- {{/if}}
{{/if}}
{{#if displayTotalCount}}
@@ -37,10 +86,6 @@
{{translate 'Total'}}: {{collection.total}}
{{/if}}
-
- {{#each buttonList}}
- {{button name scope=../../scope label=label style=style}}
- {{/each}}
{{/if}}
diff --git a/client/src/ui.js b/client/src/ui.js
index c2a08b4ef5..055730ef97 100644
--- a/client/src/ui.js
+++ b/client/src/ui.js
@@ -72,9 +72,13 @@ Espo.define('ui', [], function () {
this.contents = '';
if (this.header) {
- this.contents += '