From 1c87bb7fe951129596cf26c2272880fafb52780f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 31 Aug 2023 11:49:35 +0200
Subject: [PATCH] DEV: Update DButton uses (#23333)

1. Use `this.` instead of `{{action}}` where applicable
2. Use `{{fn}}` instead of `@actionParam` where applicable
3. Use non-`@` versions of class/type/tabindex/aria-controls/aria-expanded
4. Remove `btn` class (it's added automatically to all DButtons)
5. Remove `type="button"` (it's the default)
6. Use `concat-class` helper
---
 .../addon/components/admin-editable-field.hbs |  10 +-
 .../components/admin-report-table-header.hbs  |   2 +-
 .../addon/components/admin-report-table.hbs   |   5 +-
 .../admin/addon/components/admin-report.hbs   |  17 +-
 .../addon/components/admin-theme-editor.hbs   |   8 +-
 .../components/admin-user-field-item.hbs      |  27 ++-
 .../components/dashboard-new-features.hbs     |   2 +-
 .../addon/components/dashboard-problems.hbs   |   2 +-
 .../addon/components/email-styles-editor.hbs  |   4 +-
 .../addon/components/embeddable-host.hbs      |  16 +-
 .../addon/components/emoji-value-list.hbs     |  18 +-
 .../addon/components/form-template/form.hbs   |  13 +-
 .../components/form-template/row-item.hbs     |   6 +-
 .../addon/components/inline-edit-checkbox.hbs |   8 +-
 .../admin/addon/components/ip-lookup.hbs      |  16 +-
 .../admin/addon/components/permalink-form.hbs |   4 +-
 .../components/screened-ip-address-form.hbs   |   6 +-
 .../addon/components/secret-value-list.hbs    |   9 +-
 .../admin/addon/components/simple-list.hbs    |  18 +-
 .../site-settings/uploaded-image-list.hbs     |   6 +-
 .../addon/components/site-text-summary.hbs    |   5 +-
 .../addon/components/theme-upload-add.hbs     |   4 +-
 .../admin/addon/components/themes-list.hbs    |  20 +--
 .../admin/addon/components/value-list.hbs     |  13 +-
 .../addon/components/watched-word-form.hbs    |   6 +-
 .../addon/templates/admin-badges/award.hbs    |   6 +-
 .../addon/templates/admin-badges/show.hbs     |  12 +-
 .../admin/addon/templates/api-keys-index.hbs  |  10 +-
 .../admin/addon/templates/api-keys-new.hbs    |  12 +-
 .../admin/addon/templates/api-keys-show.hbs   |  31 ++--
 .../admin/addon/templates/backups-index.hbs   |  33 ++--
 .../admin/addon/templates/backups.hbs         |   6 +-
 .../addon/templates/customize-colors-show.hbs |  38 +++--
 .../addon/templates/customize-colors.hbs      |   4 +-
 .../templates/customize-email-style-edit.hbs  |   4 +-
 .../customize-form-templates-index.hbs        |   2 +-
 .../addon/templates/customize-robots-txt.hbs  |   4 +-
 .../addon/templates/customize-themes-edit.hbs |   8 +-
 .../templates/customize-themes-index.hbs      |   2 +-
 .../addon/templates/customize-themes-show.hbs |  73 ++++----
 .../admin/addon/templates/email-index.hbs     |   6 +-
 .../addon/templates/email-preview-digest.hbs  |   8 +-
 .../admin/addon/templates/embedding.hbs       |   8 +-
 .../admin/addon/templates/emojis.hbs          |   4 +-
 .../addon/templates/logs/screened-emails.hbs  |   7 +-
 .../templates/logs/screened-ip-addresses.hbs  |  33 ++--
 .../addon/templates/logs/screened-urls.hbs    |   4 +-
 .../templates/logs/staff-action-logs.hbs      |   4 +-
 .../admin/addon/templates/permalinks.hbs      |   5 +-
 .../admin/addon/templates/site-settings.hbs   |  12 +-
 .../admin/addon/templates/site-text-edit.hbs  |   9 +-
 .../admin/addon/templates/site-text-index.hbs |   2 +-
 .../admin/addon/templates/user-badges.hbs     |  10 +-
 .../admin/addon/templates/user-fields.hbs     |  11 +-
 .../admin/addon/templates/user-index.hbs      | 156 ++++++++----------
 .../admin/addon/templates/users-list-show.hbs |  11 +-
 .../admin/addon/templates/users-list.hbs      |   4 +-
 .../addon/templates/watched-words-action.hbs  |  10 +-
 .../admin/addon/templates/watched-words.hbs   |   8 +-
 .../admin/addon/templates/web-hooks-edit.hbs  |   4 +-
 .../admin/addon/templates/web-hooks-index.hbs |   5 +-
 .../admin/addon/templates/web-hooks-show.hbs  |   4 +-
 .../addon/components/dialog-holder.hbs        |  10 +-
 .../app/components/activation-controls.hbs    |   4 +-
 .../discourse/app/components/backup-codes.hbs |   4 +-
 .../discourse/app/components/badge-card.hbs   |   4 +-
 .../discourse/app/components/badge-title.hbs  |   4 +-
 .../components/category-permission-row.hbs    |   6 +-
 .../app/components/composer-container.hbs     |  10 +-
 .../app/components/composer-toggles.hbs       |   6 +-
 .../discourse/app/components/copy-button.hbs  |   4 +-
 .../app/components/create-topic-button.hbs    |   4 +-
 .../discourse/app/components/d-editor.hbs     |   8 +-
 .../app/components/d-lightbox/body.hbs        |  12 +-
 .../app/components/d-lightbox/carousel.hbs    |   8 +-
 .../app/components/d-lightbox/footer.hbs      |  12 +-
 .../app/components/d-lightbox/header.hbs      |  16 +-
 .../app/components/d-modal-cancel.hbs         |   2 +-
 .../app/components/d-modal-legacy.hbs         |   2 +-
 .../discourse/app/components/d-modal.hbs      |   2 +-
 .../discourse/app/components/d-navigation.hbs |   7 +-
 .../app/components/date-time-input.hbs        |   4 +-
 .../desktop-notification-config.hbs           |   8 +-
 .../app/components/discourse-banner.hbs       |   4 +-
 .../app/components/edit-category-general.hbs  |   4 +-
 .../app/components/edit-category-tags.hbs     |   8 +-
 .../discourse/app/components/emoji-picker.hbs |  16 +-
 .../app/components/emoji-uploader.hbs         |   4 +-
 .../app/components/global-notice.hbs          |   5 +-
 .../app/components/group-card-contents.hbs    |   2 +-
 .../components/group-imap-email-settings.hbs  |   6 +-
 .../components/group-manage-logs-filter.hbs   |   5 +-
 .../components/group-manage-logs-filter.js    |   6 -
 .../app/components/group-manage-logs-row.hbs  |  30 ++--
 .../app/components/group-manage-logs-row.js   |  16 +-
 .../components/group-manage-save-button.hbs   |   2 +-
 .../components/group-membership-button.hbs    |   6 +-
 .../components/group-smtp-email-settings.hbs  |   6 +-
 .../app/components/hidden-details.hbs         |   6 +-
 .../app/components/ignored-user-list-item.hbs |   4 +-
 .../app/components/ignored-user-list.hbs      |   2 +-
 .../discourse/app/components/invite-panel.hbs |  16 +-
 .../app/components/modal-footer-close.hbs     |   2 +-
 .../app/components/modal/bookmark.hbs         |  10 +-
 .../app/components/modal/discard-draft.hbs    |   6 +-
 .../app/components/modal/dismiss-new.gjs      |   2 +-
 .../modal/edit-user-directory-columns.hbs     |   8 +-
 .../modal/ignore-duration-with-username.hbs   |   2 +-
 .../components/modal/json-schema-editor.hbs   |   2 +-
 .../app/components/modal/publish-page.hbs     |   6 +-
 .../app/components/modal/share-topic.hbs      |  16 +-
 .../components/modal/sidebar-section-form.hbs |  29 ++--
 .../app/components/modal/user-status.hbs      |   4 +-
 .../discourse/app/components/more-topics.hbs  |   4 +-
 .../notification-consent-banner.hbs           |   2 +-
 .../app/components/pwa-install-banner.hbs     |   2 +-
 .../components/reviewable-claimed-topic.hbs   |   4 +-
 .../components/reviewable-flagged-post.hbs    |   2 +-
 .../app/components/reviewable-item.hbs        |   6 +-
 .../app/components/reviewable-queued-post.hbs |   2 +-
 .../app/components/save-controls.hbs          |   2 +-
 .../components/search-advanced-options.hbs    |   2 +-
 .../search-menu/menu-panel-contents.hbs       |   6 +-
 .../app/components/security-key-form.hbs      |   5 +-
 .../app/components/selected-posts.hbs         |   8 +-
 .../discourse/app/components/share-source.hbs |   6 +-
 .../app/components/shared-draft-controls.hbs  |   2 +-
 .../sidebar/edit-navigation-menu/modal.hbs    |   6 +-
 .../app/components/sidebar/footer.hbs         |   8 +-
 .../components/sidebar/more-section-links.hbs |   4 +-
 .../components/sidebar/section-form-link.hbs  |   4 +-
 .../app/components/sidebar/section-header.hbs |   6 +-
 .../sidebar/switch-panel-buttons.hbs          |   4 +-
 .../discourse/app/components/signup-cta.hbs   |   4 +-
 .../app/components/slow-mode-info.hbs         |   4 +-
 .../discourse/app/components/summary-box.hbs  |   6 +-
 .../app/components/tag-groups-form.hbs        |   4 +-
 .../discourse/app/components/tag-info.hbs     |  14 +-
 .../app/components/toggle-password-mask.hbs   |   2 +-
 .../app/components/top-period-buttons.hbs     |   5 +-
 .../app/components/top-period-buttons.js      |   8 +-
 .../app/components/topic-dismiss-buttons.hbs  |  10 +-
 .../app/components/topic-entrance.hbs         |   4 +-
 .../app/components/topic-footer-buttons.hbs   |  13 +-
 .../app/components/topic-navigation-popup.hbs |   2 +-
 .../app/components/topic-progress.hbs         |   4 +-
 .../components/topic-timeline/back-button.hbs |   3 +-
 .../app/components/topic-timer-info.hbs       |   4 +-
 .../app/components/uppy-image-uploader.hbs    |   6 +-
 .../app/components/user-card-contents.hbs     |  18 +-
 .../user-menu/profile-tab-content.hbs         |  11 +-
 .../user-preferences/user-api-keys.hbs        |   8 +-
 .../app/components/user-stream-item.hbs       |  10 +-
 .../app/components/username-preference.hbs    |   5 +-
 .../templates/account-created/edit-email.hbs  |   4 +-
 .../discourse/app/templates/badges/show.hbs   |   8 +-
 .../templates/composer/dominating-topic.hbs   |   4 +-
 .../app/templates/composer/get-a-room.hbs     |   4 +-
 .../app/templates/edit-category-tabs.hbs      |  10 +-
 .../discourse/app/templates/email-login.hbs   |   4 +-
 .../discourse/app/templates/exception.hbs     |   2 +-
 .../app/templates/full-page-search.hbs        |  12 +-
 .../discourse/app/templates/group-index.hbs   |  16 +-
 .../app/templates/group-requests.hbs          |  13 +-
 .../discourse/app/templates/group.hbs         |  12 +-
 .../discourse/app/templates/groups/index.hbs  |   4 +-
 .../discourse/app/templates/groups/new.hbs    |   6 +-
 .../discourse/app/templates/invites/show.hbs  |  10 +-
 .../app/templates/login-preferences.hbs       |   2 +-
 .../modal/associate-account-confirm.hbs       |   2 +-
 .../app/templates/modal/avatar-selector.hbs   |   4 +-
 .../app/templates/modal/change-owner.hbs      |   2 +-
 .../templates/modal/change-post-notice.hbs    |   8 +-
 .../app/templates/modal/create-account.hbs    |   6 +-
 .../app/templates/modal/create-invite.hbs     |  12 +-
 .../app/templates/modal/grant-badge.hbs       |   2 +-
 .../app/templates/modal/raw-email.hbs         |   6 +-
 .../modal/reject-reason-reviewable.hbs        |   6 +-
 .../templates/modal/reorder-categories.hbs    |  12 +-
 .../modal/request-group-membership-form.hbs   |   2 +-
 .../app/templates/navigation/filter.hbs       |   4 +-
 .../app/templates/password-reset.hbs          |   8 +-
 .../app/templates/preferences-email.hbs       |   4 +-
 .../templates/preferences-second-factor.hbs   |  12 +-
 .../app/templates/preferences/account.hbs     |  38 ++---
 .../app/templates/preferences/interface.hbs   |   4 +-
 .../app/templates/preferences/profile.hbs     |   8 +-
 .../discourse/app/templates/review-index.hbs  |   6 +-
 .../app/templates/review-settings.hbs         |   2 +-
 .../app/templates/second-factor-auth.hbs      |  13 +-
 .../discourse/app/templates/tag-groups.hbs    |   3 +-
 .../discourse/app/templates/topic.hbs         |  14 +-
 .../app/templates/user-invited-show.hbs       |  22 +--
 .../discourse/app/templates/user.hbs          |  24 ++-
 .../app/templates/user/bookmarks.hbs          |   7 +-
 .../discourse/app/templates/user/messages.hbs |   2 +-
 .../app/templates/user/notifications.hbs      |   2 +-
 .../discourse/app/templates/users.hbs         |   5 +-
 .../components/admin-user-field-item-test.js  |  38 ++++-
 .../components/combo-box/combo-box-header.hbs |   2 +-
 .../mini-tag-chooser/selected-collection.hbs  |   7 +-
 .../addon/components/selected-choice.hbs      |   4 +-
 .../addon/components/selected-name.hbs        |   5 +-
 .../discourse/components/chat-browse-view.hbs |   6 +-
 .../components/chat-channel-about-view.hbs    |   4 +-
 .../components/chat-channel-leave-btn.hbs     |   2 +-
 .../components/chat-channel-settings-view.hbs |  16 +-
 .../components/chat-composer-dropdown.hbs     |   8 +-
 .../chat-composer-message-details.hbs         |   2 +-
 .../components/chat-composer-upload.hbs       |   2 +-
 .../chat-drawer/header/close-button.hbs       |   2 +-
 .../header/toggle-expand-button.hbs           |   2 +-
 .../chat-message-actions-desktop.hbs          |   6 +-
 .../chat-message-actions-mobile.hbs           |  15 +-
 .../discourse/components/chat-message.hbs     |   6 +-
 .../discourse/components/chat-notices.hbs     |   2 +-
 .../components/chat-retention-reminder.hbs    |   2 +-
 .../components/chat/admin/export-messages.hbs |   2 +-
 .../components/chat/modal/archive-channel.hbs |   4 +-
 .../components/chat/modal/delete-channel.hbs  |   6 +-
 .../chat/modal/edit-channel-description.hbs   |   2 +-
 .../chat/modal/edit-channel-name.hbs          |   2 +-
 .../chat/modal/move-message-to-channel.hbs    |   4 +-
 .../components/chat/modal/thread-settings.hbs |   2 +-
 .../chat/modal/toggle-channel-status.hbs      |   4 +-
 .../components/chat/selection-manager.hbs     |  10 +-
 .../components/chat/thread/header.hbs         |   2 +-
 .../components/chat/user-card-button.hbs      |   2 +-
 .../discourse/components/collapser.hbs        |   8 +-
 .../toggle-channel-membership-button.hbs      |  16 +-
 .../templates/admin-plugins-chat.hbs          |  31 ++--
 .../discourse-local-dates-create-form.hbs     |  27 ++-
 .../components/modal/poll-ui-builder.hbs      |  14 +-
 .../components/sections/atoms/02-buttons.hbs  |  24 +--
 .../sections/atoms/05-input-fields.hbs        |  20 +--
 .../organisms/03-topic-footer-buttons.hbs     |   2 +-
 .../sections/organisms/user-about.hbs         |   8 +-
 237 files changed, 998 insertions(+), 1091 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
index a59b2b5ec59..efee39772d0 100644
--- a/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
@@ -15,16 +15,12 @@
 <div class="controls">
   {{#if this.editing}}
     <DButton
-      @class="btn-default"
-      @action={{action "save"}}
+      class="btn-default"
+      @action={{this.save}}
       @label="admin.user_fields.save"
     />
     <a href {{on "click" this.edit}}>{{i18n "cancel"}}</a>
   {{else}}
-    <DButton
-      @class="btn-default"
-      @action={{action "edit"}}
-      @icon="pencil-alt"
-    />
+    <DButton class="btn-default" @action={{this.edit}} @icon="pencil-alt" />
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-header.hbs b/app/assets/javascripts/admin/addon/components/admin-report-table-header.hbs
index 808e9cd5e31..2665d64ad23 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table-header.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table-header.hbs
@@ -2,7 +2,7 @@
   <DButton
     @action={{this.sortByLabel}}
     @icon={{this.sortIcon}}
-    @class="sort-btn"
+    class="sort-btn"
   />
 {{/if}}
 
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table.hbs b/app/assets/javascripts/admin/addon/components/admin-report-table.hbs
index 733cd4ed758..23e147f367b 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table.hbs
@@ -76,9 +76,8 @@
   {{#each this.pages as |pageState|}}
     <DButton
       @translatedLabel={{pageState.page}}
-      @action={{action "changePage"}}
-      @actionParam={{pageState.index}}
-      @class={{pageState.class}}
+      @action={{fn this.changePage pageState.index}}
+      class={{pageState.class}}
     />
   {{/each}}
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/admin-report.hbs b/app/assets/javascripts/admin/addon/components/admin-report.hbs
index c643ac7e145..0854431e1fa 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-report.hbs
@@ -143,10 +143,9 @@
               <div class="modes">
                 {{#each this.displayedModes as |displayedMode|}}
                   <DButton
-                    @action={{action "onChangeMode"}}
-                    @actionParam={{displayedMode.mode}}
-                    @class={{displayedMode.cssClass}}
+                    @action={{fn this.onChangeMode displayedMode.mode}}
                     @icon={{displayedMode.icon}}
+                    class={{displayedMode.cssClass}}
                   />
                 {{/each}}
               </div>
@@ -162,9 +161,9 @@
                 {{#each this.chartGroupings as |chartGrouping|}}
                   <DButton
                     @label={{chartGrouping.label}}
-                    @action={{action "changeGrouping" chartGrouping.id}}
-                    @class={{chartGrouping.class}}
+                    @action={{fn this.changeGrouping chartGrouping.id}}
                     @disabled={{chartGrouping.disabled}}
+                    class={{chartGrouping.class}}
                   />
                 {{/each}}
               </div>
@@ -212,10 +211,10 @@
             <div class="control">
               <div class="input">
                 <DButton
-                  @class="btn-default export-csv-btn"
-                  @action={{action "exportCsv"}}
+                  @action={{this.exportCsv}}
                   @label="admin.export_csv.button_text"
                   @icon="download"
+                  class="btn-default export-csv-btn"
                 />
               </div>
             </div>
@@ -224,10 +223,10 @@
               <div class="control">
                 <div class="input">
                   <DButton
-                    @class="refresh-report-btn btn-primary"
-                    @action={{action "refreshReport"}}
+                    @action={{this.refreshReport}}
                     @label="admin.dashboard.reports.refresh_report"
                     @icon="sync"
+                    class="refresh-report-btn btn-primary"
                   />
                 </div>
               </div>
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
index e6c201cb784..24abd75eb06 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
@@ -83,14 +83,14 @@
               @escape-press={{action "cancelAddField"}}
             />
             <DButton
-              @class="ok"
-              @action={{action "addField" this.newFieldName}}
+              @action={{fn this.addField this.newFieldName}}
               @icon="check"
+              class="ok"
             />
             <DButton
-              @class="cancel"
-              @action={{action "cancelAddField"}}
+              @action={{this.cancelAddField}}
               @icon="times"
+              class="cancel"
             />
           {{else}}
             <a href {{on "click" this.toggleAddField}} class="no-text">
diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
index c87eb5e1eec..d461103899c 100644
--- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
@@ -57,16 +57,16 @@
 
     <AdminFormRow>
       <DButton
-        @action={{action "save"}}
-        @class="btn-primary save"
+        @action={{this.save}}
         @icon="check"
         @label="admin.user_fields.save"
+        class="btn-primary save"
       />
       <DButton
-        @action={{action "cancel"}}
-        @class="btn-danger cancel"
+        @action={{this.cancel}}
         @icon="times"
         @label="admin.user_fields.cancel"
+        class="btn-danger cancel"
       />
     </AdminFormRow>
   {{else}}
@@ -81,31 +81,28 @@
       <div class="form-display field-type">{{this.fieldName}}</div>
       <div class="form-element controls">
         <DButton
-          @action={{action "edit"}}
-          @class="btn-default edit"
+          @action={{this.edit}}
           @icon="pencil-alt"
           @label="admin.user_fields.edit"
+          class="btn-default edit"
         />
         <DButton
-          @action={{this.destroyAction}}
-          @actionParam={{this.userField}}
-          @class="btn-danger cancel"
+          @action={{fn this.destroyAction this.userField}}
           @icon="far-trash-alt"
           @label="admin.user_fields.delete"
+          class="btn-danger cancel"
         />
         <DButton
-          @action={{this.moveUpAction}}
-          @actionParam={{this.userField}}
-          @class="btn-default"
+          @action={{fn this.moveUpAction this.userField}}
           @icon="arrow-up"
           @disabled={{this.cantMoveUp}}
+          class="btn-default"
         />
         <DButton
-          @action={{this.moveDownAction}}
-          @actionParam={{this.userField}}
-          @class="btn-default"
+          @action={{fn this.moveDownAction this.userField}}
           @icon="arrow-down"
           @disabled={{this.cantMoveDown}}
+          class="btn-default"
         />
       </div>
     </div>
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-features.hbs b/app/assets/javascripts/admin/addon/components/dashboard-new-features.hbs
index c44546e140f..b455f3d29f5 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-new-features.hbs
+++ b/app/assets/javascripts/admin/addon/components/dashboard-new-features.hbs
@@ -21,8 +21,8 @@
     {{/if}}
     <DButton
       @label="admin.dashboard.new_features.dismiss"
-      @class="btn-default new-features-dismiss"
       @action={{this.dismissNewFeatures}}
+      class="btn-default new-features-dismiss"
     />
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs b/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
index 9a0e9d6d4fc..05cf0115d4b 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
@@ -45,9 +45,9 @@
         <p class="actions">
           <DButton
             @action={{this.refreshProblems}}
-            @class="btn-default"
             @icon="sync"
             @label="admin.dashboard.refresh_problems"
+            class="btn-default"
           />
           {{i18n "admin.dashboard.last_checked"}}:
           {{this.problemsTimestamp}}
diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
index 78b63780e11..14382183703 100644
--- a/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
@@ -35,10 +35,10 @@
 <div class="admin-footer">
   <div class="buttons">
     <DButton
-      @action={{action "reset"}}
+      @action={{this.reset}}
       @disabled={{this.resetDisabled}}
-      @class="btn-default"
       @label="admin.customize.email_style.reset"
+      class="btn-default"
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
index 55e4b3df3fa..f6cd35599f8 100644
--- a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
@@ -29,15 +29,15 @@
   <td class="editing-controls">
     <DButton
       @icon="check"
-      @action={{action "save"}}
-      @class="btn-primary"
+      @action={{this.save}}
       @disabled={{this.cantSave}}
+      class="btn-primary"
     />
     <DButton
       @icon="times"
-      @action={{action "cancel"}}
-      @class="btn-danger"
+      @action={{this.cancel}}
       @disabled={{this.host.isSaving}}
+      class="btn-danger"
     />
   </td>
 {{else}}
@@ -56,11 +56,7 @@
     {{category-badge this.host.category allowUncategorized=true}}
   </td>
   <td class="controls">
-    <DButton @icon="pencil-alt" @action={{action "edit"}} />
-    <DButton
-      @icon="far-trash-alt"
-      @action={{action "delete"}}
-      @class="btn-danger"
-    />
+    <DButton @icon="pencil-alt" @action={{this.edit}} />
+    <DButton @icon="far-trash-alt" @action={{this.delete}} class="btn-danger" />
   </td>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs b/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
index 3c3e2d318c3..e3baec1187b 100644
--- a/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
@@ -3,11 +3,10 @@
     {{#each this.collection as |data index|}}
       <li class="value" data-index={{index}}>
         <DButton
-          @action={{action "removeValue"}}
-          @actionParam={{data}}
+          @action={{fn this.removeValue data}}
           @icon="times"
-          @class="remove-value-btn btn-small"
           @disabled={{not data.isEditable}}
+          class="remove-value-btn btn-small"
         />
 
         <div
@@ -28,14 +27,14 @@
 
         {{#if this.showUpDownButtons}}
           <DButton
-            @action={{action "shift" -1 index}}
+            @action={{fn this.shift -1 index}}
             @icon="arrow-up"
-            @class="shift-up-value-btn btn-small"
+            class="shift-up-value-btn btn-small"
           />
           <DButton
-            @action={{action "shift" 1 index}}
+            @action={{fn this.shift 1 index}}
             @icon="arrow-down"
-            @class="shift-down-value-btn btn-small"
+            class="shift-down-value-btn btn-small"
           />
         {{/if}}
       </li>
@@ -45,11 +44,10 @@
 
 <div class="value">
   <DButton
-    @action={{action "editValue"}}
-    @actionParam={{this.data}}
+    @action={{fn this.editValue this.data}}
     @icon="discourse-emojis"
-    @class="add-emoji-button d-editor-textarea-wrapper"
     @label="admin.site_settings.emoji_list.add_emoji_button.label"
+    class="add-emoji-button d-editor-textarea-wrapper"
   />
 </div>
 
diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.hbs b/app/assets/javascripts/admin/addon/components/form-template/form.hbs
index 01b8caf4d42..0e3974f0c85 100644
--- a/app/assets/javascripts/admin/addon/components/form-template/form.hbs
+++ b/app/assets/javascripts/admin/addon/components/form-template/form.hbs
@@ -17,26 +17,25 @@
       </span>
       {{#each this.quickInsertFields as |field|}}
         <DButton
-          @class="btn-flat btn-icon-text quick-insert-{{field.type}}"
           @icon={{field.icon}}
           @label="admin.form_templates.quick_insert_fields.{{field.type}}"
-          @action={{this.onInsertField}}
-          @actionParam={{field.type}}
+          @action={{fn this.onInsertField field.type}}
+          class="btn-flat btn-icon-text quick-insert-{{field.type}}"
         />
       {{/each}}
       <DButton
-        class="btn-flat btn-icon-text form-templates__validations-modal-button"
         @label="admin.form_templates.validations_modal.button_title"
         @icon="check-circle"
         @action={{this.showValidationOptionsModal}}
+        class="btn-flat btn-icon-text form-templates__validations-modal-button"
       />
     </div>
     <DButton
-      @class="form-templates__preview-button"
       @icon="eye"
       @label="admin.form_templates.new_template_form.preview"
       @action={{this.showPreview}}
       @disabled={{this.disablePreviewButton}}
+      class="form-templates__preview-button"
     />
   </div>
 
@@ -46,11 +45,11 @@
 
   <div class="footer-buttons">
     <DButton
-      @class="btn-primary"
       @label="admin.form_templates.new_template_form.submit"
       @icon="check"
       @action={{this.onSubmit}}
       @disabled={{this.disableSubmitButton}}
+      class="btn-primary"
     />
 
     <DButton
@@ -61,10 +60,10 @@
 
     {{#if this.isEditing}}
       <DButton
-        @class="btn-danger"
         @label="admin.form_templates.view_template.delete"
         @icon="trash-alt"
         @action={{this.onDelete}}
+        class="btn-danger"
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
index c7c1791b260..1ffbcfd6a0d 100644
--- a/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
+++ b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
@@ -9,20 +9,20 @@
     <DButton
       @title="admin.form_templates.list_table.actions.view"
       @icon="far-eye"
-      @class="btn-view-template"
       @action={{fn (mut this.showViewTemplateModal) true}}
+      class="btn-view-template"
     />
     <DButton
       @title="admin.form_templates.list_table.actions.edit"
       @icon="pencil-alt"
-      @class="btn-edit-template"
       @action={{this.editTemplate}}
+      class="btn-edit-template"
     />
     <DButton
       @title="admin.form_templates.list_table.actions.delete"
       @icon="far-trash-alt"
-      @class="btn-danger btn-delete-template"
       @action={{this.deleteTemplate}}
+      class="btn-danger btn-delete-template"
     />
   </td>
 </tr>
diff --git a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
index d48dfc190a8..9e2d6948008 100644
--- a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
+++ b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
@@ -4,13 +4,13 @@
 </label>
 {{#if this.changed}}
   <DButton
-    @action={{action "apply"}}
-    @class="btn-primary btn-small submit-edit"
+    @action={{this.apply}}
     @icon="check"
+    class="btn-primary btn-small submit-edit"
   />
   <DButton
-    @action={{action "cancel"}}
-    @class="btn-small cancel-edit"
+    @action={{this.cancel}}
     @icon="times"
+    class="btn-small cancel-edit"
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/components/ip-lookup.hbs
index 76dbd2d5db8..1097e54a84a 100644
--- a/app/assets/javascripts/admin/addon/components/ip-lookup.hbs
+++ b/app/assets/javascripts/admin/addon/components/ip-lookup.hbs
@@ -1,9 +1,9 @@
 {{#if this.ip}}
   <DButton
-    @class="btn-default"
-    @action={{action "lookup"}}
+    @action={{this.lookup}}
     @icon="globe"
     @label="admin.user.ip_lookup"
+    class="btn-default"
   />
 {{/if}}
 {{#if this.show}}
@@ -13,16 +13,12 @@
       }}</a>
     {{#if this.copied}}
       <DButton
-        @class="btn-hover pull-right"
         @icon="copy"
         @label="ip_lookup.copied"
+        class="btn-hover pull-right"
       />
     {{else}}
-      <DButton
-        @action={{action "copy"}}
-        @class="pull-right no-text"
-        @icon="copy"
-      />
+      <DButton @action={{this.copy}} @icon="copy" class="pull-right no-text" />
     {{/if}}
     <h4>{{i18n "ip_lookup.title"}}</h4>
     <p class="powered-by">{{html-safe (i18n "ip_lookup.powered_by")}}</p>
@@ -61,13 +57,13 @@
         <strong>{{this.totalOthersWithSameIP}}</strong>
         {{#if this.other_accounts.length}}
           <DButton
-            @class="btn-danger pull-right"
-            @action={{action "deleteOtherAccounts"}}
+            @action={{this.deleteOtherAccounts}}
             @icon="exclamation-triangle"
             @translatedLabel={{i18n
               "ip_lookup.delete_other_accounts"
               count=this.otherAccountsToDelete
             }}
+            class="btn-danger pull-right"
           />
         {{/if}}
       </dt>
diff --git a/app/assets/javascripts/admin/addon/components/permalink-form.hbs b/app/assets/javascripts/admin/addon/components/permalink-form.hbs
index c1d99fd7e84..7e2023a90d3 100644
--- a/app/assets/javascripts/admin/addon/components/permalink-form.hbs
+++ b/app/assets/javascripts/admin/addon/components/permalink-form.hbs
@@ -29,10 +29,10 @@
     />
 
     <DButton
-      @action={{action "onSubmit"}}
+      @action={{this.onSubmit}}
       @disabled={{this.formSubmitted}}
-      @class="permalink-add"
       @label="admin.permalink.form.add"
+      class="permalink-add"
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.hbs
index bb8b58b4e01..b1394fd38f1 100644
--- a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.hbs
@@ -15,9 +15,9 @@
 />
 
 <DButton
-  @type="submit"
-  @class="btn-default"
-  @action={{action "submitForm"}}
+  @action={{this.submitForm}}
   @disabled={{this.formSubmitted}}
   @label="admin.logs.screened_ips.form.add"
+  type="submit"
+  class="btn-default"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.hbs b/app/assets/javascripts/admin/addon/components/secret-value-list.hbs
index 7a3271212d3..a96f12bcb98 100644
--- a/app/assets/javascripts/admin/addon/components/secret-value-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/secret-value-list.hbs
@@ -3,10 +3,9 @@
     {{#each this.collection as |value index|}}
       <div class="value" data-index={{index}}>
         <DButton
-          @action={{action "removeValue"}}
-          @actionParam={{value}}
+          @action={{fn this.removeValue value}}
           @icon="times"
-          @class="remove-value-btn btn-small"
+          class="remove-value-btn btn-small"
         />
         <Input
           @value={{value.key}}
@@ -37,9 +36,9 @@
     placeholder={{this.setting.placeholder.value}}
   />
   <DButton
-    @action={{action "addValue"}}
+    @action={{this.addValue}}
     @icon="plus"
-    @class="add-value-btn btn-small"
+    class="add-value-btn btn-small"
   />
 </div>
 
diff --git a/app/assets/javascripts/admin/addon/components/simple-list.hbs b/app/assets/javascripts/admin/addon/components/simple-list.hbs
index aee35c0795b..500948310cc 100644
--- a/app/assets/javascripts/admin/addon/components/simple-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/simple-list.hbs
@@ -3,10 +3,9 @@
     {{#each this.collection as |value index|}}
       <div data-index={{index}} class="value">
         <DButton
-          @action={{action "removeValue"}}
-          @actionParam={{value}}
+          @action={{fn this.removeValue value}}
           @icon="times"
-          @class="remove-value-btn btn-small"
+          class="remove-value-btn btn-small"
         />
 
         <Input
@@ -18,14 +17,14 @@
 
         {{#if this.showUpDownButtons}}
           <DButton
-            @action={{action "shift" -1 index}}
+            @action={{fn this.shift -1 index}}
             @icon="arrow-up"
-            @class="shift-up-value-btn btn-small"
+            class="shift-up-value-btn btn-small"
           />
           <DButton
-            @action={{action "shift" 1 index}}
+            @action={{fn this.shift 1 index}}
             @icon="arrow-down"
-            @class="shift-down-value-btn btn-small"
+            class="shift-down-value-btn btn-small"
           />
         {{/if}}
       </div>
@@ -45,10 +44,9 @@
   />
 
   <DButton
-    @action={{action "addValue"}}
-    @actionParam={{this.newValue}}
+    @action={{fn this.addValue this.newValue}}
     @disabled={{this.inputEmpty}}
     @icon="plus"
-    @class="add-value-btn btn-small"
+    class="add-value-btn btn-small"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.hbs
index e0a05064c78..7c2ddf9e6ff 100644
--- a/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.hbs
@@ -1,7 +1,9 @@
 <DButton
   @label="admin.site_settings.uploaded_image_list.label"
-  @action={{action "showUploadModal"}}
-  @actionParam={{hash value=this.value setting=this.setting}}
+  @action={{fn
+    this.showUploadModal
+    (hash value=this.value setting=this.setting)
+  }}
 />
 <div class="desc">{{html-safe this.setting.description}}</div>
 <SettingValidationMessage @message={{this.validationMessage}} />
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/site-text-summary.hbs b/app/assets/javascripts/admin/addon/components/site-text-summary.hbs
index 8537031a802..d73f2be2ea9 100644
--- a/app/assets/javascripts/admin/addon/components/site-text-summary.hbs
+++ b/app/assets/javascripts/admin/addon/components/site-text-summary.hbs
@@ -1,8 +1,7 @@
 <DButton
   @label="admin.site_text.edit"
-  @class="btn-default edit"
-  @action={{this.editAction}}
-  @actionParam={{this.siteText}}
+  @action={{fn this.editAction this.siteText}}
+  class="btn-default edit"
 />
 <h3 class="site-text-id">{{this.siteText.id}}</h3>
 <div class="site-text-value">{{this.siteText.value}}</div>
diff --git a/app/assets/javascripts/admin/addon/components/theme-upload-add.hbs b/app/assets/javascripts/admin/addon/components/theme-upload-add.hbs
index 08ee5addf15..e53a861c0ce 100644
--- a/app/assets/javascripts/admin/addon/components/theme-upload-add.hbs
+++ b/app/assets/javascripts/admin/addon/components/theme-upload-add.hbs
@@ -34,14 +34,14 @@
     <DButton
       @action={{this.upload}}
       @disabled={{this.disabled}}
-      class="btn btn-primary"
       @icon="upload"
       @label="admin.customize.theme.upload"
+      class="btn-primary"
     />
     <DButton
-      class="btn-flat d-modal-cancel"
       @action={{@closeModal}}
       @label="cancel"
+      class="btn-flat d-modal-cancel"
     />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/themes-list.hbs b/app/assets/javascripts/admin/addon/components/themes-list.hbs
index 31020ee205a..b8861c18ba0 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/themes-list.hbs
@@ -1,20 +1,18 @@
 <div class="themes-list-header">
   <DButton
-    @action={{action "changeView"}}
-    @actionParam={{this.THEMES}}
-    @class={{concat "themes-tab " "tab " (if this.themesTabActive "active" "")}}
+    @action={{fn this.changeView this.THEMES}}
     @label="admin.customize.theme.title"
+    class={{concat-class "themes-tab" "tab" (if this.themesTabActive "active")}}
   />
   <DButton
-    @action={{action "changeView"}}
-    @actionParam={{this.COMPONENTS}}
-    @class={{concat
-      "components-tab "
-      "tab "
-      (if this.componentsTabActive "active" "")
-    }}
+    @action={{fn this.changeView this.COMPONENTS}}
     @label="admin.customize.theme.components"
     @icon="puzzle-piece"
+    class={{concat-class
+      "components-tab"
+      "tab"
+      (if this.componentsTabActive "active")
+    }}
   />
 </div>
 
@@ -74,6 +72,6 @@
     @action={{this.installModal}}
     @icon="upload"
     @label="admin.customize.install"
-    @class="btn-primary"
+    class="btn-primary"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/value-list.hbs b/app/assets/javascripts/admin/addon/components/value-list.hbs
index 3dec3f98fcf..ebca3e2bdd5 100644
--- a/app/assets/javascripts/admin/addon/components/value-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/value-list.hbs
@@ -3,10 +3,9 @@
     {{#each this.collection as |value index|}}
       <div data-index={{index}} class="value">
         <DButton
-          @action={{action "removeValue"}}
-          @actionParam={{value}}
+          @action={{fn this.removeValue value}}
           @icon="times"
-          @class="remove-value-btn btn-small"
+          class="remove-value-btn btn-small"
         />
 
         <Input
@@ -18,14 +17,14 @@
 
         {{#if this.showUpDownButtons}}
           <DButton
-            @action={{action "shift" -1 index}}
+            @action={{fn this.shift -1 index}}
             @icon="arrow-up"
-            @class="shift-up-value-btn btn-small"
+            class="shift-up-value-btn btn-small"
           />
           <DButton
-            @action={{action "shift" 1 index}}
+            @action={{fn this.shift 1 index}}
             @icon="arrow-down"
-            @class="shift-down-value-btn btn-small"
+            class="shift-down-value-btn btn-small"
           />
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.hbs b/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
index 0e3c6939599..ab3df1c8809 100644
--- a/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/addon/components/watched-word-form.hbs
@@ -77,11 +77,11 @@
 </div>
 
 <DButton
-  @type="submit"
-  @class="btn btn-primary"
-  @action={{action "submitForm"}}
+  @action={{this.submitForm}}
   @disabled={{this.submitDisabled}}
   @label="admin.watched_words.form.add"
+  type="submit"
+  class="btn-primary"
 />
 
 {{#if this.showMessage}}
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs
index 35f9f5b7661..dd94af3ff76 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs
@@ -40,12 +40,12 @@
         {{/if}}
       </div>
       <DButton
-        @class="btn-primary"
-        @action={{action "massAward"}}
-        @type="submit"
+        @action={{this.massAward}}
         @disabled={{this.massAwardButtonDisabled}}
         @icon="certificate"
         @label="admin.badges.mass_award.perform"
+        type="submit"
+        class="btn-primary"
       />
       <LinkTo @route="adminBadges.index" class="btn btn-normal">
         {{d-icon "times"}}
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
index e76a32e7cfa..1207f868085 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
@@ -103,9 +103,9 @@
           @onChange={{action (mut this.buffered.badge_grouping_id)}}
         />
         <DButton
-          @class="btn-default"
           @action={{route-action "editGroupings"}}
           @icon="pencil-alt"
+          class="btn-default"
         />
       </div>
     </div>
@@ -271,18 +271,18 @@
 
     <div class="buttons">
       <DButton
-        @class="btn-primary"
-        @action={{action "save"}}
-        @type="submit"
+        @action={{this.save}}
         @disabled={{this.saving}}
         @label="admin.badges.save"
+        type="submit"
+        class="btn-primary"
       />
       <span class="saving">{{this.savingStatus}}</span>
       {{#unless this.readOnly}}
         <DButton
-          @action={{action "destroyBadge"}}
-          @class="btn-danger"
+          @action={{this.destroyBadge}}
           @label="admin.badges.delete"
+          class="btn-danger"
         />
       {{/unless}}
     </div>
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
index 69adf77d1ea..3611a65fd05 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
@@ -1,8 +1,8 @@
 <DButton
-  @class="btn-primary"
   @action={{route-action "new"}}
   @icon="plus"
   @label="admin.api.new_key"
+  class="btn-primary"
 />
 
 {{#if this.model}}
@@ -56,18 +56,16 @@
               />
               {{#if k.revoked_at}}
                 <DButton
-                  @action={{action "undoRevokeKey"}}
-                  @actionParam={{k}}
+                  @action={{fn this.undoRevokeKey k}}
                   @icon="undo"
                   @title="admin.api.undo_revoke"
                 />
               {{else}}
                 <DButton
-                  @class="btn-danger"
-                  @action={{action "revokeKey"}}
-                  @actionParam={{k}}
+                  @action={{fn this.revokeKey k}}
                   @icon="times"
                   @title="admin.api.revoke"
+                  class="btn-danger"
                 />
               {{/if}}
             </td>
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
index 0858adeb187..d616fd390b4 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
@@ -15,8 +15,8 @@
       <DButton
         @icon="angle-right"
         @label="admin.api.continue"
-        @action={{action "continue"}}
-        @class="btn-primary"
+        @action={{this.continue}}
+        class="btn-primary"
       />
     </AdminFormRow>
   {{else}}
@@ -102,8 +102,8 @@
                 <td>
                   <DButton
                     @icon="link"
-                    @action={{action "showURLs" act.urls}}
-                    @class="btn-info"
+                    @action={{fn this.showURLs act.urls}}
+                    class="btn-info"
                   />
                 </td>
                 <td>
@@ -125,9 +125,9 @@
     <DButton
       @icon="check"
       @label="admin.api.save"
-      @action={{action "save"}}
-      @class="btn-primary"
+      @action={{this.save}}
       @disabled={{this.saveDisabled}}
+      class="btn-primary"
     />
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
index 644e85e60a1..5538ca92166 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
@@ -28,21 +28,17 @@
 
     <div class="controls">
       {{#if this.editingDescription}}
+        <DButton @action={{this.saveDescription}} @icon="check" class="ok" />
         <DButton
-          @class="ok"
-          @action={{action "saveDescription"}}
-          @icon="check"
-        />
-        <DButton
-          @class="cancel"
-          @action={{action "editDescription"}}
+          @action={{this.editDescription}}
           @icon="times"
+          class="cancel"
         />
       {{else}}
         <DButton
-          @class="btn-default"
-          @action={{action "editDescription"}}
+          @action={{this.editDescription}}
           @icon="pencil-alt"
+          class="btn-default"
         />
       {{/if}}
     </div>
@@ -84,25 +80,22 @@
     <div class="controls">
       {{#if this.model.revoked_at}}
         <DButton
-          @action={{action "undoRevokeKey"}}
-          @actionParam={{this.model}}
+          @action={{fn this.undoRevokeKey this.model}}
           @icon="undo"
           @label="admin.api.undo_revoke"
         />
         <DButton
-          @action={{action "deleteKey"}}
-          @actionParam={{this.model}}
+          @action={{fn this.deleteKey this.model}}
           @icon="trash-alt"
           @label="admin.api.delete"
-          @class="btn-danger"
+          class="btn-danger"
         />
       {{else}}
         <DButton
-          @class="btn-danger"
-          @action={{action "revokeKey"}}
-          @actionParam={{this.model}}
+          @action={{fn this.revokeKey this.model}}
           @icon="times"
           @label="admin.api.revoke"
+          class="btn-danger"
         />
       {{/if}}
     </div>
@@ -143,8 +136,8 @@
             <td>
               <DButton
                 @icon="link"
-                @action={{action "showURLs" scope.urls}}
-                @class="btn-info"
+                @action={{fn this.showURLs scope.urls}}
+                class="btn-info"
               />
             </td>
             <td>
diff --git a/app/assets/javascripts/admin/addon/templates/backups-index.hbs b/app/assets/javascripts/admin/addon/templates/backups-index.hbs
index fc6e24b8e20..aaf7bd5849a 100644
--- a/app/assets/javascripts/admin/addon/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/backups-index.hbs
@@ -10,21 +10,21 @@
 
   {{#if this.site.isReadOnly}}
     <DButton
-      @class="btn-default"
       @icon="far-eye"
-      @action={{action "toggleReadOnlyMode"}}
+      @action={{this.toggleReadOnlyMode}}
       @disabled={{this.status.isOperationRunning}}
       @title="admin.backups.read_only.disable.title"
       @label="admin.backups.read_only.disable.label"
+      class="btn-default"
     />
   {{else}}
     <DButton
-      @class="btn-default"
       @icon="far-eye"
-      @action={{action "toggleReadOnlyMode"}}
+      @action={{this.toggleReadOnlyMode}}
       @disabled={{this.status.isOperationRunning}}
       @title="admin.backups.read_only.enable.title"
       @label="admin.backups.read_only.enable.label"
+      class="btn-default"
     />
   {{/if}}
   <div class="backup-message">
@@ -50,47 +50,42 @@
         <td class="backup-controls">
           <div>
             <DButton
-              @class="btn-default download"
-              @action={{action "download"}}
-              @actionParam={{backup}}
+              @action={{fn this.download backup}}
               @icon="download"
               @title="admin.backups.operations.download.title"
               @label="admin.backups.operations.download.label"
+              class="btn-default download"
             />
             {{#if this.status.isOperationRunning}}
               <DButton
                 @icon="far-trash-alt"
-                @action={{route-action "destroyBackup"}}
-                @actionParam={{backup}}
-                @class="btn-danger"
+                @action={{fn (route-action "destroyBackup") backup}}
                 @disabled="true"
                 @title="admin.backups.operations.is_running"
+                class="btn-danger"
               />
               <DButton
                 @icon="play"
-                @action={{route-action "startRestore"}}
-                @actionParam={{backup}}
+                @action={{fn (route-action "startRestore") backup}}
                 @disabled={{this.status.restoreDisabled}}
-                @class="btn-default"
                 @title={{this.restoreTitle}}
                 @label="admin.backups.operations.restore.label"
+                class="btn-default"
               />
             {{else}}
               <DButton
                 @icon="far-trash-alt"
-                @action={{route-action "destroyBackup"}}
-                @actionParam={{backup}}
-                @class="btn-danger"
+                @action={{fn (route-action "destroyBackup") backup}}
                 @title="admin.backups.operations.destroy.title"
+                class="btn-danger"
               />
               <DButton
                 @icon="play"
-                @action={{route-action "startRestore"}}
-                @actionParam={{backup}}
+                @action={{fn (route-action "startRestore") backup}}
                 @disabled={{this.status.restoreDisabled}}
-                @class="btn-default btn-restore"
                 @title={{this.restoreTitle}}
                 @label="admin.backups.operations.restore.label"
+                class="btn-default btn-restore"
               />
             {{/if}}
           </div>
diff --git a/app/assets/javascripts/admin/addon/templates/backups.hbs b/app/assets/javascripts/admin/addon/templates/backups.hbs
index 173d064c1d2..cb11e130347 100644
--- a/app/assets/javascripts/admin/addon/templates/backups.hbs
+++ b/app/assets/javascripts/admin/addon/templates/backups.hbs
@@ -12,28 +12,28 @@
           {{#if this.model.canRollback}}
             <DButton
               @action={{route-action "rollback"}}
-              @class="btn-default btn-rollback"
               @label="admin.backups.operations.rollback.label"
               @title="admin.backups.operations.rollback.title"
               @icon="ambulance"
               @disabled={{this.rollbackDisabled}}
+              class="btn-default btn-rollback"
             />
           {{/if}}
           {{#if this.model.isOperationRunning}}
             <DButton
               @action={{route-action "cancelOperation"}}
-              @class="btn-danger"
               @title="admin.backups.operations.cancel.title"
               @label="admin.backups.operations.cancel.label"
               @icon="times"
+              class="btn-danger"
             />
           {{else}}
             <DButton
               @action={{route-action "showStartBackupModal"}}
-              @class="btn-primary"
               @title="admin.backups.operations.backup.title"
               @label="admin.backups.operations.backup.label"
               @icon="rocket"
+              class="btn-primary"
             />
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
index 133fdbaaff2..f4357bf6f61 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
@@ -7,23 +7,23 @@
     <div class="controls">
       {{#unless this.model.theme_id}}
         <DButton
-          @class="btn-primary"
-          @action={{action "save"}}
+          @action={{this.save}}
           @disabled={{this.model.disableSave}}
           @label="admin.customize.save"
+          class="btn-primary"
         />
       {{/unless}}
       <DButton
-        @class="btn-default"
-        @action={{action "copy" this.model}}
+        @action={{fn this.copy this.model}}
         @icon="copy"
         @label="admin.customize.copy"
+        class="btn-default"
       />
       <DButton
-        @class="btn-default copy-to-clipboard"
-        @action={{action "copyToClipboard" this.model}}
+        @action={{fn this.copyToClipboard this.model}}
         @icon="far-clipboard"
         @label="admin.customize.copy_to_clipboard"
+        class="btn-default copy-to-clipboard"
       />
       <span
         class="saving {{unless this.model.savingStatus 'hidden'}}"
@@ -38,10 +38,10 @@
         </span>
       {{else}}
         <DButton
-          @action={{action "destroy"}}
-          @class="btn-danger"
+          @action={{this.destroy}}
           @icon="far-trash-alt"
           @label="admin.customize.delete"
+          class="btn-danger"
         />
       {{/if}}
     </div>
@@ -100,22 +100,24 @@
               <td class="actions">
                 {{#unless this.model.theme_id}}
                   <DButton
-                    @class={{concat
-                      "btn-default revert "
-                      (unless c.savedIsOverriden "invisible")
-                    }}
-                    @action={{action "revert" c}}
+                    @action={{fn this.revert c}}
                     @title="admin.customize.colors.revert_title"
                     @label="admin.customize.colors.revert"
+                    class={{concat-class
+                      "btn-default"
+                      "revert"
+                      (unless c.savedIsOverriden "invisible")
+                    }}
                   />
                   <DButton
-                    @class={{concat
-                      "btn-default undo "
-                      (unless c.changed "invisible")
-                    }}
-                    @action={{action "undo" c}}
+                    @action={{fn this.undo c}}
                     @title="admin.customize.colors.undo_title"
                     @label="admin.customize.colors.undo"
+                    class={{concat-class
+                      "btn-default"
+                      "undo"
+                      (unless c.changed "invisible")
+                    }}
                   />
                 {{/unless}}
               </td>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
index 378551739a0..e1687c926c8 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
@@ -19,10 +19,10 @@
   </ul>
 
   <DButton
-    @class="btn-default"
-    @action={{action "newColorScheme"}}
+    @action={{this.newColorScheme}}
     @icon="plus"
     @label="admin.customize.new"
+    class="btn-default"
   />
 </div>
 
diff --git a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
index 806ffb0428f..41cc86fe1f8 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
@@ -7,10 +7,10 @@
 <div class="admin-footer">
   <div class="buttons">
     <DButton
-      @action={{action "save"}}
+      @action={{this.save}}
       @disabled={{this.saveDisabled}}
-      @class="btn-primary"
       @translatedLabel={{this.saveButtonText}}
+      class="btn-primary"
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-form-templates-index.hbs b/app/assets/javascripts/admin/addon/templates/customize-form-templates-index.hbs
index 2a41eedce4f..1fa6e836152 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-form-templates-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-form-templates-index.hbs
@@ -26,10 +26,10 @@
   {{/if}}
 
   <DButton
-    @class="btn-primary"
     @label="admin.form_templates.new_template"
     @title="admin.form_templates.new_template"
     @icon="plus"
     @action={{this.newTemplate}}
+    class="btn-primary"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
index d8accf839d3..433c47f3cee 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
@@ -14,11 +14,11 @@
     @saveDisabled={{this.saveDisabled}}
   >
     <DButton
-      @class="btn-default"
       @disabled={{this.resetDisabled}}
       @icon="undo"
-      @action={{action "reset"}}
+      @action={{this.reset}}
       @label="admin.settings.reset"
+      class="btn-default"
     />
   </SaveControls>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
index 6397c210f93..dade44c4a72 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
@@ -3,9 +3,9 @@
     <div class="editor-information">
       <DButton
         @title="go_back"
-        @action={{action "goBack"}}
+        @action={{this.goBack}}
         @icon="chevron-left"
-        @class="btn-small editor-back-button"
+        class="btn-small editor-back-button"
       />
 
       <span class="editor-theme-name-wrapper">
@@ -49,10 +49,10 @@
 
       <div class="buttons">
         <DButton
-          @action={{action "save"}}
+          @action={{this.save}}
           @disabled={{this.saveDisabled}}
-          @class="btn-primary"
           @translatedLabel={{this.saveButtonText}}
+          class="btn-primary"
         />
       </div>
     </div>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs
index 57f2daa53ff..1f8d26361a9 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs
@@ -10,7 +10,7 @@
         @action={{route-action "installModal"}}
         @icon="upload"
         @label="admin.customize.install"
-        @class="btn-primary"
+        class="btn-primary"
       />
     </div>
     <div class="external-resources">
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
index 3de57309c53..8a2acc2e1c0 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
@@ -10,21 +10,21 @@
     {{#if this.editingName}}
       <TextField @value={{this.model.name}} @autofocus="true" />
       <DButton
-        @action={{action "finishedEditingName"}}
-        @class="btn-primary btn-small submit-edit"
+        @action={{this.finishedEditingName}}
         @icon="check"
+        class="btn-primary btn-small submit-edit"
       />
       <DButton
-        @action={{action "cancelEditingName"}}
-        @class="btn-small cancel-edit"
+        @action={{this.cancelEditingName}}
         @icon="times"
+        class="btn-small cancel-edit"
       />
     {{else}}
       <span>{{this.model.name}}</span>
       <DButton
-        @action={{action "startEditingName"}}
+        @action={{this.startEditingName}}
         @icon="pencil-alt"
-        @class="btn-small"
+        class="btn-small"
       />
     {{/if}}
   </div>
@@ -59,16 +59,16 @@
       {{/if}}
 
       <DButton
-        @action={{action "updateToLatest"}}
+        @action={{this.updateToLatest}}
         @icon="download"
-        @class="btn-primary finish-install"
         @label="admin.customize.theme.finish_install"
+        class="btn-primary finish-install"
       />
       <DButton
-        @action={{action "destroyTheme"}}
+        @action={{this.destroyTheme}}
         @label="admin.customize.delete"
         @icon="trash-alt"
-        @class="btn-danger"
+        class="btn-danger"
       />
 
       <span class="status-message">
@@ -108,10 +108,10 @@
           {{i18n "admin.customize.theme.disabled"}}
         {{/if}}
         <DButton
-          @class="btn-default"
-          @action={{action "enableComponent"}}
+          @action={{this.enableComponent}}
           @icon="check"
           @label="admin.customize.theme.enable"
+          class="btn-default"
         />
       </div>
     {{/unless}}
@@ -181,17 +181,17 @@
 
             {{#if this.model.remote_theme.commits_behind}}
               <DButton
-                @action={{action "updateToLatest"}}
+                @action={{this.updateToLatest}}
                 @icon="download"
-                @class="btn-primary"
                 @label="admin.customize.theme.update_to_latest"
+                class="btn-primary"
               />
             {{else}}
               <DButton
-                @action={{action "checkForThemeUpdates"}}
+                @action={{this.checkForThemeUpdates}}
                 @icon="sync"
-                @class="btn-default"
                 @label="admin.customize.theme.check_for_updates"
+                class="btn-default"
               />
             {{/if}}
 
@@ -293,14 +293,14 @@
           <div class="setting-controls">
             {{#if this.colorSchemeChanged}}
               <DButton
-                @action={{action "changeScheme"}}
-                @class="ok submit-edit"
+                @action={{this.changeScheme}}
                 @icon="check"
+                class="ok submit-edit"
               />
               <DButton
-                @action={{action "cancelChangeScheme"}}
-                @class="cancel cancel-edit"
+                @action={{this.cancelChangeScheme}}
                 @icon="times"
+                class="cancel cancel-edit"
               />
             {{/if}}
           </div>
@@ -349,9 +349,9 @@
         {{/if}}
 
         <DButton
-          @class="btn-default edit"
-          @action={{action "editTheme"}}
+          @action={{this.editTheme}}
           @label="admin.customize.theme.edit_css_html"
+          class="btn-default edit"
         />
       </div>
 
@@ -369,10 +369,9 @@
                   >{{upload.filename}}</a></span>
                 <span class="col">
                   <DButton
-                    @action={{action "removeUpload"}}
-                    @actionParam={{upload}}
-                    @class="second btn-default btn-default cancel-edit"
+                    @action={{fn this.removeUpload upload}}
                     @icon="times"
+                    class="second btn-default btn-default cancel-edit"
                   />
                 </span>
               </li>
@@ -384,10 +383,10 @@
             }}</div>
         {{/if}}
         <DButton
-          @action={{action "addUploadModal"}}
-          @class="btn-default"
+          @action={{this.addUploadModal}}
           @icon="plus"
           @label="admin.customize.theme.add"
+          class="btn-default"
         />
       </div>
     {{/unless}}
@@ -471,48 +470,46 @@
 
       {{#if this.showConvert}}
         <DButton
-          @action={{action "switchType"}}
+          @action={{this.switchType}}
           @label="admin.customize.theme.convert"
           @icon={{this.convertIcon}}
-          @class="btn-default btn-normal"
           @title={{this.convertTooltip}}
+          class="btn-default btn-normal"
         />
       {{/if}}
 
       {{#if this.model.component}}
         {{#if this.model.enabled}}
           <DButton
-            @class="btn-default"
-            @action={{action "disableComponent"}}
+            @action={{this.disableComponent}}
             @icon="ban"
             @label="admin.customize.theme.disable"
+            class="btn-default"
           />
         {{else}}
           <DButton
-            @class="btn-default"
-            @action={{action "enableComponent"}}
+            @action={{this.enableComponent}}
             @icon="check"
             @label="admin.customize.theme.enable"
+            class="btn-default"
           />
         {{/if}}
       {{/if}}
       {{#if this.hasSettings}}
-
         <DButton
           @action={{this.showThemeSettingsEditor}}
           @label="admin.customize.theme.settings_editor"
           @icon="pen"
-          @class="btn-default btn-normal"
           @title="admin.customize.theme.settings_editor"
+          class="btn-default btn-normal"
         />
       {{/if}}
       <DButton
-        @action={{action "destroyTheme"}}
+        @action={{this.destroyTheme}}
         @label="admin.customize.delete"
         @icon="trash-alt"
-        @class="btn-danger"
+        class="btn-danger"
       />
     </div>
   {{/if}}
-
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/email-index.hbs b/app/assets/javascripts/admin/addon/templates/email-index.hbs
index 4c71b953a90..90a09cbea93 100644
--- a/app/assets/javascripts/admin/addon/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-index.hbs
@@ -26,11 +26,11 @@
             @placeholderKey="admin.email.test_email_address"
           />
           <DButton
-            @class="btn-primary"
-            @action={{action "sendTestEmail"}}
+            @action={{this.sendTestEmail}}
             @disabled={{this.sendTestEmailDisabled}}
             @label="admin.email.send_test"
-            @type="submit"
+            type="submit"
+            class="btn-primary"
           />
           {{#if this.sentTestEmailMessage}}
             <span class="result-message">{{this.sentTestEmailMessage}}</span>
diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
index 4e14d37d007..3fb6fa0c84b 100644
--- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
@@ -12,9 +12,9 @@
         @options={{hash maximum=1}}
       />
       <DButton
-        @class="btn-primary digest-refresh-button"
-        @action={{action "refresh"}}
+        @action={{this.refresh}}
         @label="admin.email.refresh"
+        class="btn-primary digest-refresh-button"
       />
       <div class="toggle">
         <label>{{i18n "admin.email.format"}}</label>
@@ -51,10 +51,10 @@
               @placeholderKey="admin.email.test_email_address"
             />
             <DButton
-              @class="btn-default"
-              @action={{action "sendEmail"}}
+              @action={{this.sendEmail}}
               @disabled={{this.sendEmailDisabled}}
               @label="admin.email.send_digest"
+              class="btn-default"
             />
             {{#if this.sentEmail}}
               <span class="result-message">{{i18n
diff --git a/app/assets/javascripts/admin/addon/templates/embedding.hbs b/app/assets/javascripts/admin/addon/templates/embedding.hbs
index b382e2dc2cb..f9301df3a9e 100644
--- a/app/assets/javascripts/admin/addon/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/addon/templates/embedding.hbs
@@ -19,9 +19,9 @@
 
   <DButton
     @label="admin.embedding.add_host"
-    @action={{action "addHost"}}
+    @action={{this.addHost}}
     @icon="plus"
-    @class="btn-primary add-host"
+    class="btn-primary add-host"
   />
 </div>
 
@@ -87,9 +87,9 @@
   <div class="embedding-secondary">
     <DButton
       @label="admin.embedding.save"
-      @action={{action "saveChanges"}}
-      @class="btn-primary embed-save"
+      @action={{this.saveChanges}}
       @disabled={{this.embedding.isSaving}}
+      class="btn-primary embed-save"
     />
 
     {{#if this.saved}}{{i18n "saved"}}{{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/emojis.hbs b/app/assets/javascripts/admin/addon/templates/emojis.hbs
index 721cdd44b73..334a8a169a0 100644
--- a/app/assets/javascripts/admin/addon/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/addon/templates/emojis.hbs
@@ -41,9 +41,9 @@
             <td>{{e.group}}</td>
             <td class="action">
               <DButton
-                @action={{action "destroyEmoji" e}}
-                @class="btn-danger"
+                @action={{fn this.destroyEmoji e}}
                 @icon="far-trash-alt"
+                class="btn-danger"
               />
             </td>
           </tr>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs
index b8b68b28fa8..bf55a179315 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs
@@ -3,11 +3,11 @@
 </p>
 
 <DButton
-  @class="btn-default screened-email-export"
-  @action={{action "exportScreenedEmailList"}}
+  @action={{this.exportScreenedEmailList}}
   @title="admin.export_csv.button_title.screened_email"
   @icon="download"
   @label="admin.export_csv.button_text"
+  class="btn-default screened-email-export"
 />
 
 <br />
@@ -47,8 +47,7 @@
             <td class="ip_address">{{item.ip_address}}</td>
             <td class="action">
               <DButton
-                @action={{action "clearBlock"}}
-                @actionParam={{item}}
+                @action={{fn this.clearBlock item}}
                 @icon="check"
                 @label="admin.logs.screened_emails.actions.allow"
               />
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
index 0beb6a0b1e6..a385b79aaa9 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
@@ -10,11 +10,11 @@
       @autocapitalize="off"
     />
     <DButton
-      @class="btn-default"
-      @action={{action "exportScreenedIpList"}}
+      @action={{this.exportScreenedIpList}}
       @icon="download"
       @title="admin.export_csv.button_title.screened_ip"
       @label="admin.export_csv.button_text"
+      class="btn-default"
     />
   </div>
 
@@ -83,44 +83,39 @@
             <td class="col actions">
               {{#if item.editing}}
                 <DButton
-                  @class="btn-default"
-                  @action={{action "save"}}
-                  @actionParam={{item}}
+                  @action={{fn this.save item}}
                   @label="admin.logs.save"
+                  class="btn-default"
                 />
                 <DButton
-                  @class="btn-flat"
-                  @action={{action "cancel" item}}
+                  @action={{fn this.cancel item}}
                   @translatedLabel={{i18n "cancel"}}
+                  class="btn-flat"
                 />
               {{else}}
                 <DButton
-                  @class="btn-default btn-danger"
-                  @action={{action "destroyRecord"}}
-                  @actionParam={{item}}
+                  @action={{fn this.destroyRecord item}}
                   @icon="far-trash-alt"
+                  class="btn-default btn-danger"
                 />
                 <DButton
-                  @class="btn-default"
-                  @action={{action "edit"}}
-                  @actionParam={{item}}
+                  @action={{fn this.edit item}}
                   @icon="pencil-alt"
+                  class="btn-default"
                 />
                 {{#if item.isBlocked}}
                   <DButton
-                    @class="btn-default"
-                    @action={{action "allow"}}
-                    @actionParam={{item}}
+                    @action={{fn this.allow item}}
                     @icon="check"
                     @label="admin.logs.screened_ips.actions.do_nothing"
+                    class="btn-default"
                   />
                 {{else}}
                   <DButton
-                    @class="btn-default"
-                    @action={{action "block"}}
-                    @actionParam={{item}}
+                    @action={{fn this.block item}}
                     @icon="ban"
                     @label="admin.logs.screened_ips.actions.block"
+                    class="btn-default"
                   />
                 {{/if}}
               {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs
index 75b165d4448..43afefdfa2e 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs
@@ -2,11 +2,11 @@
   {{i18n "admin.logs.screened_urls.description"}}
 </p>
 <DButton
-  @class="btn-default"
-  @action={{action "exportScreenedUrlList"}}
+  @action={{this.exportScreenedUrlList}}
   @title="admin.export_csv.button_title.screened_url"
   @icon="download"
   @label="admin.export_csv.button_text"
+  class="btn-default"
 />
 <br />
 
diff --git a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
index 911caef1ae6..0c629f35c81 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
@@ -72,10 +72,10 @@
   {{/if}}
 
   <DButton
-    @class="btn-default"
-    @action={{action "exportStaffActionLogs"}}
+    @action={{this.exportStaffActionLogs}}
     @label="admin.export_csv.button_text"
     @icon="download"
+    class="btn-default"
   />
 </div>
 
diff --git a/app/assets/javascripts/admin/addon/templates/permalinks.hbs b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
index 8b2f83b4bf4..fb572b0c7fe 100644
--- a/app/assets/javascripts/admin/addon/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
@@ -63,10 +63,9 @@
               </td>
               <td class="col action" style="text-align: right;">
                 <DButton
-                  @action={{action "destroyRecord"}}
-                  @actionParam={{pl}}
+                  @action={{fn this.destroyRecord pl}}
                   @icon="far-trash-alt"
-                  @class="btn-danger"
+                  class="btn-danger"
                 />
               </td>
             </tr>
diff --git a/app/assets/javascripts/admin/addon/templates/site-settings.hbs b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
index 673783dc8e0..4aba5d691ce 100644
--- a/app/assets/javascripts/admin/addon/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
@@ -1,11 +1,7 @@
 <div class="admin-controls">
   <div class="controls">
     <div class="inline-form">
-      <DButton
-        @action={{action "toggleMenu"}}
-        @class="menu-toggle"
-        @icon="bars"
-      />
+      <DButton @action={{this.toggleMenu}} @icon="bars" class="menu-toggle" />
       <TextField
         @id="setting-filter"
         @value={{this.filter}}
@@ -13,10 +9,10 @@
         @class="no-blur"
       />
       <DButton
-        @class="btn-default"
-        @id="clear-filter"
-        @action={{action "clearFilter"}}
+        @action={{this.clearFilter}}
         @label="admin.site_settings.clear_filter"
+        id="clear-filter"
+        class="btn-default"
       />
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
index 33eee6fc3f1..effb4947c6f 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
@@ -16,9 +16,9 @@
       <h5>{{i18n "admin.site_text.outdated.new_default"}}</h5>
       <p>{{this.siteText.new_default}}</p>
       <DButton
-        @class="btn-default"
-        @action={{action "dismissOutdated"}}
+        @action={{this.dismissOutdated}}
         @label="admin.site_text.outdated.dismiss"
+        class="btn-default"
       />
     </div>
   {{/if}}
@@ -43,9 +43,9 @@
   >
     {{#if this.siteText.can_revert}}
       <DButton
-        @action={{action "revertChanges"}}
+        @action={{this.revertChanges}}
         @label="admin.site_text.revert"
-        @class="revert-site-text"
+        class="revert-site-text"
       />
     {{/if}}
   </SaveControls>
@@ -58,5 +58,4 @@
     {{d-icon "arrow-left"}}
     {{i18n "admin.site_text.go_back"}}
   </LinkTo>
-
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
index 2a6c64a6125..c9c1587cc51 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
@@ -12,10 +12,10 @@
   <div class="reseed">
     <DButton
       @action={{route-action "showReseedModal"}}
-      @class="btn-default"
       @label="admin.reseed.action.label"
       @title="admin.reseed.action.title"
       @icon="sync"
+      class="btn-default"
     />
   </div>
 
diff --git a/app/assets/javascripts/admin/addon/templates/user-badges.hbs b/app/assets/javascripts/admin/addon/templates/user-badges.hbs
index 702043e09c6..577015618fc 100644
--- a/app/assets/javascripts/admin/addon/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-badges.hbs
@@ -33,10 +33,10 @@
             }}</small>
         </div>
         <DButton
-          @class="btn-primary"
           @action={{this.performGrantBadge}}
-          @type="submit"
           @label="admin.badges.grant"
+          type="submit"
+          class="btn-primary"
         />
       </form>
     {{/if}}
@@ -71,14 +71,14 @@
             <td>
               {{#if userBadge.grouped}}
                 <DButton
-                  @action={{action "expandGroup" userBadge}}
+                  @action={{fn this.expandGroup userBadge}}
                   @label="admin.badges.expand"
                 />
               {{else}}
                 <DButton
-                  @class="btn-danger"
-                  @action={{action "revokeBadge" userBadge}}
+                  @action={{fn this.revokeBadge userBadge}}
                   @label="admin.badges.revoke"
+                  class="btn-danger"
                 />
               {{/if}}
             </td>
diff --git a/app/assets/javascripts/admin/addon/templates/user-fields.hbs b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
index 3c006b5b9bf..79b96ac39f8 100644
--- a/app/assets/javascripts/admin/addon/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
@@ -10,19 +10,18 @@
         @fieldTypes={{this.fieldTypes}}
         @firstField={{this.firstField}}
         @lastField={{this.lastField}}
-        @destroyAction={{action "destroyField"}}
-        @moveUpAction={{action "moveUp"}}
-        @moveDownAction={{action "moveDown"}}
+        @destroyAction={{this.destroyField}}
+        @moveUpAction={{this.moveUp}}
+        @moveDownAction={{this.moveDown}}
       />
     {{/each}}
   {{/if}}
 
   <DButton
     @disabled={{this.createDisabled}}
-    @class="btn-primary"
-    @action={{action "createField"}}
+    @action={{this.createField}}
     @label="admin.user_fields.create"
     @icon="plus"
+    class="btn-primary"
   />
-
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs
index a02eac646bd..2507aa12ee2 100644
--- a/app/assets/javascripts/admin/addon/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs
@@ -9,20 +9,19 @@
 
     {{#if this.model.can_view_action_logs}}
       <DButton
-        @action={{action "viewActionLogs"}}
-        @class="btn-default"
-        @actionParam={{this.model.username}}
+        @action={{fn this.viewActionLogs this.model.username}}
         @icon="far-list-alt"
         @label="admin.user.action_logs"
+        class="btn-default"
       />
     {{/if}}
     {{#if this.model.active}}
       {{#if this.currentUser.admin}}
         <DButton
-          @class="btn-default"
-          @action={{action "logOut"}}
+          @action={{this.logOut}}
           @icon="power-off"
           @label="admin.user.log_out"
+          class="btn-default"
         />
       {{/if}}
     {{/if}}
@@ -66,12 +65,11 @@
           <a href="mailto:{{this.model.email}}">{{this.model.email}}</a>
         {{else}}
           <DButton
-            @class="btn-default"
-            @action={{route-action "checkEmail"}}
-            @actionParam={{this.model}}
+            @action={{fn (route-action "checkEmail") this.model}}
             @icon="envelope"
             @label="admin.users.check_email.text"
             @title="admin.users.check_email.title"
+            class="btn-default"
           />
         {{/if}}
       </div>
@@ -102,12 +100,11 @@
           {{/if}}
         {{else}}
           <DButton
-            @action={{route-action "checkEmail"}}
-            @class="btn-default"
-            @actionParam={{this.model}}
+            @action={{fn (route-action "checkEmail") this.model}}
             @icon="envelope"
             @label="admin.users.check_email.text"
             @title="admin.users.check_email.title"
+            class="btn-default"
           />
         {{/if}}
       </div>
@@ -135,10 +132,10 @@
       <div class="controls">
         {{#if this.model.canResetBounceScore}}
           <DButton
-            @class="btn-default"
-            @action={{action "resetBounceScore"}}
+            @action={{this.resetBounceScore}}
             @label="admin.user.reset_bounce_score.label"
             @title="admin.user.reset_bounce_score.title"
+            class="btn-default"
           />
         {{/if}}
         {{this.model.bounceScoreExplanation}}
@@ -152,12 +149,11 @@
           {{this.associatedAccounts}}
         {{else}}
           <DButton
-            @class="btn-default"
-            @action={{route-action "checkEmail"}}
-            @actionParam={{this.model}}
+            @action={{fn (route-action "checkEmail") this.model}}
             @icon="envelope"
             @label="admin.users.check_email.text"
             @title="admin.users.check_email.title"
+            class="btn-default"
           />
         {{/if}}
       </div>
@@ -235,10 +231,10 @@
     <div class="controls">
       {{#if this.canDisableSecondFactor}}
         <DButton
-          @class="btn-default"
-          @action={{action "disableSecondFactor"}}
+          @action={{this.disableSecondFactor}}
           @icon="unlock-alt"
           @label="user.second_factor.disable"
+          class="btn-default"
         />
       {{/if}}
     </div>
@@ -295,10 +291,10 @@
         {{else}}
           {{#if this.model.can_approve}}
             <DButton
-              @class="btn-default"
-              @action={{action "approve"}}
+              @action={{this.approve}}
               @icon="check"
               @label="admin.user.approve"
+              class="btn-default"
             />
           {{/if}}
         {{/if}}
@@ -313,27 +309,27 @@
       {{#if this.model.active}}
         {{#if this.model.can_deactivate}}
           <DButton
-            @class="btn-default"
-            @action={{action "deactivate"}}
+            @action={{this.deactivate}}
             @label="admin.user.deactivate_account"
+            class="btn-default"
           />
           {{i18n "admin.user.deactivate_explanation"}}
         {{/if}}
       {{else}}
         {{#if this.model.can_send_activation_email}}
           <DButton
-            @class="btn-default"
-            @action={{action "sendActivationEmail"}}
+            @action={{this.sendActivationEmail}}
             @icon="envelope"
             @label="admin.user.send_activation_email"
+            class="btn-default"
           />
         {{/if}}
         {{#if this.model.can_activate}}
           <DButton
-            @class="btn-default"
-            @action={{action "activate"}}
+            @action={{this.activate}}
             @icon="check"
             @label="admin.user.activate"
+            class="btn-default"
           />
         {{/if}}
       {{/if}}
@@ -354,9 +350,9 @@
       </div>
       <div class="controls">
         <DButton
-          @class="btn-default"
           @href="/admin/api/keys"
           @label="admin.api.manage_keys"
+          class="btn-default"
         />
       </div>
     </div>
@@ -368,18 +364,18 @@
     <div class="controls">
       {{#if this.model.can_revoke_admin}}
         <DButton
-          @class="btn-default"
-          @action={{action "revokeAdmin"}}
+          @action={{this.revokeAdmin}}
           @icon="shield-alt"
           @label="admin.user.revoke_admin"
+          class="btn-default"
         />
       {{/if}}
       {{#if this.model.can_grant_admin}}
         <DButton
-          @class="btn-default grant-admin"
-          @action={{action "grantAdmin"}}
+          @action={{this.grantAdmin}}
           @icon="shield-alt"
           @label="admin.user.grant_admin"
+          class="btn-default grant-admin"
         />
       {{/if}}
     </div>
@@ -391,18 +387,18 @@
     <div class="controls">
       {{#if this.model.can_revoke_moderation}}
         <DButton
-          @class="btn-default"
-          @action={{action "revokeModeration"}}
+          @action={{this.revokeModeration}}
           @icon="shield-alt"
           @label="admin.user.revoke_moderation"
+          class="btn-default"
         />
       {{/if}}
       {{#if this.model.can_grant_moderation}}
         <DButton
-          @class="btn-default"
-          @action={{action "grantModeration"}}
+          @action={{this.grantModeration}}
           @icon="shield-alt"
           @label="admin.user.grant_moderation"
+          class="btn-default"
         />
       {{/if}}
     </div>
@@ -421,14 +417,14 @@
       {{#if this.model.dirty}}
         <div>
           <DButton
-            @class="ok no-text"
-            @action={{action "saveTrustLevel"}}
+            @action={{this.saveTrustLevel}}
             @icon="check"
+            class="ok no-text"
           />
           <DButton
-            @class="cancel no-text"
-            @action={{action "restoreTrustLevel"}}
+            @action={{this.restoreTrustLevel}}
             @icon="times"
+            class="cancel no-text"
           />
         </div>
       {{/if}}
@@ -438,18 +434,16 @@
         {{#if this.hasLockedTrustLevel}}
           {{d-icon "lock" title="admin.user.trust_level_locked_tip"}}
           <DButton
-            @class="btn-default"
-            @action={{action "lockTrustLevel"}}
-            @actionParam={{false}}
+            @action={{fn this.lockTrustLevel false}}
             @label="admin.user.unlock_trust_level"
+            class="btn-default"
           />
         {{else}}
           {{d-icon "unlock" title="admin.user.trust_level_unlocked_tip"}}
           <DButton
-            @class="btn-default"
-            @action={{action "lockTrustLevel"}}
-            @actionParam={{true}}
+            @action={{fn this.lockTrustLevel true}}
             @label="admin.user.lock_trust_level"
+            class="btn-default"
           />
         {{/if}}
       {{/if}}
@@ -484,19 +478,19 @@
     <div class="controls">
       {{#if this.model.suspended}}
         <DButton
-          @class="btn-danger unsuspend-user"
-          @action={{action "unsuspend"}}
+          @action={{this.unsuspend}}
           @icon="ban"
           @label="admin.user.unsuspend"
+          class="btn-danger unsuspend-user"
         />
         {{i18n "admin.user.suspended_explanation"}}
       {{else}}
         {{#if this.model.canSuspend}}
           <DButton
-            @class="btn-danger suspend-user"
-            @action={{action "showSuspendModal"}}
+            @action={{this.showSuspendModal}}
             @icon="ban"
             @label="admin.user.suspend"
+            class="btn-danger suspend-user"
           />
           {{i18n "admin.user.suspended_explanation"}}
         {{/if}}
@@ -542,18 +536,18 @@
       >
         {{#if this.model.silenced}}
           <DButton
-            @class="btn-danger unsilence-user"
-            @action={{action "unsilence"}}
+            @action={{this.unsilence}}
             @icon="microphone-slash"
             @label="admin.user.unsilence"
+            class="btn-danger unsilence-user"
           />
           {{i18n "admin.user.silence_explanation"}}
         {{else}}
           <DButton
-            @class="btn-danger silence-user"
-            @action={{action "showSilenceModal"}}
+            @action={{this.showSilenceModal}}
             @icon="microphone-slash"
             @label="admin.user.silence"
+            class="btn-danger silence-user"
           />
           {{i18n "admin.user.silence_explanation"}}
         {{/if}}
@@ -589,9 +583,9 @@
         <div class="controls">
           <DButton
             @label="admin.user.clear_penalty_history.title"
-            @class="btn-default"
             @icon="times"
-            @action={{action "clearPenaltyHistory"}}
+            @action={{this.clearPenaltyHistory}}
+            class="btn-default"
           />
           {{i18n "admin.user.clear_penalty_history.description"}}
         </div>
@@ -620,15 +614,11 @@
       </div>
       {{#if this.customGroupsDirty}}
         <div class="controls">
-          <DButton
-            @icon="check"
-            @class="ok"
-            @action={{action "saveCustomGroups"}}
-          />
+          <DButton @icon="check" @action={{this.saveCustomGroups}} class="ok" />
           <DButton
             @icon="times"
-            @class="cancel"
-            @action={{action "resetCustomGroups"}}
+            @action={{this.resetCustomGroups}}
+            class="cancel"
           />
         </div>
       {{/if}}
@@ -648,13 +638,13 @@
           <div class="controls">
             <DButton
               @icon="check"
-              @class="ok"
-              @action={{action "savePrimaryGroup"}}
+              @action={{this.savePrimaryGroup}}
+              class="ok"
             />
             <DButton
               @icon="times"
-              @class="cancel"
-              @action={{action "resetPrimaryGroup"}}
+              @action={{this.resetPrimaryGroup}}
+              class="cancel"
             />
           </div>
         {{/if}}
@@ -701,10 +691,10 @@
       {{#if this.model.can_delete_all_posts}}
         {{#if this.model.post_count}}
           <DButton
-            @class="btn-danger"
-            @action={{action "showDeletePostsConfirmation"}}
+            @action={{this.showDeletePostsConfirmation}}
             @icon="far-trash-alt"
             @label="admin.user.delete_posts.button"
+            class="btn-danger"
           />
         {{/if}}
       {{else}}
@@ -789,10 +779,10 @@
         {{#if this.model.can_delete_sso_record}}
           <div class="controls">
             <DButton
-              @class="btn-danger"
-              @action={{action "deleteSSORecord"}}
+              @action={{this.deleteSSORecord}}
               @icon="far-trash-alt"
               @label="admin.user.discourse_connect.delete_sso_record"
+              class="btn-danger"
             />
           </div>
         {{/if}}
@@ -818,12 +808,11 @@
             <div class="value">{{this.ssoExternalEmail}}</div>
           {{else}}
             <DButton
-              @class="btn-default"
-              @action={{action "checkSsoEmail"}}
-              @actionParam={{this.model}}
+              @action={{fn this.checkSsoEmail this.model}}
               @icon="envelope"
               @label="admin.users.check_email.text"
               @title="admin.users.check_email.title"
+              class="btn-default"
             />
           {{/if}}
         </div>
@@ -847,12 +836,11 @@
             </div>
           {{else}}
             <DButton
-              @class="btn-default"
-              @action={{action "checkSsoPayload"}}
-              @actionParam={{this.model}}
+              @action={{fn this.checkSsoPayload this.model}}
               @icon="far-list-alt"
               @label="admin.users.check_sso.text"
               @title="admin.users.check_sso.title"
+              class="btn-default"
             />
           {{/if}}
         </div>
@@ -875,11 +863,11 @@
     {{#if this.model.active}}
       {{#if this.model.can_impersonate}}
         <DButton
-          @class="btn-danger btn-impersonate"
-          @action={{action "impersonate"}}
+          @action={{this.impersonate}}
           @icon="crosshairs"
           @label="admin.impersonate.title"
           @title="admin.impersonate.help"
+          class="btn-danger btn-impersonate"
         />
       {{/if}}
     {{/if}}
@@ -888,8 +876,8 @@
       <DButton
         @label="admin.user.anonymize"
         @icon="exclamation-triangle"
-        @class="btn-danger btn-anonymize"
-        @action={{action "anonymize"}}
+        @action={{this.anonymize}}
+        class="btn-danger btn-anonymize"
       />
     {{/if}}
 
@@ -897,8 +885,8 @@
       <DButton
         @label="admin.user.delete"
         @icon="trash-alt"
-        @class="btn-danger btn-user-delete"
-        @action={{action "destroyUser"}}
+        @action={{this.destroyUser}}
+        class="btn-danger btn-user-delete"
       />
     {{/if}}
 
@@ -906,8 +894,8 @@
       <DButton
         @label="admin.user.merge.button"
         @icon="arrows-alt-h"
-        @class="btn-danger btn-user-merge"
-        @action={{action "promptTargetUser"}}
+        @action={{this.promptTargetUser}}
+        class="btn-danger btn-user-merge"
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
index 1ca38344f64..b2b47d8c4b2 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
@@ -5,15 +5,15 @@
   {{#if this.canCheckEmails}}
     {{#if this.showEmails}}
       <DButton
-        @action={{action "toggleEmailVisibility"}}
-        @class="hide-emails btn-default"
+        @action={{this.toggleEmailVisibility}}
         @label="admin.users.hide_emails"
+        class="hide-emails btn-default"
       />
     {{else}}
       <DButton
-        @action={{action "toggleEmailVisibility"}}
-        @class="show-emails btn-default"
+        @action={{this.toggleEmailVisibility}}
         @label="admin.users.show_emails"
+        class="show-emails btn-default"
       />
     {{/if}}
   {{/if}}
@@ -32,7 +32,6 @@
   @action={{action "loadMore"}}
 >
   {{#if this.model}}
-
     <ResponsiveTable
       @className="users-list"
       @aria-label={{this.title}}
@@ -45,7 +44,6 @@
       }}
       @updates={{this.model.email}}
     >
-
       <:header>
         <TableHeaderToggle
           @class="directory-table__column-header--username"
@@ -271,7 +269,6 @@
           </div>
         {{/each}}
       </:body>
-
     </ResponsiveTable>
 
     <ConditionalLoadingSpinner @condition={{this.refreshing}} />
diff --git a/app/assets/javascripts/admin/addon/templates/users-list.hbs b/app/assets/javascripts/admin/addon/templates/users-list.hbs
index 6e7702b2571..d041bfef1df 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list.hbs
@@ -43,21 +43,21 @@
       <li class="admin-actions">
         {{#if this.currentUser.can_invite_to_forum}}
           <DButton
-            @class="btn-flat"
             @action={{route-action "sendInvites"}}
             @title="admin.invite.button_title"
             @icon="user-plus"
             @label="admin.invite.button_text"
+            class="btn-flat"
           />
         {{/if}}
 
         {{#if this.currentUser.admin}}
           <DButton
-            @class="btn-flat"
             @action={{route-action "exportUsers"}}
             @title="admin.export_csv.button_title.user"
             @icon="download"
             @label="admin.export_csv.button_text"
+            class="btn-flat"
           />
         {{/if}}
       </li>
diff --git a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
index 91c774afa8a..2dde795075a 100644
--- a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
@@ -4,10 +4,10 @@
 
 <div class="watched-word-controls">
   <DButton
-    @class="btn-default download-link"
     @href={{this.downloadLink}}
     @icon="download"
     @label="admin.watched_words.download"
+    class="btn-default download-link"
   />
 
   <WatchedWordUploader
@@ -18,17 +18,17 @@
   />
 
   <DButton
-    @class="watched-word-test"
     @label="admin.watched_words.test.button_label"
     @icon="far-eye"
-    @action={{action "test"}}
+    @action={{this.test}}
+    class="watched-word-test"
   />
 
   <DButton
-    @class="btn-danger clear-all"
     @label="admin.watched_words.clear_all"
     @icon="trash-alt"
-    @action={{action "clearAll"}}
+    @action={{this.clearAll}}
+    class="btn-danger clear-all"
   />
 </div>
 
diff --git a/app/assets/javascripts/admin/addon/templates/watched-words.hbs b/app/assets/javascripts/admin/addon/templates/watched-words.hbs
index e2e320a2cf7..5a899945b2c 100644
--- a/app/assets/javascripts/admin/addon/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/addon/templates/watched-words.hbs
@@ -2,18 +2,14 @@
   <div class="admin-controls">
     <div class="controls">
       <div class="inline-form">
-        <DButton
-          @action={{action "toggleMenu"}}
-          @class="menu-toggle"
-          @icon="bars"
-        />
+        <DButton @action={{this.toggleMenu}} @icon="bars" class="menu-toggle" />
         <TextField
           @value={{this.filter}}
           @placeholderKey="admin.watched_words.search"
           @class="no-blur"
         />
         <DButton
-          @action={{action "clearFilter"}}
+          @action={{this.clearFilter}}
           @label="admin.watched_words.clear_filter"
         />
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs
index 5782a4083bd..a44d2dd820d 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs
@@ -147,9 +147,9 @@
   <div class="controls">
     <DButton
       @translatedLabel={{this.saveButtonText}}
-      @action={{action "save"}}
+      @action={{this.save}}
       @disabled={{this.saveButtonDisabled}}
-      @class="btn-primary admin-webhooks__save-button"
+      class="btn-primary admin-webhooks__save-button"
     />
 
     {{#if this.model.isNew}}
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs
index 7d2921d53ce..9db001efcbe 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs
@@ -51,11 +51,10 @@
                 </LinkTo>
 
                 <DButton
-                  @class="destroy btn-danger"
-                  @action={{this.destroy}}
-                  @actionParam={{webhook}}
+                  @action={{fn this.destroy webhook}}
                   @icon="times"
                   @title="delete"
+                  class="destroy btn-danger"
                 />
               </td>
             </tr>
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
index 78c5b0538a2..3e73d087244 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
@@ -10,8 +10,8 @@
     <DButton
       @action={{this.edit}}
       @icon="far-edit"
-      title={{i18n "admin.web_hooks.edit"}}
-      class="btn no-text admin-webhooks__edit-button"
+      @title={{i18n "admin.web_hooks.edit"}}
+      class="no-text admin-webhooks__edit-button"
     />
 
     <DButton
diff --git a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs
index 52e9808bcd7..3fbfd731447 100644
--- a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs
+++ b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs
@@ -14,8 +14,8 @@
           <DButton
             @icon="times"
             @action={{action this.dialog.cancel}}
-            @class="btn-flat dialog-close close"
             @title="modal.close"
+            class="btn-flat dialog-close close"
           />
         </div>
       {{/if}}
@@ -37,23 +37,23 @@
           {{#each this.dialog.buttons as |button|}}
             <DButton
               @icon={{button.icon}}
-              @class={{button.class}}
-              @action={{action "handleButtonAction" button}}
+              @action={{fn this.handleButtonAction button}}
               @translatedLabel={{button.label}}
+              class={{button.class}}
             />
           {{else}}
             <DButton
-              @class={{this.dialog.confirmButtonClass}}
               @disabled={{this.dialog.confirmButtonDisabled}}
               @action={{this.dialog.didConfirmWrapped}}
               @icon={{this.dialog.confirmButtonIcon}}
               @label={{this.dialog.confirmButtonLabel}}
+              class={{this.dialog.confirmButtonClass}}
             />
             {{#if this.dialog.shouldDisplayCancel}}
               <DButton
-                @class={{this.dialog.cancelButtonClass}}
                 @action={{this.dialog.cancel}}
                 @label={{this.dialog.cancelButtonLabel}}
+                class={{this.dialog.cancelButtonClass}}
               />
             {{/if}}
           {{/each}}
diff --git a/app/assets/javascripts/discourse/app/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/components/activation-controls.hbs
index 1c71aaa253f..a4f765bffec 100644
--- a/app/assets/javascripts/discourse/app/components/activation-controls.hbs
+++ b/app/assets/javascripts/discourse/app/components/activation-controls.hbs
@@ -3,7 +3,7 @@
     @action={{this.sendActivationEmail}}
     @label="login.resend_title"
     @icon="envelope"
-    @class="btn-primary resend"
+    class="btn-primary resend"
   />
 {{/unless}}
 
@@ -12,6 +12,6 @@
     @action={{this.editActivationEmail}}
     @label="login.change_email"
     @icon="pencil-alt"
-    @class="edit-email"
+    class="edit-email"
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/components/backup-codes.hbs
index 2df8855621e..2d0b18a405d 100644
--- a/app/assets/javascripts/discourse/app/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/app/components/backup-codes.hbs
@@ -9,10 +9,10 @@
   <div class="controls">
     <DButton
       @action={{action "copyToClipboard"}}
-      @class="btn-default backup-codes-copy-btn"
       @icon="copy"
-      @aria-label="user.second_factor_backup.copy_to_clipboard"
+      @ariaLabel="user.second_factor_backup.copy_to_clipboard"
       @title="user.second_factor_backup.copy_to_clipboard"
+      class="btn-default backup-codes-copy-btn"
     />
 
     <a
diff --git a/app/assets/javascripts/discourse/app/components/badge-card.hbs b/app/assets/javascripts/discourse/app/components/badge-card.hbs
index ba023121086..f19259dbb2e 100644
--- a/app/assets/javascripts/discourse/app/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/app/components/badge-card.hbs
@@ -8,13 +8,12 @@
   {{#if this.isFavorite}}
     <DButton
       @icon="star"
-      @class="favorite-btn"
       @action={{this.onFavoriteClick}}
+      class="favorite-btn"
     />
   {{else}}
     <DButton
       @icon="far-star"
-      @class="favorite-btn"
       @action={{this.onFavoriteClick}}
       @title={{if
         this.canFavoriteMoreBadges
@@ -22,6 +21,7 @@
         "badges.favorite_max_reached"
       }}
       @disabled={{not this.canFavoriteMoreBadges}}
+      class="favorite-btn"
     />
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/badge-title.hbs b/app/assets/javascripts/discourse/app/components/badge-title.hbs
index 44238820190..e125e591d3a 100644
--- a/app/assets/javascripts/discourse/app/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/app/components/badge-title.hbs
@@ -21,10 +21,10 @@
       <div class="control-group">
         <div class="controls">
           <DButton
-            @class="btn-primary"
-            @action={{action "saveBadgeTitle"}}
+            @action={{this.saveBadgeTitle}}
             @disabled={{this._isSaving}}
             @label={{if this._isSaving "saving" "save"}}
+            class="btn-primary"
           />
           {{#if this._isSaved}}
             <span>{{i18n "saved"}}</span>
diff --git a/app/assets/javascripts/discourse/app/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/components/category-permission-row.hbs
index bf41f221462..0125e1d2644 100644
--- a/app/assets/javascripts/discourse/app/components/category-permission-row.hbs
+++ b/app/assets/javascripts/discourse/app/components/category-permission-row.hbs
@@ -5,21 +5,21 @@
   </a>
 </span>
 <span class="options actionable">
-  <DButton @icon="check-square" @class="btn btn-flat see" @disabled={{true}} />
+  <DButton @icon="check-square" @disabled={{true}} class="btn-flat see" />
 
   <DButton
     @icon={{this.canReplyIcon}}
     @action={{action "setPermissionReply"}}
     @translatedTitle={{this.replyTooltip}}
-    @class={{concat "btn btn-flat reply-toggle " this.replyGranted}}
     @disabled={{this.replyDisabled}}
+    class={{concat-class "btn btn-flat reply-toggle" this.replyGranted}}
   />
 
   <DButton
     @icon={{this.canCreateIcon}}
     @action={{action "setPermissionFull"}}
     @translatedTitle={{this.createTooltip}}
-    @class={{concat "btn btn-flat create-toggle " this.createGranted}}
     @disabled={{this.createDisabled}}
+    class={{concat-class "btn-flat create-toggle" this.createGranted}}
   />
 </span>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/composer-container.hbs b/app/assets/javascripts/discourse/app/components/composer-container.hbs
index 62ed4270389..377ba4e0b71 100644
--- a/app/assets/javascripts/discourse/app/components/composer-container.hbs
+++ b/app/assets/javascripts/discourse/app/components/composer-container.hbs
@@ -141,9 +141,9 @@
                       @recipients={{this.composer.model.targetRecipients}}
                       @hasGroups={{this.composer.model.hasTargetGroups}}
                       @focusTarget={{this.composer.focusTarget}}
-                      @class={{concat
+                      @class={{concat-class
                         "users-input"
-                        (if this.composer.showWarning " can-warn")
+                        (if this.composer.showWarning "can-warn")
                       }}
                     />
                     {{#if this.composer.showWarning}}
@@ -322,9 +322,9 @@
             {{#if this.composer.showPreview}}
               <DButton
                 @action={{this.composer.togglePreview}}
-                @class="hide-preview"
                 @ariaLabel="composer.hide_preview"
                 @icon="pencil-alt"
+                class="hide-preview"
               />
             {{/if}}
           {{/if}}
@@ -384,8 +384,8 @@
               @action={{this.composer.togglePreview}}
               @translatedTitle={{this.composer.toggleText}}
               @icon="angle-double-left"
-              @class={{concat
-                "btn-flat btn-mini-toggle toggle-preview "
+              @class={{concat-class
+                "btn-flat btn-mini-toggle toggle-preview"
                 (unless this.composer.showPreview "active")
               }}
             />
diff --git a/app/assets/javascripts/discourse/app/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/components/composer-toggles.hbs
index eb94d61a518..0caaa73e3f4 100644
--- a/app/assets/javascripts/discourse/app/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/components/composer-toggles.hbs
@@ -5,27 +5,27 @@
 
   {{#if this.site.mobileView}}
     <DButton
-      @class="btn-flat toggle-toolbar btn-mini-toggle"
       @icon="bars"
       @action={{this.toggleToolbar}}
       @title={{this.toggleToolbarTitle}}
       @preventFocus={{true}}
+      class="btn-flat toggle-toolbar btn-mini-toggle"
     />
   {{/if}}
 
   {{#if this.showFullScreenButton}}
     <DButton
-      @class="btn-flat toggle-fullscreen btn-mini-toggle"
       @icon={{this.fullscreenIcon}}
       @action={{this.toggleFullscreen}}
       @title={{this.fullscreenTitle}}
+      class="btn-flat toggle-fullscreen btn-mini-toggle"
     />
   {{/if}}
 
   <DButton
-    @class="btn-flat toggler toggle-minimize btn-mini-toggle"
     @icon={{this.toggleIcon}}
     @action={{this.toggleComposer}}
     @title={{this.toggleTitle}}
+    class="btn-flat toggler toggle-minimize btn-mini-toggle"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/copy-button.hbs b/app/assets/javascripts/discourse/app/components/copy-button.hbs
index 4db54253be0..69ea019fc0d 100644
--- a/app/assets/javascripts/discourse/app/components/copy-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/copy-button.hbs
@@ -1,5 +1,5 @@
 <DButton
-  @class={{this.copyClass}}
   @icon={{this.copyIcon}}
-  @action={{action "copy"}}
+  @action={{this.copy}}
+  class={{this.copyClass}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
index a18e98b54fd..5b6e7b826b9 100644
--- a/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
@@ -1,11 +1,11 @@
 {{#if this.canCreateTopic}}
   <DButton
-    @class={{this.btnClass}}
-    @id="create-topic"
     @action={{this.action}}
     @icon="plus"
     @disabled={{this.disabled}}
     @label={{this.label}}
+    id="create-topic"
+    class={{this.btnClass}}
   />
   {{yield}}
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.hbs b/app/assets/javascripts/discourse/app/components/d-editor.hbs
index 63867f7feb3..f38db24e835 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-editor.hbs
@@ -41,16 +41,14 @@
                 />
               {{else}}
                 <DButton
-                  @action={{b.action}}
-                  @type="button"
-                  @actionParam={{b}}
+                  @action={{fn (action b.action) b}}
                   @translatedTitle={{b.title}}
                   @label={{b.label}}
                   @icon={{b.icon}}
-                  @class={{b.className}}
                   @preventFocus={{b.preventFocus}}
-                  @tabindex={{b.tabindex}}
                   @onKeyDown={{this.rovingButtonBar}}
+                  tabindex={{b.tabindex}}
+                  class={{b.className}}
                 />
               {{/if}}
             {{/each}}
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
index 75348d76d23..ac63518023e 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
@@ -7,11 +7,11 @@
 >
   {{#if @shouldDisplayMainImageArrows}}
     <DButton
-      @class="d-lightbox__previous-button btn-flat"
+      {{on "click" @showPreviousItem passive=true capture=true}}
       @title="experimental_lightbox.buttons.previous"
       @icon={{@previousButtonIcon}}
       @ariaHidden="true"
-      {{on "click" @showPreviousItem passive=true capture=true}}
+      class="d-lightbox__previous-button btn-flat"
     />
   {{/if}}
   {{#if @isLoading}}
@@ -21,10 +21,10 @@
   {{else if @hasLoadingError}}
     <span class="d-lightbox__error-message">
       <DButton
-        @class="d-lightbox__retry-button btn-flat"
+        {{on "click" @reloadImage passive=true capture=true}}
         @title="experimental_lightbox.buttons.redo"
         @icon="redo"
-        {{on "click" @reloadImage passive=true capture=true}}
+        class="d-lightbox__retry-button btn-flat"
       />
       <span>{{i18n "experimental_lightbox.image_load_error"}}</span>
     </span>
@@ -49,11 +49,11 @@
   {{/if}}
   {{#if @shouldDisplayMainImageArrows}}
     <DButton
-      @class="d-lightbox__next-button btn-flat"
+      {{on "click" @showNextItem passive=true capture=true}}
       @title="experimental_lightbox.buttons.next"
       @icon={{@nextButtonIcon}}
       @ariaHidden="true"
-      {{on "click" @showNextItem passive=true capture=true}}
+      class="d-lightbox__next-button btn-flat"
     />
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/carousel.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/carousel.hbs
index c5867364eff..8c1ba8ffc35 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox/carousel.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/carousel.hbs
@@ -1,11 +1,11 @@
 <div class="d-lightbox__carousel">
   {{#if @shouldDisplayCarouselArrows}}
     <DButton
-      @class="d-lightbox__carousel-previous-button btn-flat"
+      {{on "click" @showPreviousItem passive=true capture=true}}
       @title="experimental_lightbox.buttons.previous"
       @icon={{@previousButtonIcon}}
       @ariaHidden="true"
-      {{on "click" @showPreviousItem passive=true capture=true}}
+      class="d-lightbox__carousel-previous-button btn-flat"
     />
   {{/if}}
   <div
@@ -39,11 +39,11 @@
   </div>
   {{#if @shouldDisplayCarouselArrows}}
     <DButton
-      @class="d-lightbox__carousel-next-button btn-flat"
+      {{on "click" @showNextItem passive=true capture=true}}
       @title="experimental_lightbox.buttons.next"
       @icon={{@nextButtonIcon}}
       @ariaHidden="true"
-      {{on "click" @showNextItem passive=true capture=true}}
+      class="d-lightbox__carousel-next-button btn-flat"
     />
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
index 3427e2b7dc2..2b77bb0a8c8 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
@@ -17,31 +17,31 @@
   <div class="d-lightbox__footer-buttons">
     {{#if @canZoom}}
       <DButton
-        @class="d-lightbox__zoom-button btn-flat"
+        {{on "click" @toggleZoom passive=true capture=true}}
         @title="experimental_lightbox.buttons.zoom"
         @icon={{@zoomButtonIcon}}
         @ariaHidden="true"
-        {{on "click" @toggleZoom passive=true capture=true}}
         aria-hidden="true"
+        class="d-lightbox__zoom-button btn-flat"
       />
     {{/if}}
     {{#if @canRotate}}
       <DButton
-        @class="d-lightbox__rotate-button btn-flat"
+        {{on "click" @rotateImage passive=true capture=true}}
         @title="experimental_lightbox.buttons.rotate"
         @icon="redo"
         @ariaHidden="true"
-        {{on "click" @rotateImage passive=true capture=true}}
         aria-hidden="true"
+        class="d-lightbox__rotate-button btn-flat"
       />
     {{/if}}
     {{#if @canDownload}}
       <DButton
-        @class="d-lightbox__download-button btn-flat"
+        {{on "click" @downloadImage passive=true capture=true}}
         @title="experimental_lightbox.buttons.download"
         @icon="download"
         @ariaHidden="true"
-        {{on "click" @downloadImage passive=true capture=true}}
+        class="d-lightbox__download-button btn-flat"
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
index e9068d69288..d996384370b 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
@@ -2,12 +2,12 @@
   {{#if @canNavigate}}
     <div aria-hidden="true" class="d-lightbox__multi-item-controls">
       <DButton
-        @class="d-lightbox__carousel-button btn-flat"
+        {{on "click" @toggleCarousel passive=true capture=true}}
         @title="experimental_lightbox.buttons.carousel"
         @icon="images"
         @ariaHidden="true"
-        {{on "click" @toggleCarousel passive=true capture=true}}
         aria-hidden="true"
+        class="d-lightbox__carousel-button btn-flat"
       />
       <div class="d-lightbox__counters">
         <span class="d-lightbox__counter-current">
@@ -25,30 +25,30 @@
   <div class="d-lightbox__header-buttons">
     {{#if @canDownload}}
       <DButton
-        @class="d-lightbox__new-tab-button btn-flat"
+        {{on "click" @openInNewTab passive=true capture=true}}
         @title="experimental_lightbox.buttons.newtab"
         @icon="external-link-alt"
         @ariaHidden="true"
-        {{on "click" @openInNewTab passive=true capture=true}}
         aria-hidden="true"
+        class="d-lightbox__new-tab-button btn-flat"
       />
     {{/if}}
     {{#if @canFullscreen}}
       <DButton
-        @class="d-lightbox__full-screen-button btn-flat"
+        {{on "click" @toggleFullScreen passive=true capture=true}}
         @title="experimental_lightbox.buttons.fullscreen"
         @icon="discourse-expand"
         @ariaHidden="true"
-        {{on "click" @toggleFullScreen passive=true capture=true}}
         aria-hidden="true"
+        class="d-lightbox__full-screen-button btn-flat"
       />
     {{/if}}
     <DButton
-      @class="d-lightbox__close-button btn-flat"
+      {{on "click" @close passive=true capture=true}}
       @title="experimental_lightbox.buttons.close"
       @icon="times"
       @ariaHidden="true"
-      {{on "click" @close passive=true capture=true}}
+      class="d-lightbox__close-button btn-flat"
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
index f409a846791..4fbe23c88d1 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-modal-cancel.hbs
@@ -1,5 +1,5 @@
 <DButton
-  @class="btn-flat d-modal-cancel"
   @action={{@close}}
   @translatedLabel={{i18n "cancel"}}
+  class="btn-flat d-modal-cancel"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/d-modal-legacy.hbs b/app/assets/javascripts/discourse/app/components/d-modal-legacy.hbs
index 90a2c5f4665..725ae76127f 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal-legacy.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-modal-legacy.hbs
@@ -30,8 +30,8 @@
             <DButton
               @icon="times"
               @action={{route-action "closeModal" "initiatedByCloseButton"}}
-              @class="btn-flat modal-close close"
               @title="modal.close"
+              class="btn-flat modal-close close"
             />
           {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.hbs b/app/assets/javascripts/discourse/app/components/d-modal.hbs
index 333e88b20d5..9a16560ca68 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-modal.hbs
@@ -38,8 +38,8 @@
                 <DButton
                   @icon="times"
                   @action={{this.handleCloseButton}}
-                  @class="btn-flat modal-close close"
                   @title="modal.close"
+                  class="btn-flat modal-close close"
                 />
               {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
index 0e2010090a5..ae8e4a23b25 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
@@ -29,10 +29,10 @@
 
   {{#if (and this.category this.showCategoryEdit)}}
     <DButton
-      @class="btn-default edit-category"
       @action={{this.editCategory}}
       @icon="wrench"
       @title="category.edit_title"
+      class="btn-default edit-category"
     />
   {{/if}}
 
@@ -40,10 +40,10 @@
     {{#if this.showToggleInfo}}
       <DButton
         @icon={{if this.currentUser.staff "wrench" "info-circle"}}
-        @class="btn-default"
         @ariaLabel="tagging.info"
         @action={{this.toggleInfo}}
-        @id="show-tag-info"
+        id="show-tag-info"
+        class="btn-default"
       />
     {{/if}}
   {{/if}}
@@ -109,5 +109,4 @@
       {{/if}}
     {{/unless}}
   {{/if}}
-
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/components/date-time-input.hbs
index b4fe9ad7b3a..f2d209d19b1 100644
--- a/app/assets/javascripts/discourse/app/components/date-time-input.hbs
+++ b/app/assets/javascripts/discourse/app/components/date-time-input.hbs
@@ -28,8 +28,8 @@
 
 {{#if this.clearable}}
   <DButton
-    @class="btn-default clear-date-time"
     @icon="times"
-    @action={{action "onClear"}}
+    @action={{this.onClear}}
+    class="btn-default clear-date-time"
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs
index fa567646adb..90eb5063b55 100644
--- a/app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs
+++ b/app/assets/javascripts/discourse/app/components/desktop-notification-config.hbs
@@ -1,34 +1,34 @@
 {{#if this.isNotSupported}}
   <DButton
     @icon="bell-slash"
-    @class="btn-default"
     @label="user.desktop_notifications.not_supported"
     @disabled="true"
+    class="btn-default"
   />
 {{/if}}
 {{#if this.isDeniedPermission}}
   <DButton
     @icon="bell-slash"
-    @class="btn-default"
     @label="user.desktop_notifications.perm_denied_btn"
     @action={{action "recheckPermission"}}
     @disabled="true"
+    class="btn-default"
   />
   {{i18n "user.desktop_notifications.perm_denied_expl"}}
 {{else}}
   {{#if this.isSubscribed}}
     <DButton
       @icon="far-bell-slash"
-      @class="btn-default"
       @label="user.desktop_notifications.disable"
       @action={{action "turnoff"}}
+      class="btn-default"
     />
   {{else}}
     <DButton
       @icon="far-bell"
-      @class="btn-default"
       @label="user.desktop_notifications.enable"
       @action={{action "turnon"}}
+      class="btn-default"
     />
   {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
index e480d0b318a..3dcd2108800 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
@@ -13,9 +13,9 @@
 
         <DButton
           @icon="times"
-          @action={{action "dismiss"}}
-          @class="btn btn-flat close"
+          @action={{this.dismiss}}
           @title="banner.close"
+          class="btn-flat close"
         />
       </div>
       <div id="banner-content">
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
index e5a381a2775..75916c4dfe9 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
@@ -52,10 +52,10 @@
       {{#if this.category.topic_url}}
         <br />
         <DButton
-          @class="btn-default edit-category-description"
-          @action={{action "showCategoryTopic"}}
+          @action={{this.showCategoryTopic}}
           @icon="pencil-alt"
           @label="category.change_in_category_topic"
+          class="btn-default edit-category-description"
         />
       {{/if}}
     </section>
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
index d367e5a3554..355070291f9 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
@@ -69,17 +69,17 @@
         />
         <DButton
           @label="category.required_tag_group.delete"
-          @action={{action "deleteRequiredTagGroup" rtg}}
+          @action={{fn this.deleteRequiredTagGroup rtg}}
           @icon="trash-alt"
-          @class="delete-required-tag-group"
+          class="delete-required-tag-group"
         />
       </div>
     {{/each}}
     <DButton
       @label="category.required_tag_group.add"
-      @action={{action "addRequiredTagGroup"}}
+      @action={{this.addRequiredTagGroup}}
       @icon="plus"
-      @class="add-required-tag-group"
+      class="add-required-tag-group"
     />
   </section>
 </section>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
index 9b6d9531b52..363e2120bd7 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
@@ -8,9 +8,9 @@
     <div class="emoji-picker-category-buttons">
       {{#if this.recentEmojis.length}}
         <button
-          type="button"
-          data-section="recent"
           {{on "click" (fn this.onCategorySelection "recent")}}
+          data-section="recent"
+          type="button"
           class="btn btn-default category-button emoji"
         >
           {{replace-emoji ":star:"}}
@@ -24,9 +24,9 @@
 
       {{#each-in this.customEmojis as |group emojis|}}
         <button
-          type="button"
-          data-section={{concat "custom-" group}}
           {{on "click" (fn this.onCategorySelection (concat "custom-" group))}}
+          data-section={{concat "custom-" group}}
+          type="button"
           class="btn btn-default category-button emoji"
         >
           {{replace-emoji (concat ":" (get emojis "0.code") ":")}}
@@ -66,8 +66,8 @@
                 <span class="title">{{i18n "emoji_picker.recent"}}</span>
                 <DButton
                   @icon="trash-alt"
-                  @action={{action "onClearRecent"}}
-                  @class="trash-recent"
+                  @action={{this.onClearRecent}}
+                  class="trash-recent"
                 />
               </div>
               <div class="section-group">
@@ -125,9 +125,9 @@
           {{#each this.diversityScales as |diversityScale index|}}
             <DButton
               @icon={{diversityScale.icon}}
-              @class={{concat "diversity-scale " diversityScale.name}}
               @title={{diversityScale.title}}
-              @action={{action "onDiversitySelection" index}}
+              @action={{fn this.onDiversitySelection index}}
+              class={{concat-class "diversity-scale" diversityScale.name}}
             />
           {{/each}}
         </div>
diff --git a/app/assets/javascripts/discourse/app/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/app/components/emoji-uploader.hbs
index 9f279f3cd0a..805186c2a99 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/components/emoji-uploader.hbs
@@ -40,11 +40,11 @@
         accept=".png,.gif"
       />
       <DButton
-        @class="btn-primary"
         @translatedLabel={{this.buttonLabel}}
         @icon="plus"
-        @action={{action "chooseFiles"}}
+        @action={{this.chooseFiles}}
         @disabled={{this.uploading}}
+        class="btn-primary"
       />
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/global-notice.hbs b/app/assets/javascripts/discourse/app/components/global-notice.hbs
index f2ef6fbf461..7599ffbc052 100644
--- a/app/assets/javascripts/discourse/app/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/app/components/global-notice.hbs
@@ -14,10 +14,9 @@
 
           {{#if notice.options.dismissable}}
             <DButton
-              @class="btn-flat close"
               @icon="times"
-              @action={{action "dismissNotice"}}
-              @actionParam={{notice}}
+              @action={{fn this.dismissNotice notice}}
+              class="btn-flat close"
             />
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/components/group-card-contents.hbs
index 83a3eae0eb2..e32866d8b6e 100644
--- a/app/assets/javascripts/discourse/app/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-card-contents.hbs
@@ -55,9 +55,9 @@
             <li>
               <DButton
                 @action={{action "messageGroup"}}
-                @class="btn-primary group-message-button inline"
                 @icon="envelope"
                 @label="groups.message"
+                class="btn-primary group-message-button inline"
               />
             </li>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
index 6dd9e026797..41a281120d9 100644
--- a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
@@ -83,12 +83,12 @@
   <div class="control-group buttons">
     <DButton
       @disabled={{or this.missingSettings this.testingSettings}}
-      @class="btn-primary test-imap-settings"
-      @action={{action "testImapSettings"}}
+      @action={{this.testImapSettings}}
       @icon="cog"
       @label="groups.manage.email.test_settings"
-      @tabindex="12"
       @title="groups.manage.email.settings_required"
+      tabindex="12"
+      class="btn-primary test-imap-settings"
     />
 
     <ConditionalLoadingSpinner
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
index 79c2b577ba1..1e398621e94 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
@@ -1,9 +1,8 @@
 {{#if this.value}}
   <DButton
-    @class="btn-default group-manage-logs-filter"
-    @action={{action "clearFilter"}}
-    @actionParam={{this.type}}
+    @action={{fn this.clearFilter this.type}}
     @icon="times-circle"
     @translatedLabel={{concat this.label ": " this.filterText}}
+    class="btn-default group-manage-logs-filter"
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
index 8e7332663e6..9321b33409a 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
+++ b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js
@@ -16,10 +16,4 @@ export default Component.extend({
       ? I18n.t(`group_histories.actions.${value}`)
       : value;
   },
-
-  actions: {
-    clearFilter(param) {
-      this.clearFilter(param);
-    },
-  },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs
index 29af2881ce1..f5c8c3a85aa 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.hbs
@@ -1,23 +1,21 @@
 <tr class="group-manage-logs-row">
   <td>
     <DButton
-      @class="btn-default"
-      @action={{action "filter"}}
-      @actionParam={{hash value=this.log.action key="action"}}
+      @action={{fn this.filter (hash value=this.log.action key="action")}}
       @translatedLabel={{this.log.actionTitle}}
+      class="btn-default"
     />
   </td>
 
   <td>
     <span>{{avatar this.log.acting_user imageSize="tiny"}}</span>
     <DButton
-      @class="btn-default"
-      @action={{action "filter"}}
-      @actionParam={{hash
-        value=this.log.acting_user.username
-        key="acting_user"
+      @action={{fn
+        this.filter
+        (hash value=this.log.acting_user.username key="acting_user")
       }}
       @translatedLabel={{this.log.acting_user.username}}
+      class="btn-default"
     />
   </td>
 
@@ -25,13 +23,12 @@
     {{#if this.log.target_user}}
       <span>{{avatar this.log.target_user imageSize="tiny"}}</span>
       <DButton
-        @class="btn-default"
-        @action={{action "filter"}}
-        @actionParam={{hash
-          value=this.log.target_user.username
-          key="target_user"
+        @action={{fn
+          this.filter
+          (hash value=this.log.target_user.username key="target_user")
         }}
         @translatedLabel={{this.log.target_user.username}}
+        class="btn-default"
       />
     {{/if}}
   </td>
@@ -39,10 +36,9 @@
   <td>
     {{#if this.log.subject}}
       <DButton
-        @class="btn-default"
-        @action={{action "filter"}}
-        @actionParam={{hash value=this.log.subject key="subject"}}
+        @action={{fn this.filter (hash value=this.log.subject key="subject")}}
         @translatedLabel={{this.log.subject}}
+        class="btn-default"
       />
     {{/if}}
   </td>
@@ -52,7 +48,7 @@
   <td class="group-manage-logs-expand-details">
     {{#if this.log.prev_value}}
       <DButton
-        @action={{action "toggleDetails"}}
+        @action={{this.toggleDetails}}
         @icon={{if this.expandDetails "angle-up" "angle-down"}}
       />
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-logs-row.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.js
index e2fc792353c..889f9d174b8 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-logs-row.js
+++ b/app/assets/javascripts/discourse/app/components/group-manage-logs-row.js
@@ -1,15 +1,17 @@
 import Component from "@ember/component";
+import { action } from "@ember/object";
+
 export default Component.extend({
   tagName: "",
   expandDetails: false,
 
-  actions: {
-    toggleDetails() {
-      this.toggleProperty("expandDetails");
-    },
+  @action
+  toggleDetails() {
+    this.toggleProperty("expandDetails");
+  },
 
-    filter(params) {
-      this.set(`filters.${params.key}`, params.value);
-    },
+  @action
+  filter(params) {
+    this.set(`filters.${params.key}`, params.value);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
index 7e249bd3640..01b9eb010c3 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-manage-save-button.hbs
@@ -9,8 +9,8 @@
   <DButton
     @action={{this.save}}
     @disabled={{or this.disabled this.saving}}
-    @class="btn btn-primary group-manage-save"
     @translatedLabel={{this.savingText}}
+    class="btn-primary group-manage-save"
   />
   {{#if this.saved}}
     <span>{{i18n "saved"}}</span>
diff --git a/app/assets/javascripts/discourse/app/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
index c15e736f7ea..d86ce3ddd97 100644
--- a/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
@@ -1,26 +1,26 @@
 {{#if this.canJoinGroup}}
   <DButton
     @action={{action "joinGroup"}}
-    @class="btn-default group-index-join"
     @icon="user-plus"
     @label="groups.join"
     @disabled={{this.updatingMembership}}
+    class="btn-default group-index-join"
   />
 {{else if this.canLeaveGroup}}
   <DButton
     @action={{action "leaveGroup"}}
-    @class="btn-danger group-index-leave"
     @icon="user-times"
     @label="groups.leave"
     @disabled={{this.updatingMembership}}
+    class="btn-danger group-index-leave"
   />
 {{else if this.canRequestMembership}}
   <DButton
     @action={{action "showRequestMembershipForm"}}
-    @class="btn-default group-index-request"
     @disabled={{this.loading}}
     @icon="user-plus"
     @label="groups.request"
+    class="btn-default group-index-request"
   />
 {{else}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs
index b79ff7185fa..88a10d506e2 100644
--- a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.hbs
@@ -99,12 +99,12 @@
   <div class="control-group buttons">
     <DButton
       @disabled={{or this.missingSettings this.testingSettings}}
-      @class="btn-primary test-smtp-settings"
-      @action={{action "testSmtpSettings"}}
+      @action={{this.testSmtpSettings}}
       @icon="cog"
       @label="groups.manage.email.test_settings"
-      @tabindex="7"
       @title="groups.manage.email.settings_required"
+      tabindex="7"
+      class="btn-primary test-smtp-settings"
     />
 
     <ConditionalLoadingSpinner
diff --git a/app/assets/javascripts/discourse/app/components/hidden-details.hbs b/app/assets/javascripts/discourse/app/components/hidden-details.hbs
index 3496bdcb6f0..2ef594cdedc 100644
--- a/app/assets/javascripts/discourse/app/components/hidden-details.hbs
+++ b/app/assets/javascripts/discourse/app/components/hidden-details.hbs
@@ -1,9 +1,5 @@
 {{#unless this.expanded}}
-  <DButton
-    @action={{action "expand"}}
-    @class="btn-link"
-    @label={{this.label}}
-  />
+  <DButton @action={{this.expand}} @label={{this.label}} class="btn-link" />
 {{/unless}}
 {{#if this.expanded}}
   <span class="description" aria-live="assertive">{{this.details}}</span>
diff --git a/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
index 5eb8e28ffa2..ef223055bc3 100644
--- a/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
@@ -1,8 +1,8 @@
 <div class="ignored-user-list-item">
   <span class="ignored-user-name">{{this.item}}</span>
   <DButton
-    @class="remove-ignored-user no-text btn-icon"
-    @action={{action "removeIgnoredUser" this.item}}
+    @action={{fn (action "removeIgnoredUser") this.item}}
     @icon="times"
+    class="remove-ignored-user no-text btn-icon"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/components/ignored-user-list.hbs
index efcee39beda..8c5c9f2b39c 100644
--- a/app/assets/javascripts/discourse/app/components/ignored-user-list.hbs
+++ b/app/assets/javascripts/discourse/app/components/ignored-user-list.hbs
@@ -11,7 +11,7 @@
 <div class="instructions">{{i18n "user.ignored_users_instructions"}}</div>
 <div><DButton
     @action={{action "newIgnoredUser"}}
-    @class="btn-default"
     @icon="plus"
     @label="user.user_notifications.add_ignored_user"
+    class="btn-default"
   /></div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/components/invite-panel.hbs
index 3918dff98fe..5e78f0a5d7b 100644
--- a/app/assets/javascripts/discourse/app/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/app/components/invite-panel.hbs
@@ -44,8 +44,8 @@
         {{#if this.capabilities.hasContactPicker}}
           <DButton
             @icon="address-book"
-            @action={{action "searchContact"}}
-            @class="btn-primary open-contact-picker"
+            @action={{this.searchContact}}
+            class="btn-primary open-contact-picker"
           />
         {{/if}}
       </div>
@@ -94,25 +94,25 @@
 <div class="footer">
   {{#if this.inviteModel.finished}}
     <DButton
-      @class="btn-primary"
-      @action={{action "sendCloseModal"}}
+      @action={{this.sendCloseModal}}
       @label="close"
+      class="btn-primary"
     />
   {{else}}
     <DButton
       @icon={{this.inviteIcon}}
-      @action={{action "createInvite"}}
-      @class="btn-primary send-invite"
+      @action={{this.createInvite}}
       @disabled={{this.disabled}}
       @label={{this.buttonTitle}}
+      class="btn-primary send-invite"
     />
     {{#if this.showCopyInviteButton}}
       <DButton
         @icon="link"
-        @action={{action "generateInviteLink"}}
-        @class="btn-primary generate-invite-link"
+        @action={{this.generateInviteLink}}
         @disabled={{this.disabledCopyLink}}
         @label="user.invited.generate_link"
+        class="btn-primary generate-invite-link"
       />
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/app/components/modal-footer-close.hbs
index 8ef897d03aa..45c6dc5b79e 100644
--- a/app/assets/javascripts/discourse/app/components/modal-footer-close.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal-footer-close.hbs
@@ -1,7 +1,7 @@
 <div class="modal-footer">
   <DButton
-    @class="btn-primary"
     @action={{route-action "closeModal"}}
     @label="close"
+    class="btn-primary"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
index 04bde449617..604afa2410a 100644
--- a/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
@@ -22,9 +22,9 @@
       <DButton
         @icon="cog"
         @action={{this.toggleShowOptions}}
-        class="bookmark-options-button"
         @ariaLabel="post.bookmarks.options"
         @title="post.bookmarks.options"
+        class="bookmark-options-button"
       />
     </div>
 
@@ -78,20 +78,20 @@
 
   <:footer>
     <DButton
-      id="save-bookmark"
       @label="bookmarks.save"
-      class="btn-primary"
       @action={{this.saveAndClose}}
+      id="save-bookmark"
+      class="btn-primary"
     />
     <DModalCancel @close={{action "closeWithoutSavingBookmark"}} />
     {{#if this.showDelete}}
       <DButton
-        id="delete-bookmark"
         @icon="trash-alt"
-        class="delete-bookmark btn-danger"
         @action={{this.delete}}
         @ariaLabel="post.bookmarks.actions.delete_bookmark.name"
         @title="post.bookmarks.actions.delete_bookmark.name"
+        id="delete-bookmark"
+        class="delete-bookmark btn-danger"
       />
     {{/if}}
   </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/modal/discard-draft.hbs b/app/assets/javascripts/discourse/app/components/modal/discard-draft.hbs
index 5a92b0a24fa..fd966f5b665 100644
--- a/app/assets/javascripts/discourse/app/components/modal/discard-draft.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/discard-draft.hbs
@@ -13,20 +13,20 @@
     <DButton
       @icon="far-trash-alt"
       @label="post.cancel_composer.discard"
-      @class="btn-danger discard-draft"
       @action={{this.discardDraft}}
+      class="btn-danger discard-draft"
     />
     {{#if @model.showSaveDraftButton}}
       <DButton
         @label="post.cancel_composer.save_draft"
-        @class="save-draft"
         @action={{this.saveDraftAndClose}}
+        class="save-draft"
       />
     {{/if}}
     <DButton
       @label="post.cancel_composer.keep_editing"
-      @class="keep-editing"
       @action={{@closeModal}}
+      class="keep-editing"
     />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/dismiss-new.gjs b/app/assets/javascripts/discourse/app/components/modal/dismiss-new.gjs
index 287c5e2d76a..e74d38b30b2 100644
--- a/app/assets/javascripts/discourse/app/components/modal/dismiss-new.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/dismiss-new.gjs
@@ -43,10 +43,10 @@ export default class DismissNew extends Component {
       </:body>
       <:footer>
         <DButton
-          id="dismiss-read-confirm"
           @action={{this.dismissed}}
           @icon="check"
           @label="topics.bulk.dismiss"
+          id="dismiss-read-confirm"
           class="btn-primary"
         />
       </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/modal/edit-user-directory-columns.hbs b/app/assets/javascripts/discourse/app/components/modal/edit-user-directory-columns.hbs
index 2e269df8547..3f0d3cac934 100644
--- a/app/assets/javascripts/discourse/app/components/modal/edit-user-directory-columns.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/edit-user-directory-columns.hbs
@@ -36,13 +36,13 @@
             <div class="right-content">
               <DButton
                 @icon="arrow-up"
-                @class="button-secondary move-column-up"
                 @action={{fn this.moveUp column}}
+                class="button-secondary move-column-up"
               />
               <DButton
                 @icon="arrow-down"
-                @class="button-secondary"
                 @action={{fn this.moveDown column}}
+                class="button-secondary"
               />
             </div>
           </div>
@@ -52,14 +52,14 @@
   </:body>
   <:footer>
     <DButton
-      class="btn-primary"
       @label="directory.edit_columns.save"
       @action={{this.save}}
+      class="btn-primary"
     />
     <DButton
-      class="btn-secondary reset-to-default"
       @label="directory.edit_columns.reset_to_default"
       @action={{this.resetToDefault}}
+      class="btn-secondary reset-to-default"
     />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.hbs
index 592fce9a578..1a2944572e3 100644
--- a/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/ignore-duration-with-username.hbs
@@ -28,10 +28,10 @@
   </:body>
   <:footer>
     <DButton
-      @class="btn-primary"
       @disabled={{this.saveDisabled}}
       @label="user.user_notifications.ignore_duration_save"
       @action={{this.ignore}}
+      class="btn-primary"
     />
     <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
   </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.hbs b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.hbs
index 663209e9fa0..2900864797b 100644
--- a/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.hbs
@@ -17,6 +17,6 @@
   </:body>
 
   <:footer>
-    <DButton @class="btn-primary" @action={{this.saveChanges}} @label="save" />
+    <DButton @action={{this.saveChanges}} @label="save" class="btn-primary" />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
index 1ca0c842e39..396ed83788f 100644
--- a/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
@@ -75,16 +75,16 @@
       <DButton
         @label="topic.publish_page.unpublish"
         @icon="trash-alt"
-        @class="btn-danger"
         @isLoading={{this.unpublishing}}
         @action={{this.unpublish}}
+        class="btn-danger"
       />
 
       <DButton
-        @class="close-publish-page"
         @icon="times"
         @label="close"
         @action={{@closeModal}}
+        class="close-publish-page"
       />
     {{else if this.unpublished}}
       <DButton
@@ -94,11 +94,11 @@
     {{else}}
       <DButton
         @label="topic.publish_page.publish"
-        @class="btn-primary publish-page"
         @icon="file"
         @disabled={{this.disabled}}
         @isLoading={{this.saving}}
         @action={{this.publish}}
+        class="btn-primary publish-page"
       />
     {{/if}}
   </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/components/modal/share-topic.hbs
index b18a4b294bf..729f355e069 100644
--- a/app/assets/javascripts/discourse/app/components/modal/share-topic.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/share-topic.hbs
@@ -43,31 +43,31 @@
 
         {{#if this.allowInvites}}
           <DButton
-            @class="btn-default invite"
             @label="topic.share.invite_users"
             @icon="user-plus"
-            @action={{action "inviteUsers"}}
+            @action={{this.inviteUsers}}
+            class="btn-default invite"
           />
         {{/if}}
 
         {{#if this.topic.details.can_reply_as_new_topic}}
           {{#if this.topic.isPrivateMessage}}
             <DButton
-              @action={{action "replyAsNewTopic"}}
-              @class="btn-default new-topic"
+              @action={{this.replyAsNewTopic}}
               @icon="plus"
-              @aria-label="post.reply_as_new_private_message"
+              @ariaLabel="post.reply_as_new_private_message"
               @title="post.reply_as_new_private_message"
               @label="user.new_private_message"
+              class="btn-default new-topic"
             />
           {{else}}
             <DButton
-              @action={{action "replyAsNewTopic"}}
-              @class="btn-default new-topic"
+              @action={{this.replyAsNewTopic}}
               @icon="plus"
-              @aria-label="post.reply_as_new_topic"
+              @ariaLabel="post.reply_as_new_topic"
               @title="post.reply_as_new_topic"
               @label="topic.create"
+              class="btn-default new-topic"
             />
           {{/if}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
index a64b2faf18f..80913c1290c 100644
--- a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
@@ -53,14 +53,16 @@
           @reorderCallback={{this.reorder}}
         />
       {{/each}}
+
       <DButton
-        @action={{action "addLink"}}
-        @class="btn-flat btn-text add-link"
+        @action={{this.addLink}}
         @title="sidebar.sections.custom.links.add"
         @icon="plus"
         @label="sidebar.sections.custom.links.add"
         @ariaLabel="sidebar.sections.custom.links.add"
+        class="btn-flat btn-text add-link"
       />
+
       {{#if this.transformedModel.sectionType}}
         <hr />
         <h3>{{i18n "sidebar.sections.custom.more_menu"}}</h3>
@@ -72,15 +74,15 @@
           />
         {{/each}}
         <DButton
-          @action={{action "addSecondaryLink"}}
-          @class="btn-flat btn-text add-link"
+          @action={{this.addSecondaryLink}}
           @title="sidebar.sections.custom.links.add"
           @icon="plus"
           @label="sidebar.sections.custom.links.add"
           @ariaLabel="sidebar.sections.custom.links.add"
+          class="btn-flat btn-text add-link"
         />
-
       {{/if}}
+
       {{#if (and this.currentUser.staff)}}
         <div
           class="row-wrapper mark-public-wrapper
@@ -104,33 +106,34 @@
       {{/if}}
     </form>
   </:body>
+
   <:footer>
     <DButton
-      @id="save-section"
-      @action={{action "save"}}
-      @class="btn-primary"
+      @action={{this.save}}
       @label="sidebar.sections.custom.save"
       @ariaLabel="sidebar.sections.custom.save"
       @disabled={{not this.transformedModel.valid}}
+      id="save-section"
+      class="btn-primary"
     />
     {{#if this.canDelete}}
       <DButton
         @icon="trash-alt"
-        @id="delete-section"
-        @class="btn-danger delete"
-        @action={{action "delete"}}
+        @action={{this.delete}}
         @label="sidebar.sections.custom.delete"
         @ariaLabel="sidebar.sections.custom.delete"
+        id="delete-section"
+        class="btn-danger delete"
       />
     {{/if}}
     {{#if this.transformedModel.sectionType}}
       <DButton
-        @action={{action "resetToDefault"}}
-        @class="btn-flat btn-text reset-link"
+        @action={{this.resetToDefault}}
         @icon="undo"
         @title="sidebar.sections.custom.links.reset"
         @label="sidebar.sections.custom.links.reset"
         @ariaLabel="sidebar.sections.custom.links.reset"
+        class="btn-flat btn-text reset-link"
       />
     {{/if}}
   </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/modal/user-status.hbs b/app/assets/javascripts/discourse/app/components/modal/user-status.hbs
index bb039c6d04b..f16c97a6fc5 100644
--- a/app/assets/javascripts/discourse/app/components/modal/user-status.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/user-status.hbs
@@ -33,16 +33,16 @@
   <:footer>
     <DButton
       @label="user_status.save"
-      @class="btn-primary"
       @disabled={{not this.statusIsSet}}
       @action={{this.saveAndClose}}
+      class="btn-primary"
     />
     <DModalCancel @close={{@closeModal}} />
     {{#if this.showDeleteButton}}
       <DButton
         @icon="trash-alt"
-        @class="delete-status btn-danger"
         @action={{this.delete}}
+        class="delete-status btn-danger"
       />
     {{/if}}
   </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/more-topics.hbs b/app/assets/javascripts/discourse/app/components/more-topics.hbs
index 0df708cce4e..8ae128cdb5a 100644
--- a/app/assets/javascripts/discourse/app/components/more-topics.hbs
+++ b/app/assets/javascripts/discourse/app/components/more-topics.hbs
@@ -7,9 +7,9 @@
             <DButton
               @translatedTitle={{tab.name}}
               @translatedLabel={{tab.name}}
-              @class={{if (eq tab.id this.selectedTab) "active"}}
-              @action={{action "rememberTopicListPreference" tab.id}}
+              @action={{fn this.rememberTopicListPreference tab.id}}
               @icon={{tab.icon}}
+              class={{if (eq tab.id this.selectedTab) "active"}}
             />
           </li>
         {{/each}}
diff --git a/app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs
index 0fa1bd694ad..090b56592be 100644
--- a/app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs
+++ b/app/assets/javascripts/discourse/app/components/notification-consent-banner.hbs
@@ -12,8 +12,8 @@
       <DButton
         @icon="times"
         @action={{action "dismiss"}}
-        @class="btn btn-flat close"
         @title="banner.close"
+        class="btn-flat close"
       />
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs
index 910a616ba52..5fa446e697a 100644
--- a/app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs
+++ b/app/assets/javascripts/discourse/app/components/pwa-install-banner.hbs
@@ -11,8 +11,8 @@
       <DButton
         @icon="times"
         @action={{action "dismiss"}}
-        @class="btn btn-flat close"
         @title="banner.close"
+        class="btn-flat close"
       />
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs
index 9209164cfb8..774a4c879d2 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.hbs
@@ -7,17 +7,17 @@
       </div>
       <DButton
         @icon="times"
-        @class="btn-small unclaim"
         @action={{action "unclaim"}}
         @disabled={{this.unassigning}}
         @title="review.unclaim.help"
+        class="btn-small unclaim"
       />
     {{else}}
       <DButton
         @icon="user-plus"
-        @class="btn-small claim"
         @title="review.claim.title"
         @action={{action "claim"}}
+        class="btn-small claim"
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs
index 0e9e7d2bb89..2958f3ffbfc 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-flagged-post.hbs
@@ -24,10 +24,10 @@
 
     {{#if this.isLongPost}}
       <DButton
-        @class="btn-default btn-icon post-body__toggle-btn"
         @action={{this.toggleContent}}
         @label={{this.collapseButtonProps.label}}
         @icon={{this.collapseButtonProps.icon}}
+        class="btn-default btn-icon post-body__toggle-btn"
       />
     {{/if}}
     <span>
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
index 6f1d6b48c7e..254e1b2795d 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
@@ -96,18 +96,18 @@
       {{#if this.canPerform}}
         {{#if this.editing}}
           <DButton
-            @class="btn-primary reviewable-action save-edit"
             @disabled={{this.disabled}}
             @icon="check"
             @action={{action "saveEdit"}}
             @label="review.save"
+            class="btn-primary reviewable-action save-edit"
           />
           <DButton
-            @class="btn-danger reviewable-action cancel-edit"
             @disabled={{this.disabled}}
             @icon="times"
             @action={{action "cancelEdit"}}
             @label="review.cancel"
+            class="btn-danger reviewable-action cancel-edit"
           />
         {{else}}
           {{#each this.reviewable.bundled_actions as |bundle|}}
@@ -120,11 +120,11 @@
 
           {{#if this.reviewable.can_edit}}
             <DButton
-              @class="reviewable-action edit"
               @disabled={{this.disabled}}
               @icon="pencil-alt"
               @action={{action "edit"}}
               @label="review.edit"
+              class="reviewable-action edit"
             />
           {{/if}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
index f2a175541f1..342fb182447 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
@@ -34,10 +34,10 @@
 
     {{#if this.isLongPost}}
       <DButton
-        @class="btn-default btn-icon post-body__toggle-btn"
         @action={{this.toggleContent}}
         @label={{this.collapseButtonProps.label}}
         @icon={{this.collapseButtonProps.icon}}
+        class="btn-default btn-icon post-body__toggle-btn"
       />
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/save-controls.hbs b/app/assets/javascripts/discourse/app/components/save-controls.hbs
index 62bc74b0f80..9d147e76413 100644
--- a/app/assets/javascripts/discourse/app/components/save-controls.hbs
+++ b/app/assets/javascripts/discourse/app/components/save-controls.hbs
@@ -2,7 +2,7 @@
   @action={{this.action}}
   @disabled={{this.buttonDisabled}}
   @label={{this.savingText}}
-  @class="btn-primary save-changes"
+  class="btn-primary save-changes"
 />
 {{#if this.saved}}
   <span class="saved">{{i18n "saved"}}</span>
diff --git a/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
index 37bcff80043..6154c300a34 100644
--- a/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
@@ -306,9 +306,9 @@
         @action={{this.search}}
         @icon="search"
         @label="search.search_button"
-        @class="btn-primary search-cta"
         @ariaLabel="search.search_button"
         @disabled={{this.searchButtonDisabled}}
+        class="btn-primary search-cta"
       />
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.hbs b/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.hbs
index 04d0941b4da..15cbcaae6a6 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/menu-panel-contents.hbs
@@ -4,18 +4,16 @@
       @icon="times"
       @label="search.in_this_topic"
       @title="search.in_this_topic_tooltip"
-      class="btn btn-small search-context"
       @action={{@clearTopicContext}}
-      @iconRight={{true}}
+      class="btn-small search-context"
     />
   {{else if @inPMInboxContext}}
     <DButton
       @icon="times"
       @label="search.in_messages"
       @title="search.in_messages_tooltip"
-      @class="btn btn-small search-context"
       @action={{@clearPMInboxContext}}
-      @iconRight={{true}}
+      class="btn-small search-context"
     />
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/components/security-key-form.hbs
index 13fa2fd3338..412eef7fd01 100644
--- a/app/assets/javascripts/discourse/app/components/security-key-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/security-key-form.hbs
@@ -2,10 +2,9 @@
   <DButton
     @action={{this.action}}
     @icon="key"
-    @id="security-key-authenticate-button"
     @label="login.security_key_authenticate"
-    @type="button"
-    @class="btn btn-large btn-primary"
+    id="security-key-authenticate-button"
+    class="btn-large btn-primary"
   />
   <p>
     {{#if this.otherMethodAllowed}}
diff --git a/app/assets/javascripts/discourse/app/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/components/selected-posts.hbs
index 999c87f7d94..0c86bc28688 100644
--- a/app/assets/javascripts/discourse/app/components/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/app/components/selected-posts.hbs
@@ -26,7 +26,7 @@
     @action={{this.deleteSelected}}
     @icon="far-trash-alt"
     @label="topic.multi_select.delete"
-    @class="btn-danger"
+    class="btn-danger"
   />
 {{/if}}
 
@@ -35,7 +35,7 @@
     @action={{route-action "moveToTopic"}}
     @icon="sign-out-alt"
     @label="topic.move_to.action"
-    @class="btn-primary move-to-topic"
+    class="btn-primary move-to-topic"
   />
 {{/if}}
 
@@ -44,7 +44,7 @@
     @action={{route-action "changeOwner"}}
     @icon="user"
     @label="topic.change_owner.action"
-    @class="btn-primary"
+    class="btn-primary"
   />
 {{/if}}
 
@@ -53,7 +53,7 @@
     @action={{this.mergePosts}}
     @icon="arrows-alt-v"
     @label="topic.merge_posts.action"
-    @class="btn-primary"
+    class="btn-primary"
   />
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/share-source.hbs b/app/assets/javascripts/discourse/app/components/share-source.hbs
index 04a413aca2a..b6184d53f7c 100644
--- a/app/assets/javascripts/discourse/app/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/app/components/share-source.hbs
@@ -1,6 +1,6 @@
 <DButton
-  @action={{action "share" this.source}}
-  @class={{concat "btn-default share-" this.source.id}}
+  @action={{fn (action "share") this.source}}
   @translatedTitle={{this.source.title}}
-  @icon={{if this.source.icon this.source.icon this.source.htmlIcon}}
+  @icon={{or this.source.icon this.source.htmlIcon}}
+  class={{concat "btn-default share-" this.source.id}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs
index cf380a17512..db1541ef1e0 100644
--- a/app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/app/components/shared-draft-controls.hbs
@@ -17,8 +17,8 @@
         <DButton
           @action={{action "publish"}}
           @label="shared_drafts.publish"
-          @class="btn-primary publish-shared-draft"
           @icon="far-clipboard"
+          class="btn-primary publish-shared-draft"
         />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.hbs
index 5a6d3242473..a29a52c6560 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.hbs
@@ -6,10 +6,10 @@
   <:headerBelowTitle>
     <p class="sidebar__edit-navigation-menu__deselect-wrapper">
       <DButton
-        @class="btn-flat sidebar__edit-navigation-menu__deselect-button"
         @label="sidebar.edit_navigation_modal_form.deselect_button_text"
         @ariaLabel="sidebar.edit_navigation_modal_form.deselect_button_text"
         @action={{@deselectAll}}
+        class="btn-flat sidebar__edit-navigation-menu__deselect-button"
       />
 
       {{@deselectAllText}}
@@ -53,19 +53,19 @@
   <:footer>
     <div class="sidebar__edit-navigation-menu__footer">
       <DButton
-        @class="btn-primary sidebar__edit-navigation-menu__save-button"
         @label="save"
         @disabled={{@saving}}
         @action={{@save}}
+        class="btn-primary sidebar__edit-navigation-menu__save-button"
       />
 
       {{#if @showResetDefaultsButton}}
         <DButton
           @icon="undo"
-          @class="btn-flat btn-text sidebar__edit-navigation-menu__reset-defaults-button"
           @label="sidebar.edit_navigation_modal_form.reset_to_defaults"
           @disabled={{@saving}}
           @action={{@resetToDefaults}}
+          class="btn-flat btn-text sidebar__edit-navigation-menu__reset-defaults-button"
         />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
index 00e9dd99028..f3c6a544751 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/footer.hbs
@@ -6,9 +6,9 @@
       {{#if this.currentUser}}
         <DButton
           @icon="plus"
-          @action={{action this.addSection}}
-          @class="btn-flat add-section"
+          @action={{this.addSection}}
           @title="sidebar.sections.custom.add"
+          class="btn-flat add-section"
         />
       {{/if}}
 
@@ -22,7 +22,7 @@
           @action={{route-action "toggleMobileView"}}
           @title={{if this.site.mobileView "desktop_view" "mobile_view"}}
           @icon={{if this.site.mobileView "desktop" "mobile-alt"}}
-          @class="sidebar-footer-actions-button sidebar-footer-actions-toggle-mobile-view"
+          class="sidebar-footer-actions-button sidebar-footer-actions-toggle-mobile-view"
         />
       {{/if}}
 
@@ -31,7 +31,7 @@
           @action={{route-action "showKeyboardShortcutsHelp"}}
           @title="keyboard_shortcuts_help.title"
           @icon="keyboard"
-          @class="btn-flat sidebar-footer-actions-button sidebar-footer-actions-keyboard-shortcuts"
+          class="btn-flat sidebar-footer-actions-button sidebar-footer-actions-keyboard-shortcuts"
         />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
index bcb99107116..519dbd483a3 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.hbs
@@ -5,9 +5,9 @@
 <li class="sidebar-section-link-wrapper">
   <DButton
     @icon="ellipsis-v"
-    @action={{action this.toggleSectionLinks}}
-    @class="btn-flat sidebar-more-section-links-details-summary"
+    @action={{this.toggleSectionLinks}}
     @label="sidebar.more"
+    class="btn-flat sidebar-more-section-links-details-summary"
   />
 </li>
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.hbs
index 923dd7cdf24..75c45e5531d 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.hbs
@@ -65,8 +65,8 @@
   </div>
   <DButton
     @icon="trash-alt"
-    @action={{action @deleteLink @link}}
-    @class="btn-flat delete-link"
+    @action={{fn @deleteLink @link}}
     @title="sidebar.sections.custom.links.delete"
+    class="btn-flat delete-link"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs b/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs
index 07179ab69a9..74c5bbcdeec 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-header.hbs
@@ -1,10 +1,10 @@
 {{#if @collapsable}}
   <DButton
     @title="sidebar.toggle_section"
-    @class="sidebar-section-header sidebar-section-header-collapsable btn-flat"
     @action={{@toggleSectionDisplay}}
-    @ariaExpanded={{@isExpanded}}
-    @ariaControls={{@sidebarSectionContentID}}
+    aria-controls={{@sidebarSectionContentID}}
+    aria-expanded={{if @isExpanded "true" "false"}}
+    class="sidebar-section-header sidebar-section-header-collapsable btn-flat"
   >
     {{yield}}
   </DButton>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.hbs b/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.hbs
index 214eec48cc6..2dd3bedd620 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.hbs
@@ -1,10 +1,10 @@
 {{#each @buttons as |button|}}
   <DButton
-    @action={{action "switchPanel" button}}
-    @class="btn-default sidebar__panel-switch-button"
+    @action={{fn this.switchPanel button}}
     @icon={{button.switchButtonIcon}}
     @disabled={{this.isSwitching}}
     @translatedLabel={{button.switchButtonLabel}}
     data-key={{button.key}}
+    class="btn-default sidebar__panel-switch-button"
   />
 {{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/components/signup-cta.hbs
index ea8d9bfce27..b3da7b60ed0 100644
--- a/app/assets/javascripts/discourse/app/components/signup-cta.hbs
+++ b/app/assets/javascripts/discourse/app/components/signup-cta.hbs
@@ -12,12 +12,12 @@
         @action={{route-action "showCreateAccount"}}
         @label="signup_cta.sign_up"
         @icon="user"
-        @class="btn-primary"
+        class="btn-primary"
       />
       <DButton
         @action={{action "hideForSession"}}
         @label="signup_cta.hide_session"
-        @class="no-icon"
+        class="no-icon"
       />
       <a href {{on "click" this.neverShow}}>{{i18n
           "signup_cta.hide_forever"
diff --git a/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs b/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
index d492d96bce3..3a59520de10 100644
--- a/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
@@ -8,9 +8,9 @@
 
       {{#if this.user.canManageTopic}}
         <DButton
-          @class="slow-mode-remove"
-          @action={{action "disableSlowMode"}}
+          @action={{this.disableSlowMode}}
           @icon="trash-alt"
+          class="slow-mode-remove"
         />
       {{/if}}
     </h3>
diff --git a/app/assets/javascripts/discourse/app/components/summary-box.hbs b/app/assets/javascripts/discourse/app/components/summary-box.hbs
index be2ddba53c9..5da801b60dc 100644
--- a/app/assets/javascripts/discourse/app/components/summary-box.hbs
+++ b/app/assets/javascripts/discourse/app/components/summary-box.hbs
@@ -10,31 +10,31 @@
     {{#if @postAttrs.summarizable}}
       {{#if this.canCollapseSummary}}
         <DButton
-          @class="btn-primary topic-strategy-summarization"
           @action={{this.collapseSummary}}
           @title="summary.buttons.hide"
           @label="summary.buttons.hide"
           @icon="chevron-up"
+          class="btn-primary topic-strategy-summarization"
         />
       {{else}}
         <DButton
-          @class="btn-primary topic-strategy-summarization"
           @action={{this.generateSummary}}
           @translatedLabel={{this.generateSummaryTitle}}
           @translatedTitle={{this.generateSummaryTitle}}
           @icon={{this.generateSummaryIcon}}
           @disabled={{this.loadingSummary}}
+          class="btn-primary topic-strategy-summarization"
         />
       {{/if}}
     {{/if}}
 
     {{#if @postAttrs.hasTopRepliesSummary}}
       <DButton
-        @class="top-replies"
         @action={{this.toggleTopRepliesFilter}}
         @translatedTitle={{this.topRepliesTitle}}
         @translatedLabel={{this.topRepliesLabel}}
         @icon={{this.topRepliesIcon}}
+        class="top-replies"
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
index 5ccb041b939..5cff7000a69 100644
--- a/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
@@ -118,17 +118,17 @@
 
 <div class="tag-group-controls">
   <DButton
-    @class="btn-primary"
     @action={{action "save"}}
     @disabled={{this.buffered.isSaving}}
     @label="tagging.groups.save"
+    class="btn-primary"
   />
 
   <DButton
-    @class="btn-danger"
     @action={{action "destroy"}}
     @disabled={{this.buffered.isNew}}
     @icon="far-trash-alt"
     @label="tagging.groups.delete"
+    class="btn-danger"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.hbs b/app/assets/javascripts/discourse/app/components/tag-info.hbs
index bba77c53a35..a0264dd0e3d 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/tag-info.hbs
@@ -23,16 +23,16 @@
             {{#unless this.updateDisabled}}
               <DButton
                 @action={{action "finishedEditing"}}
-                @class="btn-primary submit-edit"
                 @icon="check"
                 @ariaLabel="tagging.save"
+                class="btn-primary submit-edit"
               />
             {{/unless}}
             <DButton
               @action={{action "cancelEditing"}}
-              @class="btn-default cancel-edit"
               @icon="times"
               @ariaLabel="cancel"
+              class="btn-default cancel-edit"
             />
           </div>
         </div>
@@ -123,10 +123,10 @@
             @allowCreate={{true}}
           />
           <DButton
-            @class="ok"
             @action={{action "addSynonyms"}}
             @disabled={{this.addSynonymsDisabled}}
             @icon="check"
+            class="ok"
           />
         </div>
       </section>
@@ -140,19 +140,19 @@
       </section>
       <div class="tag-actions">
         <DButton
-          @class="btn-default"
           @action={{action "toggleEditControls"}}
           @icon="cog"
           @label="tagging.edit_synonyms"
-          @id="edit-synonyms"
+          id="edit-synonyms"
+          class="btn-default"
         />
         {{#if this.deleteAction}}
           <DButton
-            @class="btn-danger delete-tag"
             @action={{action "deleteTag"}}
             @icon="far-trash-alt"
             @label="tagging.delete_tag"
-            @id="delete-tag"
+            id="delete-tag"
+            class="btn-danger delete-tag"
           />
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/components/toggle-password-mask.hbs b/app/assets/javascripts/discourse/app/components/toggle-password-mask.hbs
index 4a0be4cb0fd..e86047665da 100644
--- a/app/assets/javascripts/discourse/app/components/toggle-password-mask.hbs
+++ b/app/assets/javascripts/discourse/app/components/toggle-password-mask.hbs
@@ -1,10 +1,10 @@
 <DButton
   @action={{@togglePasswordMask}}
   @label={{if @maskPassword "login.show_password" "login.hide_password"}}
-  @class="btn-link toggle-password-mask"
   @title={{if
     @maskPassword
     "login.show_password_title"
     "login.hide_password_title"
   }}
+  class="btn-link toggle-password-mask"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/components/top-period-buttons.hbs
index 6782c4d3da1..5ce99b5a02e 100644
--- a/app/assets/javascripts/discourse/app/components/top-period-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/components/top-period-buttons.hbs
@@ -1,8 +1,7 @@
 {{#each this.periods as |p|}}
   <DButton
-    @action={{action "changePeriod"}}
-    @class="btn-default"
-    @actionParam={{p}}
+    @action={{fn this.changePeriod p}}
     @translatedLabel={{period-title p}}
+    class="btn-default"
   />
 {{/each}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/top-period-buttons.js b/app/assets/javascripts/discourse/app/components/top-period-buttons.js
index f1f637385d0..bef4b413c88 100644
--- a/app/assets/javascripts/discourse/app/components/top-period-buttons.js
+++ b/app/assets/javascripts/discourse/app/components/top-period-buttons.js
@@ -1,5 +1,6 @@
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
+import { action } from "@ember/object";
 
 export default Component.extend({
   classNames: ["top-title-buttons"],
@@ -9,9 +10,8 @@ export default Component.extend({
     return this.site.get("periods").filter((p) => p !== period);
   },
 
-  actions: {
-    changePeriod(p) {
-      this.action(p);
-    },
+  @action
+  changePeriod(p) {
+    this.action(p);
   },
 });
diff --git a/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs
index 1fe52200336..75bff4dbdb0 100644
--- a/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-dismiss-buttons.hbs
@@ -2,20 +2,20 @@
   <div class="row {{this.containerClass}}">
     {{#if this.showDismissRead}}
       <DButton
-        @class="btn-default dismiss-read"
-        @id={{this.dismissReadId}}
-        @action={{action "dismissReadPosts"}}
+        @action={{this.dismissReadPosts}}
         @translatedLabel={{this.dismissLabel}}
         @title="topics.bulk.dismiss_tooltip"
+        id={{this.dismissReadId}}
+        class="btn-default dismiss-read"
       />
     {{/if}}
     {{#if this.showResetNew}}
       <DButton
-        @class="btn-default dismiss-read"
-        @id={{this.dismissNewId}}
         @action={{this.resetNew}}
         @icon="check"
         @translatedLabel={{this.dismissNewLabel}}
+        id={{this.dismissNewId}}
+        class="btn-default dismiss-read"
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
index 7eeb77a5d5c..fc024c8c7b2 100644
--- a/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 <DButton
   @action={{action "enterTop"}}
-  @class="btn-default full jump-top"
   @ariaLabel="topic_entrance.sr_jump_top_button"
+  class="btn-default full jump-top"
 >
   {{d-icon "step-backward"}}
   {{html-safe this.topDate}}
@@ -9,8 +9,8 @@
 
 <DButton
   @action={{action "enterBottom"}}
-  @class="btn-default full jump-bottom"
   @ariaLabel="topic_entrance.sr_jump_bottom_button"
+  class="btn-default full jump-bottom"
 >
   {{html-safe this.bottomDate}}
   {{d-icon "step-forward"}}
diff --git a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
index 7ace8cae08f..f9059f0dab6 100644
--- a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.hbs
@@ -28,17 +28,18 @@
   {{#each this.inlineActionables as |actionable|}}
     {{#if (eq actionable.type "inline-button")}}
       <DButton
-        @id={{concat "topic-footer-button-" actionable.id}}
-        @class={{concat
-          "btn-default topic-footer-button "
-          actionable.classNames
-        }}
         @action={{actionable.action}}
         @icon={{actionable.icon}}
         @translatedLabel={{actionable.label}}
         @translatedTitle={{actionable.title}}
         @translatedAriaLabel={{actionable.ariaLabel}}
         @disabled={{actionable.disabled}}
+        id={{concat "topic-footer-button-" actionable.id}}
+        class={{concat-class
+          "btn-default"
+          "topic-footer-button"
+          actionable.classNames
+        }}
       />
     {{else}}
       <DropdownSelectBox
@@ -64,11 +65,11 @@
 
   {{#if this.topic.details.can_create_post}}
     <DButton
-      @class="btn-primary create"
       @icon="reply"
       @action={{this.replyToPost}}
       @label="topic.reply.title"
       @title="topic.reply.help"
+      class="btn-primary create"
     />
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs b/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
index b383317d49a..3d88ac3496c 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
@@ -1,6 +1,6 @@
 {{#unless this.hidden}}
   <div class="topic-navigation-popup">
-    <DButton @action={{action "close"}} @class="close btn-flat" @icon="times" />
+    <DButton @action={{this.close}} @icon="times" class="close btn-flat" />
     {{yield}}
   </div>
 {{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-progress.hbs b/app/assets/javascripts/discourse/app/components/topic-progress.hbs
index edbe065bff7..a0c2562a493 100644
--- a/app/assets/javascripts/discourse/app/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-progress.hbs
@@ -6,9 +6,9 @@
   <div class="progress-back-container">
     <DButton
       @label="topic.timeline.back"
-      @class="btn-primary progress-back"
-      @action={{action "goBack"}}
+      @action={{this.goBack}}
       @icon="arrow-down"
+      class="btn-primary progress-back"
     />
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs b/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs
index 4e58991621e..5a9a5932e5c 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline/back-button.hbs
@@ -1,8 +1,7 @@
 <DButton
-  @type="button"
-  @class="btn-primary btn-small back-button"
   @title={{i18n "topic.timeline.back_description"}}
   @action={{@onGoBack}}
+  class="btn-primary btn-small back-button"
 >
   {{i18n "topic.timeline.back"}}
 </DButton>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
index 08979d02356..37654880179 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
@@ -9,16 +9,16 @@
         <DButton
           @title="post.controls.edit_timer"
           @icon="pencil-alt"
-          @class="btn topic-timer-edit no-text"
           @action={{this.showTopicTimerModal}}
+          class="topic-timer-edit no-text"
         />
       {{/if}}
       {{#if this.showTrashCan}}
         <DButton
           @title="post.controls.remove_timer"
           @icon="trash-alt"
-          @class="btn topic-timer-remove no-text"
           @action={{this.removeTopicTimer}}
+          class="topic-timer-remove no-text"
         />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
index dd3e863d9e6..b85de922b9f 100644
--- a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
@@ -21,18 +21,16 @@
     {{#if this.imageUrl}}
       <DButton
         @action={{action "trash"}}
-        @class="btn-danger pad-left no-text"
         @icon="far-trash-alt"
-        @type="button"
+        class="btn-danger pad-left no-text"
       />
       <DButton
         @icon="discourse-expand"
         @title="expand"
-        @type="button"
-        @class="image-uploader-lightbox-btn no-text"
         @disabled={{this.loadingLightbox}}
         @action={{unless this.experimentalLightboxEnabled this.toggleLightbox}}
         data-lightbox-trigger={{if this.experimentalLightboxEnabled "true"}}
+        class="image-uploader-lightbox-btn no-text"
       />
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
index e0b92f2772e..1b4690a403a 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
@@ -130,10 +130,10 @@
           {{#if this.user.can_send_private_message_to_user}}
             <li class="compose-pm">
               <DButton
-                @class="btn-primary"
-                @action={{action "composePM" this.user this.post}}
+                @action={{fn (action "composePM") this.user this.post}}
                 @icon="envelope"
                 @label="user.private_message"
+                class="btn-primary"
               />
             </li>
           {{/if}}
@@ -145,10 +145,10 @@
           {{#if this.showFilter}}
             <li>
               <DButton
-                @class="btn-default"
-                @action={{action "filterPosts" this.user}}
+                @action={{fn (action "filterPosts") this.user}}
                 @icon="filter"
                 @translatedLabel={{this.filterPostsLabel}}
+                class="btn-default"
               />
             </li>
           {{/if}}
@@ -164,11 +164,10 @@
           {{#if this.showDelete}}
             <li>
               <DButton
-                @class="btn-danger"
-                @action={{action "deleteUser"}}
-                @actionParam={{this.user}}
+                @action={{fn (action "deleteUser") this.user}}
                 @icon="exclamation-triangle"
                 @label="admin.user.delete"
+                class="btn-danger"
               />
             </li>
           {{/if}}
@@ -326,11 +325,10 @@
                   {{this.user.email}}
                 {{else}}
                   <DButton
-                    @action={{action "checkEmail"}}
-                    @actionParam={{this.user}}
+                    @action={{fn (action "checkEmail") this.user}}
                     @icon="envelope"
                     @label="admin.users.check_email.text"
-                    @class="btn-primary"
+                    class="btn-primary"
                   />
                 {{/if}}
               </h3>
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
index b81151b1c84..06cf201fe7c 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
@@ -2,8 +2,8 @@
   {{#if this.siteSettings.enable_user_status}}
     <li class="set-user-status">
       <DButton
-        @class="btn-flat profile-tab-btn"
         @action={{this.setUserStatusClick}}
+        class="btn-flat profile-tab-btn"
       >
         {{#if this.currentUser.status}}
           {{emoji this.currentUser.status.emoji}}
@@ -76,8 +76,8 @@
 
   <li class="do-not-disturb">
     <DButton
-      @class="btn-flat profile-tab-btn"
       @action={{this.doNotDisturbClick}}
+      class="btn-flat profile-tab-btn"
     >
       {{d-icon (if this.isInDoNotDisturb "toggle-on" "toggle-off")}}
       <span class="item-label">
@@ -102,8 +102,8 @@
       }}
     >
       <DButton
-        @class="btn-flat profile-tab-btn"
         @action={{route-action "toggleAnonymous"}}
+        class="btn-flat profile-tab-btn"
       >
         {{#if this.currentUser.is_anonymous}}
           {{d-icon "ban"}}
@@ -134,10 +134,7 @@
   {{/each}}
 
   <li class="logout">
-    <DButton
-      @class="btn-flat profile-tab-btn"
-      @action={{route-action "logout"}}
-    >
+    <DButton @action={{route-action "logout"}} class="btn-flat profile-tab-btn">
       {{d-icon "sign-out-alt"}}
       <span class="item-label">
         {{i18n "user.log_out"}}
diff --git a/app/assets/javascripts/discourse/app/components/user-preferences/user-api-keys.hbs b/app/assets/javascripts/discourse/app/components/user-preferences/user-api-keys.hbs
index 098eb7c4b7f..1148d45da1a 100644
--- a/app/assets/javascripts/discourse/app/components/user-preferences/user-api-keys.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-preferences/user-api-keys.hbs
@@ -13,16 +13,12 @@
 
           {{#if key.revoked}}
             <DButton
-              @action={{route-action "undoRevokeApiKey"}}
-              @actionParam={{key}}
-              @class="btn"
+              @action={{fn (route-action "undoRevokeApiKey") key}}
               @label="user.undo_revoke_access"
             />
           {{else}}
             <DButton
-              @action={{route-action "revokeApiKey"}}
-              @actionParam={{key}}
-              @class="btn"
+              @action={{fn (route-action "revokeApiKey") key}}
               @label="user.revoke_access"
             />
           {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/user-stream-item.hbs b/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
index 828a195cff0..9da1f944c18 100644
--- a/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
@@ -102,18 +102,16 @@
 {{#if @item.editableDraft}}
   <div class="user-stream-item-draft-actions">
     <DButton
-      @action={{@resumeDraft}}
-      @actionParam={{@item}}
+      @action={{fn @resumeDraft @item}}
       @icon="pencil-alt"
       @label="drafts.resume"
-      @class="btn-default resume-draft"
+      class="btn-default resume-draft"
     />
     <DButton
-      @action={{@removeDraft}}
-      @actionParam={{@item}}
+      @action={{fn @removeDraft @item}}
       @icon="far-trash-alt"
-      @class="btn-danger remove-draft"
       @title="drafts.remove"
+      class="btn-danger remove-draft"
     />
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/username-preference.hbs b/app/assets/javascripts/discourse/app/components/username-preference.hbs
index 78f0b646067..f26b5dab93c 100644
--- a/app/assets/javascripts/discourse/app/components/username-preference.hbs
+++ b/app/assets/javascripts/discourse/app/components/username-preference.hbs
@@ -21,9 +21,9 @@
     <div class="control-group">
       <DButton
         @action={{this.changeUsername}}
-        @type="submit"
         @disabled={{this.saveDisabled}}
         @translatedLabel={{this.saveButtonText}}
+        type="submit"
         class="btn-primary username-preference__submit"
       />
 
@@ -40,8 +40,7 @@
 
     {{#if @user.can_edit_username}}
       <DButton
-        @action={{this.toggleEditing}}
-        @actionParam={{@user}}
+        @action={{fn this.toggleEditing @user}}
         @icon="pencil-alt"
         @title="user.username.edit"
         class="btn-small username-preference__edit-username"
diff --git a/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs b/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
index 86f2d827a25..3630068b740 100644
--- a/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
@@ -7,7 +7,7 @@
     @action={{action "changeEmail"}}
     @label="login.submit_new_email"
     @disabled={{this.submitDisabled}}
-    @class="btn-primary"
+    class="btn-primary"
   />
-  <DButton @action={{action "cancel"}} @label="cancel" @class="edit-cancel" />
+  <DButton @action={{action "cancel"}} @label="cancel" class="edit-cancel" />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/badges/show.hbs b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
index f213b44aea2..67d6f8ba126 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
@@ -21,9 +21,9 @@
           <div class="grant-info-item">
             {{i18n "badges.allow_title"}}
             <DButton
-              @class="btn-default pad-left"
-              @action={{action "toggleSetUserTitle"}}
+              @action={{this.toggleSetUserTitle}}
               @icon="pencil-alt"
+              class="btn-default pad-left"
             />
           </div>
         {{/if}}
@@ -39,9 +39,9 @@
       <div class="badge-set-title {{if this.hiddenSetTitle 'hidden' ''}}">
         <BadgeTitle @selectableUserBadges={{this.selectableUserBadges}} />
         <DButton
-          @class="btn-default close-btn"
-          @action={{action "toggleSetUserTitle"}}
+          @action={{this.toggleSetUserTitle}}
           @label="close"
+          class="btn-default close-btn"
         />
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
index 2523657c0cc..dd74f7f21a3 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
@@ -12,9 +12,9 @@
 
 {{#if this.currentUser.can_invite_to_forum}}
   <DButton
-    @class="btn-primary"
     @label="footer_nav.share"
     @icon="link"
-    @action={{action this.shareModal}}
+    @action={{this.shareModal}}
+    class="btn-primary"
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
index f2cbc55b7c6..68e961966ba 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
@@ -11,8 +11,8 @@
 {{html-safe this.message.body}}
 
 <DButton
-  @class="btn-primary"
   @label="user.private_message"
   @icon="envelope"
-  @action={{action this.switchPM this.message}}
+  @action={{fn this.switchPM this.message}}
+  class="btn-primary"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
index d1c4532adcb..0939b7c8c22 100644
--- a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
@@ -15,10 +15,10 @@
     {{#unless this.mobileView}}
       {{#if this.model.id}}
         <DButton
-          @class="category-back"
           @action={{action "goBack"}}
           @label="category.back"
           @icon="caret-left"
+          class="category-back"
         />
       {{/if}}
     {{/unless}}
@@ -88,29 +88,29 @@
 
   <div class="edit-category-footer">
     <DButton
-      @id="save-category"
-      @class="btn-primary"
       @disabled={{this.disabled}}
       @action={{action "saveCategory"}}
       @label={{this.saveLabel}}
+      id="save-category"
+      class="btn-primary"
     />
 
     {{#if this.model.can_delete}}
       <DButton
-        @class="btn-danger"
         @disabled={{this.deleteDisabled}}
         @action={{action "deleteCategory"}}
         @icon="far-trash-alt"
         @label="category.delete"
+        class="btn-danger"
       />
     {{else if this.model.id}}
       <div class="disable-info">
         <DButton
           @disabled={{this.deleteDisabled}}
-          @class="btn-default"
           @action={{action "toggleDeleteTooltip"}}
           @icon="question-circle"
           @label="category.delete"
+          class="btn-default"
         />
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/email-login.hbs b/app/assets/javascripts/discourse/app/templates/email-login.hbs
index 0522f8db370..c39af8dd47a 100644
--- a/app/assets/javascripts/discourse/app/templates/email-login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/email-login.hbs
@@ -57,8 +57,8 @@
             <DButton
               @label="email_login.confirm_button"
               @action={{action "finishLogin"}}
-              @type="submit"
-              @class="btn-primary"
+              type="submit"
+              class="btn-primary"
             />
           {{/unless}}
         </div>
diff --git a/app/assets/javascripts/discourse/app/templates/exception.hbs b/app/assets/javascripts/discourse/app/templates/exception.hbs
index 3887036ec77..45f281bfcbc 100644
--- a/app/assets/javascripts/discourse/app/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/app/templates/exception.hbs
@@ -27,7 +27,7 @@
             @icon={{buttonData.icon}}
             @action={{buttonData.action}}
             @label={{buttonData.key}}
-            @class={{buttonData.classes}}
+            class={{buttonData.classes}}
           />
         {{/each}}
         <ConditionalLoadingSpinner @condition={{this.loading}} />
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index e7e293183f7..513fe45f0bf 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -36,12 +36,12 @@
         @options={{hash castInteger=true}}
       />
       <DButton
-        @action={{action "search" (hash collapseFilters=true)}}
+        @action={{fn (action "search") (hash collapseFilters=true)}}
         @icon="search"
         @label="search.search_button"
-        @class="btn-primary search-cta"
         @ariaLabel="search.search_button"
         @disabled={{this.searchButtonDisabled}}
+        class="btn-primary search-cta"
       />
     </div>
     {{#if this.usingDefaultSearchType}}
@@ -91,16 +91,16 @@
           {{#if this.canBulkSelect}}
             <DButton
               @icon="list"
-              @class="btn-default bulk-select"
               @title="topics.bulk.toggle"
               @action={{action "toggleBulkSelect"}}
+              class="btn-default bulk-select"
             />
             {{#if this.selected}}
               <DButton
-                @class="btn-default bulk-select-btn"
                 @selected={{this.selected}}
                 @action={{action "showBulkActions"}}
                 @icon="wrench"
+                class="btn-default bulk-select-btn"
               />
             {{/if}}
           {{/if}}
@@ -109,18 +109,18 @@
             {{#if this.hasUnselectedResults}}
               <DButton
                 @icon="check-square"
-                @class="btn-default"
                 @action={{action "selectAll"}}
                 @label="search.select_all"
+                class="btn-default"
               />
             {{/if}}
 
             {{#if this.hasSelection}}
               <DButton
                 @icon="far-square"
-                @class="btn-default"
                 @action={{action "clearAll"}}
                 @label="search.clear_all"
+                class="btn-default"
               />
             {{/if}}
           {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index 5ff4889eaa4..e14a51ef85e 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -7,10 +7,10 @@
 
     {{#if this.canManageGroup}}
       <DButton
-        @class="bulk-select"
         @icon="list"
-        @action={{action "toggleBulkSelect"}}
+        @action={{this.toggleBulkSelect}}
         @title="topics.bulk.toggle"
+        class="bulk-select"
       />
     {{/if}}
 
@@ -36,18 +36,18 @@
             />
 
             <DButton
-              @action={{action "bulkClearAll"}}
+              @action={{this.bulkClearAll}}
               @label="topics.bulk.clear_all"
               @icon="far-square"
-              @class="bulk-select-clear"
+              class="bulk-select-clear"
             />
           {{/if}}
 
           <DButton
-            @action={{action "bulkSelectAll"}}
+            @action={{this.bulkSelectAll}}
             @label="topics.bulk.select_all"
             @icon="check-square"
-            @class="bulk-select-all"
+            class="bulk-select-all"
           />
 
         </span>
@@ -58,7 +58,7 @@
           @icon="plus"
           @action={{route-action "showAddMembersModal"}}
           @label="groups.manage.add_members"
-          @class="btn-default group-members-add"
+          class="btn-default group-members-add"
         />
 
         {{#if this.currentUser.can_invite_to_forum}}
@@ -66,7 +66,7 @@
             @icon="plus"
             @action={{route-action "showInviteModal"}}
             @label="groups.manage.invite_members"
-            @class="btn-default group-members-add"
+            class="btn-default group-members-add"
           />
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
index 882bec7e7cf..903a6fe771e 100644
--- a/app/assets/javascripts/discourse/app/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
@@ -67,24 +67,21 @@
                 {{else if m.request_accepted}}
                   {{i18n "groups.requests.accepted"}}
                   <DButton
-                    @action={{action "undoAcceptRequest"}}
-                    @actionParam={{m}}
+                    @action={{fn (action "undoAcceptRequest") m}}
                     @label="groups.requests.undo"
                   />
                 {{else if m.request_denied}}
                   {{i18n "groups.requests.denied"}}
                 {{else}}
                   <DButton
-                    @action={{action "acceptRequest"}}
-                    @actionParam={{m}}
+                    @action={{fn (action "acceptRequest") m}}
                     @label="groups.requests.accept"
-                    @class="btn-primary"
+                    class="btn-primary"
                   />
                   <DButton
-                    @action={{action "denyRequest"}}
-                    @actionParam={{m}}
+                    @action={{fn (action "denyRequest") m}}
                     @label="groups.requests.deny"
-                    @class="btn-danger"
+                    class="btn-danger"
                   />
                 {{/if}}
               </div>
diff --git a/app/assets/javascripts/discourse/app/templates/group.hbs b/app/assets/javascripts/discourse/app/templates/group.hbs
index 6e0245e4b8b..1a7b2d50817 100644
--- a/app/assets/javascripts/discourse/app/templates/group.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group.hbs
@@ -48,28 +48,28 @@
         {{#if this.currentUser.admin}}
           {{#if this.model.automatic}}
             <DButton
-              @action={{action "toggleDeleteTooltip"}}
-              @class="btn-default"
+              @action={{this.toggleDeleteTooltip}}
               @icon="question-circle"
               @label="admin.groups.delete"
+              class="btn-default"
             />
           {{else}}
             <DButton
-              @action={{action "destroyGroup"}}
+              @action={{this.destroyGroup}}
               @disabled={{this.destroying}}
               @icon="trash-alt"
-              @class="btn-danger"
               @label="admin.groups.delete"
+              class="btn-danger"
             />
           {{/if}}
         {{/if}}
 
         {{#if this.displayGroupMessageButton}}
           <DButton
-            @action={{action "messageGroup"}}
-            @class="btn-primary group-message-button"
+            @action={{this.messageGroup}}
             @icon="envelope"
             @label="groups.message"
+            class="btn-primary group-message-button"
           />
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
index de132cbc212..bff756a98a9 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
@@ -8,10 +8,10 @@
   <div class="groups-header">
     {{#if this.currentUser.can_create_group}}
       <DButton
-        @action={{action "new"}}
-        @class="btn-default groups-header-new pull-right"
+        @action={{this.new}}
         @icon="plus"
         @label="admin.groups.new.title"
+        class="btn-default groups-header-new pull-right"
       />
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/groups/new.hbs b/app/assets/javascripts/discourse/app/templates/groups/new.hbs
index 0f650a47bfa..69028bc4262 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/new.hbs
@@ -39,11 +39,11 @@
 
     <div class="control-group buttons">
       <DButton
-        @action={{action "save"}}
-        @type="submit"
+        @action={{this.save}}
         @disabled={{this.saving}}
-        @class="btn btn-primary group-form-save"
         @label="admin.groups.new.create"
+        type="submit"
+        class="btn-primary group-form-save"
       />
 
       <LinkTo @route="groups">
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index b8d365b523d..b9c00c61a54 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -183,11 +183,11 @@
 
                 <div class="invitation-cta">
                   <DButton
-                    @class="btn-primary invitation-cta__accept"
                     @action={{action "submit"}}
-                    @type="submit"
                     @disabled={{this.submitDisabled}}
                     @label="invites.accept_invite"
+                    type="submit"
+                    class="btn-primary invitation-cta__accept"
                   />
                   <div class="invitation-cta__info">
                     <span class="invitation-cta__signed-up">{{i18n
@@ -195,8 +195,8 @@
                       }}</span>
                     <DButton
                       @action={{route-action "showLogin"}}
-                      @class="btn-flat invitation-cta__sign-in"
                       @label="log_in"
+                      class="btn-flat invitation-cta__sign-in"
                     />
                   </div>
                 </div>
@@ -214,11 +214,11 @@
             {{#if this.existingUserRedeeming}}
               {{#if this.existingUserCanRedeem}}
                 <DButton
-                  @class="btn-primary"
                   @action={{action "submit"}}
-                  @type="submit"
                   @disabled={{this.submitDisabled}}
                   @label="invites.accept_invite"
+                  type="submit"
+                  class="btn-primary"
                 />
               {{else}}
                 <div
diff --git a/app/assets/javascripts/discourse/app/templates/login-preferences.hbs b/app/assets/javascripts/discourse/app/templates/login-preferences.hbs
index 7734e076d6b..2210a9a8ba7 100644
--- a/app/assets/javascripts/discourse/app/templates/login-preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/login-preferences.hbs
@@ -4,8 +4,8 @@
   <p style="margin-top: 1em">{{i18n "login.preferences"}}</p>
 
   <DButton
-    @class="btn-primary"
     @action={{route-action "showLogin"}}
     @label="log_in"
+    class="btn-primary"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
index 80b528f90c1..84169f02da4 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
@@ -40,8 +40,8 @@
   <DButton
     @label="user.associated_accounts.connect"
     @action={{action "finishConnect"}}
-    @class="btn-primary"
     @icon="plug"
+    class="btn-primary"
   />
   <DButton
     @label="user.associated_accounts.cancel"
diff --git a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
index 0ddbcd20b11..81d7d33d533 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
@@ -77,7 +77,7 @@
           }}
           @disabled={{this.gravatarRefreshDisabled}}
           @icon="sync"
-          @class="btn-default avatar-selector-refresh-gravatar"
+          class="btn-default avatar-selector-refresh-gravatar"
         />
 
         {{#if this.gravatarFailed}}
@@ -121,9 +121,9 @@
   <div class="modal-footer">
     <DButton
       @action={{action "saveAvatarSelection"}}
-      @class="btn-primary"
       @disabled={{this.submitDisabled}}
       @label="save"
+      class="btn-primary"
     />
     <DModalCancel @close={{route-action "closeModal"}} />
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
index 65893473ac9..6d0e20de088 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
@@ -29,9 +29,9 @@
 
 <div class="modal-footer">
   <DButton
-    @class="btn-primary"
     @action={{action "changeOwnershipOfPosts"}}
     @disabled={{this.buttonDisabled}}
     @label={{if this.saving "saving" "topic.change_owner.action"}}
+    class="btn-primary"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs
index 0a5a0756349..36672ed3e5d 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs
@@ -10,17 +10,17 @@
 
 <div class="modal-footer">
   <DButton
-    @class="btn-primary"
     @label={{if this.saving "saving" "save"}}
-    @action={{action "setNotice" this.notice}}
+    @action={{fn this.setNotice this.notice}}
     @disabled={{this.disabled}}
+    class="btn-primary"
   />
   {{#if this.model.notice}}
     <DButton
-      @class="btn-danger"
       @label="post.controls.delete_post_notice"
-      @action={{action "setNotice"}}
+      @action={{this.setNotice}}
       @disabled={{this.saving}}
+      class="btn-danger"
     />
   {{/if}}
   <DModalCancel @close={{route-action "closeModal"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
index f9e6abc5ade..97ca587358b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
@@ -235,20 +235,20 @@
 
           <div class="modal-footer">
             <DButton
-              @class="btn-large btn-primary"
               @action={{action "createAccount"}}
               @disabled={{this.submitDisabled}}
               @label="create_account.title"
               @isLoading={{this.formSubmitted}}
+              class="btn-large btn-primary"
             />
 
             {{#unless this.hasAuthOptions}}
               <DButton
-                @class="btn-large"
-                @id="login-link"
                 @action={{route-action "showLogin"}}
                 @disabled={{this.formSubmitted}}
                 @label="log_in"
+                id="login-link"
+                class="btn-large"
               />
             {{/unless}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
index c539bb6c3ba..0d91b1737ee 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
@@ -71,8 +71,8 @@
         {{#if this.capabilities.hasContactPicker}}
           <DButton
             @icon="address-book"
-            @action={{action "searchContact"}}
-            @class="btn-primary open-contact-picker"
+            @action={{this.searchContact}}
+            class="btn-primary open-contact-picker"
           />
         {{/if}}
       </div>
@@ -165,8 +165,8 @@
   <DButton
     @icon="link"
     @label="user.invited.invite.save_invite"
-    @class="btn-primary save-invite"
-    @action={{action "saveInvite"}}
+    @action={{this.saveInvite}}
+    class="btn-primary save-invite"
   />
 
   <DButton
@@ -176,12 +176,12 @@
       "user.invited.reinvite"
       "user.invited.invite.send_invite_email"
     }}
-    @class="btn-primary send-invite"
-    @action={{action "saveInvite" true}}
+    @action={{fn this.saveInvite true}}
     @title={{unless
       this.isEmail
       "user.invited.invite.send_invite_email_instructions"
     }}
     @disabled={{not this.isEmail}}
+    class="btn-primary send-invite"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
index 1003d2f0b30..5edb9cea0aa 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
@@ -17,9 +17,9 @@
 
 <div class="modal-footer">
   <DButton
-    @class="btn-primary"
     @disabled={{this.buttonDisabled}}
     @action={{action "grantBadge"}}
     @label="admin.badges.grant"
+    class="btn-primary"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
index c8850a9a39c..d4ae9fedcd4 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
@@ -4,7 +4,7 @@
       @action={{action "displayRaw"}}
       @label="post.raw_email.displays.raw.button"
       @title="post.raw_email.displays.raw.title"
-      @class={{if this.showRawEmail "active"}}
+      class={{if this.showRawEmail "active"}}
     />
 
     {{#if this.textPart}}
@@ -12,7 +12,7 @@
         @action={{action "displayTextPart"}}
         @label="post.raw_email.displays.text_part.button"
         @title="post.raw_email.displays.text_part.title"
-        @class={{if this.showTextPart "active"}}
+        class={{if this.showTextPart "active"}}
       />
     {{/if}}
 
@@ -21,7 +21,7 @@
         @action={{action "displayHtmlPart"}}
         @label="post.raw_email.displays.html_part.button"
         @title="post.raw_email.displays.html_part.title"
-        @class={{if this.showHtmlPart "active"}}
+        class={{if this.showHtmlPart "active"}}
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
index 928f702667d..08e081f7896 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
@@ -11,13 +11,13 @@
 <div class="modal-footer">
   <DButton
     @icon="trash-alt"
-    @class="btn-danger"
-    @action={{action "perform"}}
+    @action={{this.perform}}
     @label="admin.user.delete"
+    class="btn-danger"
   />
   <DButton
     @action={{route-action "closeModal"}}
     @label="cancel"
-    @class="cancel"
+    class="cancel"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
index 0b6928f9313..58bb885f9c6 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
@@ -24,16 +24,14 @@
               @min="0"
             />
             <DButton
-              @class="btn-default no-text"
-              @action={{action "moveUp"}}
-              @actionParam={{cat}}
+              @action={{fn (action "moveUp") cat}}
               @icon="arrow-up"
+              class="btn-default no-text"
             />
             <DButton
-              @class="btn-default no-text"
-              @action={{action "moveDown"}}
-              @actionParam={{cat}}
+              @action={{fn (action "moveDown") cat}}
               @icon="arrow-down"
+              class="btn-default no-text"
             />
           </td>
         </tr>
@@ -45,8 +43,8 @@
 
 <div class="modal-footer">
   <DButton
-    @class="btn-primary"
     @action={{action "save"}}
     @label="categories.reorder.save"
+    class="btn-primary"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
index c65f109b7af..3a694479aec 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
@@ -11,10 +11,10 @@
 
   <div class="modal-footer">
     <DButton
-      @class="btn-primary"
       @disabled={{this.disableSubmit}}
       @label="groups.membership_request.submit"
       @action={{action "requestMember"}}
+      class="btn-primary"
     />
 
     <DModalCancel @close={{route-action "closeModal"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/filter.hbs b/app/assets/javascripts/discourse/app/templates/navigation/filter.hbs
index 97d3714fcb1..8e6d697fe1b 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/filter.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/filter.hbs
@@ -26,16 +26,16 @@
       <div class="topic-query-filter__controls">
         <DButton
           @icon="times"
-          @action={{action this.clearInput}}
+          @action={{this.clearInput}}
           @disabled={{unless this.newQueryString "true"}}
         />
 
         {{#if this.discoveryFilter.q}}
           <DButton
             @icon={{this.copyIcon}}
-            @class={{this.copyClass}}
             @action={{this.copyQueryString}}
             @disabled={{unless this.newQueryString "true"}}
+            class={{this.copyClass}}
           />
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
index 7f8774da6a2..bf852d4268f 100644
--- a/app/assets/javascripts/discourse/app/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
@@ -57,9 +57,9 @@
           {{#unless this.securityKeyRequired}}
             <DButton
               @action={{action "submit"}}
-              @class="btn-primary"
               @label="submit"
-              @type="submit"
+              type="submit"
+              class="btn-primary"
             />
           {{/unless}}
         {{else}}
@@ -89,9 +89,9 @@
 
           <DButton
             @action={{action "submit"}}
-            @class="btn-primary"
             @label="user.change_password.set_password"
-            @type="submit"
+            type="submit"
+            class="btn-primary"
           />
         {{/if}}
       </form>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
index 08f9caf979a..14136432eef 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
@@ -37,11 +37,11 @@
         </div>
         <div class="controls save-button">
           <DButton
-            @class="btn-primary"
             @action={{action "saveEmail"}}
-            @type="submit"
             @disabled={{this.saveDisabled}}
             @translatedLabel={{this.saveButtonText}}
+            type="submit"
+            class="btn-primary"
           />
           <CancelLink
             @route="preferences.account"
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
index a48025158c1..82a5fc4276d 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
@@ -46,10 +46,10 @@
               {{/each}}
               <DButton
                 @action={{action "createTotp"}}
-                @class="btn-default new-totp"
                 @icon="plus"
                 @disabled={{this.loading}}
                 @label="user.second_factor.totp.add"
+                class="btn-default new-totp"
               />
             </div>
           </div>
@@ -82,10 +82,10 @@
               {{/each}}
               <DButton
                 @action={{action "createSecurityKey"}}
-                @class="btn-default new-security-key"
                 @icon="plus"
                 @disabled={{this.loading}}
                 @label="user.second_factor.security_key.add"
+                class="btn-default new-security-key"
               />
             </div>
           </div>
@@ -106,10 +106,10 @@
                     {{else}}
                       <DButton
                         @action={{action "editSecondFactorBackup"}}
-                        @class="btn-default new-second-factor-backup"
                         @icon="plus"
                         @disabled={{this.loading}}
                         @label="user.second_factor_backup.enable_long"
+                        class="btn-default new-second-factor-backup"
                       />
                     {{/if}}
                   </div>
@@ -144,11 +144,11 @@
               <div class="control-group pref-second-factor-disable-all">
                 <div class="controls -actions">
                   <DButton
-                    @class="btn-danger"
                     @icon="ban"
                     @action={{action "disableAllSecondFactors"}}
                     @disabled={{this.loading}}
                     @label="user.second_factor.disable_all"
+                    class="btn-danger"
                   />
                   <CancelLink
                     @route="preferences.security"
@@ -181,11 +181,11 @@
           <div class="control-group">
             <div class="controls -actions">
               <DButton
-                @class="btn-primary"
-                @type="submit"
                 @action={{action "confirmPassword"}}
                 @disabled={{this.loading}}
                 @label="continue"
+                type="submit"
+                class="btn-primary"
               />
 
               {{#unless this.showEnforcedNotice}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index bb4ba0ddfb0..72a805ab92d 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -18,11 +18,10 @@
       {{! we want the "huge" version even though we're downsizing it in CSS }}
       {{bound-avatar this.model "huge"}}
       <DButton
-        @action={{route-action "showAvatarSelector"}}
-        @actionParam={{this.model}}
-        @class="btn-default pad-left"
+        @action={{fn (route-action "showAvatarSelector") this.model}}
         @icon="pencil-alt"
         id="edit-avatar"
+        class="btn-default pad-left"
       />
     </div>
   </div>
@@ -105,12 +104,11 @@
     {{else}}
       <div class="controls">
         <DButton
-          @action={{route-action "checkEmail"}}
-          @class="btn-default"
-          @actionParam={{this.model}}
+          @action={{fn (route-action "checkEmail") this.model}}
           @title="admin.users.check_email.title"
           @icon="envelope"
           @label="admin.users.check_email.text"
+          class="btn-default"
         />
       </div>
     {{/if}}
@@ -138,12 +136,14 @@
                 <td>
                   {{#if authProvider.method.can_revoke}}
                     <DButton
-                      @action={{action "revokeAccount"}}
-                      @actionParam={{authProvider.account}}
+                      @action={{fn
+                        (action "revokeAccount")
+                        authProvider.account
+                      }}
                       @title="user.associated_accounts.revoke"
-                      @class="btn-danger no-text"
                       @icon="trash-alt"
                       @disabled={{get this.revoking authProvider.method.name}}
+                      class="btn-danger no-text"
                     />
                   {{/if}}
                 </td>
@@ -154,12 +154,14 @@
                 <td colspan="2">
                   {{#if authProvider.method.can_connect}}
                     <DButton
-                      @action={{action "connectAccount"}}
-                      @actionParam={{authProvider.method}}
+                      @action={{fn
+                        (action "connectAccount")
+                        authProvider.method
+                      }}
                       @label="user.associated_accounts.connect"
-                      @class="btn-default"
                       @icon="plug"
                       @disabled={{this.disableConnectButtons}}
+                      class="btn-default"
                     />
                   {{else}}
                     {{i18n "user.associated_accounts.not_connected"}}
@@ -173,8 +175,7 @@
     {{else}}
       <div class="controls">
         <DButton
-          @action={{route-action "checkEmail"}}
-          @actionParam={{this.model}}
+          @action={{fn (route-action "checkEmail") this.model}}
           @title="admin.users.check_email.title"
           @icon="envelope"
           @label="admin.users.check_email.text"
@@ -251,10 +252,9 @@
         <span class="static">{{i18n "user.status.not_set"}}</span>
       {{/if}}
       <DButton
-        @action={{action "showUserStatusModal"}}
-        @actionParam={{this.newStatus}}
-        @class="btn-default btn-small pad-left"
+        @action={{fn (action "showUserStatusModal") this.newStatus}}
         @icon="pencil-alt"
+        class="btn-default btn-small pad-left"
       />
     </div>
   </div>
@@ -285,9 +285,9 @@
     <div class="controls">
       <DButton
         @action={{action "exportUserArchive"}}
-        @class="btn-default btn-request-archive"
         @label="user.download_archive.button_text"
         @icon="download"
+        class="btn-default btn-request-archive"
       />
     </div>
     <div class="instructions">
@@ -329,9 +329,9 @@
       <DButton
         @action={{action "delete"}}
         @disabled={{this.deleteDisabled}}
-        @class="btn-danger"
         @icon="far-trash-alt"
         @label="user.delete_account"
+        class="btn-danger"
       />
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 1c1d072c337..95c5dce5334 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -74,7 +74,7 @@
           @action={{action "undoColorSchemePreview"}}
           @label="user.color_schemes.undo"
           @icon="undo"
-          @class="btn-default btn-small undo-preview"
+          class="btn-default btn-small undo-preview"
         />
       {{/if}}
       <div class="controls color-scheme-checkbox">
@@ -245,9 +245,9 @@
   />
   {{#if this.site.user_tips}}
     <DButton
-      @class="pref-reset-seen-user-tips"
       @action={{action "resetSeenUserTips"}}
       data-setting-name="user-reset-seen-user-tips"
+      class="pref-reset-seen-user-tips"
     >{{i18n "user.reset_seen_user_tips"}}</DButton>
   {{/if}}
 </fieldset>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index b87f0754a5d..ccc26fa0115 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -15,10 +15,10 @@
     @class="input-xxlarge"
   />
   <DButton
-    @class="btn-default"
     @icon="globe"
     @label="user.use_current_timezone"
     @action={{action "useCurrentTimezone"}}
+    class="btn-default"
   />
 </div>
 
@@ -120,15 +120,15 @@
 
     <div>
       <DButton
-        @action={{action "showFeaturedTopicModal"}}
-        @class="btn-default feature-topic-on-profile-btn"
+        @action={{this.showFeaturedTopicModal}}
         @label="user.feature_topic_on_profile.open_search"
+        class="btn-default feature-topic-on-profile-btn"
       />
       {{#if this.model.featured_topic}}
         <DButton
           @action={{action "clearFeaturedTopicFromProfile"}}
-          @class="btn-danger clear-feature-topic-on-profile-btn"
           @label="user.feature_topic_on_profile.clear.title"
+          class="btn-danger clear-feature-topic-on-profile-btn"
         />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/review-index.hbs b/app/assets/javascripts/discourse/app/templates/review-index.hbs
index 2804d1637c1..90ba4d445e1 100644
--- a/app/assets/javascripts/discourse/app/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-index.hbs
@@ -100,10 +100,10 @@
         <div class="reviewable-filter topic-filter">
           {{i18n "review.filtered_topic"}}
           <DButton
-            @class="btn-default"
             @label="review.show_all_topics"
             @icon="times"
             @action={{action "resetTopic"}}
+            class="btn-default"
           />
         </div>
       {{/if}}
@@ -133,16 +133,16 @@
       <DButton
         @icon="sync"
         @label="review.filters.refresh"
-        @class="btn-primary refresh"
         @action={{action "refresh"}}
+        class="btn-primary refresh"
       />
 
       {{#if this.site.mobileView}}
         <DButton
           @label="show_help"
           @icon={{this.toggleFiltersIcon}}
-          @class="btn-default expand-secondary-filters"
           @action={{action "toggleFilters"}}
+          class="btn-default expand-secondary-filters"
         />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/review-settings.hbs b/app/assets/javascripts/discourse/app/templates/review-settings.hbs
index 8299f52de5c..c8525d71366 100644
--- a/app/assets/javascripts/discourse/app/templates/review-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-settings.hbs
@@ -20,9 +20,9 @@
       <DButton
         @icon="check"
         @label="review.settings.save_changes"
-        @class="btn-primary save-settings"
         @action={{action "save"}}
         @disabled={{this.saving}}
+        class="btn-primary save-settings"
       />
 
       {{#if this.saved}}
diff --git a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
index 70b095ae902..bb75baaf22d 100644
--- a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
+++ b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
@@ -10,12 +10,11 @@
   {{#if this.showSecurityKeyForm}}
     <div id="security-key">
       <DButton
-        @action={{action "authenticateSecurityKey"}}
+        @action={{this.authenticateSecurityKey}}
         @icon="key"
-        @id="security-key-authenticate-button"
         @label="login.security_key_authenticate"
-        @type="button"
-        @class="btn btn-large btn-primary"
+        id="security-key-authenticate-button"
+        class="btn-large btn-primary"
       />
     </div>
   {{else if (or this.showTotpForm this.showBackupCodesForm)}}
@@ -26,10 +25,10 @@
         @onTokenInput={{action "onTokenInput"}}
       />
       <DButton
-        @action={{action "authenticateToken"}}
-        @class="btn-primary"
+        @action={{this.authenticateToken}}
         @label="submit"
-        @type="submit"
+        type="submit"
+        class="btn-primary"
       />
     </form>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/tag-groups.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups.hbs
index 08d7bc0217f..cc781c8df3b 100644
--- a/app/assets/javascripts/discourse/app/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag-groups.hbs
@@ -20,10 +20,10 @@
         </ul>
 
         <DButton
-          @class="btn-default"
           @action={{action "newTagGroup"}}
           @icon="plus"
           @label="tagging.groups.new"
+          class="btn-default"
         />
       </div>
     {{/if}}
@@ -34,5 +34,4 @@
       <div class="alert info">{{i18n "tagging.groups.disabled"}}</div>
     </div>
   {{/if}}
-
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index e06725d1768..6e3685c223a 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -95,15 +95,15 @@
             <div class="edit-controls">
               <DButton
                 @action={{action "finishedEditingTopic"}}
-                @class="btn-primary submit-edit"
                 @icon="check"
                 @ariaLabel="composer.save_edit"
+                class="btn-primary submit-edit"
               />
               <DButton
                 @action={{action "cancelEditingTopic"}}
-                @class="btn-default cancel-edit"
                 @icon="times"
                 @ariaLabel="composer.cancel"
+                class="btn-default cancel-edit"
               />
 
               {{#if this.canRemoveTopicFeaturedLink}}
@@ -414,10 +414,10 @@
                       </div>
                       <div class="reviewable-actions">
                         <DButton
-                          @class="btn-danger"
                           @label="review.delete"
                           @icon="trash-alt"
-                          @action={{action "deletePending" pending}}
+                          @action={{fn (action "deletePending") pending}}
+                          class="btn-danger"
                         />
                       </div>
                     </div>
@@ -540,9 +540,9 @@
           <div id="topic-footer-buttons">
             <DButton
               @icon="reply"
-              @class="btn-primary pull-right"
               @action={{route-action "showLogin"}}
               @label="topic.reply.title"
+              class="btn-primary pull-right"
             />
           </div>
         {{/if}}
@@ -572,17 +572,17 @@
               {{#unless this.currentUser}}
                 <DButton
                   @action={{route-action "showLogin"}}
-                  @class="btn-primary topic-retry"
                   @icon="user"
                   @label="log_in"
+                  class="btn-primary topic-retry"
                 />
               {{/unless}}
             {{else}}
               <DButton
                 @action={{action "retryLoading"}}
-                @class="btn-primary topic-retry"
                 @icon="sync"
                 @label="errors.buttons.again"
+                class="btn-primary topic-retry"
               />
             {{/if}}
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
index 25cb311913a..811017f0a4f 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
@@ -17,19 +17,19 @@
         {{/if}}
         <DSection @class="user-invite-buttons">
           <DButton
-            @class="btn-default"
             @icon="plus"
-            @action={{action "createInvite"}}
+            @action={{this.createInvite}}
             @label="user.invited.create"
+            class="btn-default"
           />
           {{#if this.canBulkInvite}}
             {{#if this.siteSettings.allow_bulk_invite}}
               {{#unless this.site.mobileView}}
                 <DButton
-                  @class="btn-flat"
                   @icon="upload"
-                  @action={{action "createInviteCsv"}}
+                  @action={{this.createInviteCsv}}
                   @label="user.invited.bulk_invite.text"
+                  class="btn-flat"
                 />
               {{/unless}}
             {{/if}}
@@ -43,7 +43,7 @@
               {{else}}
                 <DButton
                   @icon="times"
-                  @action={{action "destroyAllExpired"}}
+                  @action={{this.destroyAllExpired}}
                   @label="user.invited.remove_all"
                 />
               {{/if}}
@@ -60,10 +60,10 @@
                 </span>
               {{else if this.hasEmailInvites}}
                 <DButton
-                  @class="btn-default"
                   @icon="sync"
-                  @action={{action "reinviteAll"}}
+                  @action={{this.reinviteAll}}
                   @label="user.invited.reinvite_all"
+                  class="btn-default"
                 />
               {{/if}}
             {{/if}}
@@ -187,20 +187,20 @@
                     {{#if invite.can_delete_invite}}
                       <td class="invite-actions">
                         <DButton
-                          @class="btn-default"
                           @icon="pencil-alt"
-                          @action={{action "editInvite" invite}}
+                          @action={{fn this.editInvite invite}}
                           @title="user.invited.edit"
+                          class="btn-default"
                         />
                         <DButton
                           @icon="trash-alt"
-                          @class="cancel"
-                          @action={{action "destroyInvite" invite}}
+                          @action={{fn this.destroyInvite invite}}
                           @title={{if
                             invite.destroyed
                             "user.invited.removed"
                             "user.invited.remove"
                           }}
+                          class="cancel"
                         />
                       </td>
                     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 0e08cef4409..ab70bfe9f66 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -296,10 +296,13 @@
               {{#if this.model.can_send_private_message_to_user}}
                 <li>
                   <DButton
-                    @class="btn-primary compose-pm"
-                    @action={{route-action "composePrivateMessage" this.model}}
+                    @action={{fn
+                      (route-action "composePrivateMessage")
+                      this.model
+                    }}
                     @icon="envelope"
                     @label="user.private_message"
+                    class="btn-primary compose-pm"
                   />
                 </li>
               {{/if}}
@@ -334,13 +337,17 @@
               {{#if this.canExpandProfile}}
                 <li>
                   <DButton
-                    @ariaExpanded={{this.collapsedInfoState.isExpanded}}
                     @ariaLabel={{this.collapsedInfoState.ariaLabel}}
-                    @ariaControls="collapsed-info-panel"
-                    @class="btn-default"
                     @label={{concat "user." this.collapsedInfoState.label}}
                     @icon={{this.collapsedInfoState.icon}}
                     @action={{action this.collapsedInfoState.action}}
+                    aria-controls="collapsed-info-panel"
+                    aria-expanded={{if
+                      this.collapsedInfoState.isExpanded
+                      "true"
+                      "false"
+                    }}
+                    class="btn-default"
                   />
                 </li>
               {{/if}}
@@ -396,11 +403,10 @@
                       {{this.model.email}}
                     {{else}}
                       <DButton
-                        @action={{route-action "checkEmail"}}
-                        @actionParam={{this.model}}
+                        @action={{fn (route-action "checkEmail") this.model}}
                         @icon="envelope"
                         @label="admin.users.check_email.text"
-                        @class="btn-primary"
+                        class="btn-primary"
                       />
                     {{/if}}
                   </dd>
@@ -435,7 +441,7 @@
                     @action={{action "adminDelete"}}
                     @icon="exclamation-triangle"
                     @label="user.admin_delete"
-                    @class="btn-danger btn-delete-user"
+                    class="btn-danger btn-delete-user"
                   /></div>
               {{/if}}
             </dl>
diff --git a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
index f8071927085..f720fa6a24c 100644
--- a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
@@ -18,12 +18,7 @@
         id="bookmark-search"
         autocomplete="off"
       />
-      <DButton
-        @class="btn-primary"
-        @action={{action "search"}}
-        @type="button"
-        @icon="search"
-      />
+      <DButton @action={{this.search}} @icon="search" class="btn-primary" />
     </div>
     {{#if this.nothingFound}}
       <div class="alert alert-info">{{i18n "user.no_bookmarks_search"}}</div>
diff --git a/app/assets/javascripts/discourse/app/templates/user/messages.hbs b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
index e82c41d2265..d9e50a72f21 100644
--- a/app/assets/javascripts/discourse/app/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
@@ -33,10 +33,10 @@
 
     {{#if this.showNewPM}}
       <DButton
-        @class="btn-primary new-private-message"
         @action={{route-action "composePrivateMessage"}}
         @icon="envelope"
         @label="user.new_private_message"
+        class="btn-primary new-private-message"
       />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 7e540e15477..6b058710a34 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -65,11 +65,11 @@
     <div class="navigation-controls">
       <DButton
         @title="user.dismiss_notifications_tooltip"
-        @class="btn btn-default dismiss-notifications"
         @action={{action "resetNew"}}
         @label="user.dismiss_notifications"
         @icon="check"
         @disabled={{this.allNotificationsRead}}
+        class="btn-default dismiss-notifications"
       />
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index e53ef4d10d6..cfb476c4ccc 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -57,8 +57,8 @@
             {{#if this.currentUser.staff}}
               <DButton
                 @icon="wrench"
-                @action={{action "showEditColumnsModal"}}
-                @class="btn-default open-edit-columns-btn"
+                @action={{this.showEditColumnsModal}}
+                class="btn-default open-edit-columns-btn"
               />
             {{/if}}
             <PluginOutlet
@@ -83,7 +83,6 @@
             <p>{{i18n "directory.no_results"}}</p>
           {{/if}}
         </ConditionalLoadingSpinner>
-
       </div>
     </div>
   </LoadMore>
diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js
index c146d22f3b9..be36c90d19c 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js
@@ -17,10 +17,18 @@ module("Integration | Component | admin-user-field-item", function (hooks) {
   test("cancel action", async function (assert) {
     this.set("userField", { id: 1, field_type: "text" });
     this.set("isEditing", true);
+    this.set("destroyAction", () => {});
+    this.set("moveUpAction", () => {});
+    this.set("moveDownAction", () => {});
 
-    await render(
-      hbs`<AdminUserFieldItem @isEditing={{this.isEditing}} @destroyAction={{this.destroyAction}} @userField={{this.userField}} />`
-    );
+    await render(hbs`
+      <AdminUserFieldItem
+        @isEditing={{this.isEditing}}
+        @destroyAction={{this.destroyAction}}
+        @moveUpAction={{this.moveUpAction}}
+        @moveDownAction={{this.moveDownAction}}
+        @userField={{this.userField}}
+      />`);
 
     await click(".cancel");
     assert.ok(exists(".edit"));
@@ -28,10 +36,17 @@ module("Integration | Component | admin-user-field-item", function (hooks) {
 
   test("edit action", async function (assert) {
     this.set("userField", { id: 1, field_type: "text" });
+    this.set("destroyAction", () => {});
+    this.set("moveUpAction", () => {});
+    this.set("moveDownAction", () => {});
 
-    await render(
-      hbs`<AdminUserFieldItem @destroyAction={{this.destroyAction}} @userField={{this.userField}} />`
-    );
+    await render(hbs`
+      <AdminUserFieldItem
+        @destroyAction={{this.destroyAction}}
+        @moveUpAction={{this.moveUpAction}}
+        @moveDownAction={{this.moveDownAction}}
+        @userField={{this.userField}}
+      />`);
 
     await click(".edit");
     assert.ok(exists(".save"));
@@ -47,8 +62,17 @@ module("Integration | Component | admin-user-field-item", function (hooks) {
       show_on_user_card: true,
       searchable: true,
     });
+    this.set("destroyAction", () => {});
+    this.set("moveUpAction", () => {});
+    this.set("moveDownAction", () => {});
 
-    await render(hbs`<AdminUserFieldItem @userField={{this.userField}} />`);
+    await render(hbs`
+      <AdminUserFieldItem
+        @destroyAction={{this.destroyAction}}
+        @moveUpAction={{this.moveUpAction}}
+        @moveDownAction={{this.moveDownAction}}
+        @userField={{this.userField}}
+      />`);
 
     assert.strictEqual(query(".name").innerText, this.userField.name);
     assert.strictEqual(
diff --git a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
index b4769c8da81..0621ecc7ddd 100644
--- a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
@@ -10,10 +10,10 @@
 
   {{#if this.shouldDisplayClearableButton}}
     <DButton
-      @class="btn-clear"
       @icon="times"
       @action={{this.selectKit.onClearSelection}}
       @ariaLabel="clear_input"
+      class="btn-clear"
     />
   {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
index 8e14542c218..41d01e82cc8 100644
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
@@ -4,10 +4,9 @@
       <DButton
         @translatedTitle={{tag.value}}
         @icon="times"
-        @action={{action this.selectKit.deselect}}
-        @actionParam={{tag.value}}
-        @class={{tag.classNames}}
-        @tabindex={{0}}
+        @action={{fn (action this.selectKit.deselect) tag.value}}
+        tabindex="0"
+        class={{tag.classNames}}
       >
         {{discourse-tag tag.value noHref=true}}
       </DButton>
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs b/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
index 7c9ab271768..43510b46775 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
@@ -1,10 +1,10 @@
 <button
+  {{on "click" (fn this.selectKit.deselect this.item)}}
   aria-label={{i18n "select_kit.delete_item" name=this.itemName}}
-  id="{{this.id}}-choice"
   data-value={{this.itemValue}}
   data-name={{this.itemName}}
   type="button"
-  {{on "click" (fn this.selectKit.deselect this.item)}}
+  id="{{this.id}}-choice"
   class="btn btn-default selected-choice {{this.extraClass}}"
 >
   {{d-icon "times"}}
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
index 1273b32751e..c9628d840ea 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
@@ -24,11 +24,10 @@
 
     {{#if this.shouldDisplayClearableButton}}
       <DButton
-        @class="btn-clear"
         @icon="times"
-        @action={{this.selectKit.deselect}}
-        @actionParam={{this.item}}
+        @action={{fn this.selectKit.deselect this.item}}
         @ariaLabel="clear_input"
+        class="btn-clear"
       />
     {{/if}}
   </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
index 6776a23a109..bf6fb5d8134 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
@@ -13,13 +13,13 @@
 
   {{#if this.currentUser.staff}}
     <DButton
-      @action={{action "createChannel"}}
+      @action={{this.createChannel}}
       @icon="plus"
-      @class={{concat-class
+      @label={{if this.site.desktopView "chat.create_channel.title"}}
+      class={{concat-class
         "new-channel-btn"
         (if this.site.mobileView "btn-flat")
       }}
-      @label={{if this.site.desktopView "chat.create_channel.title"}}
     />
   {{/if}}
 </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs
index 29b3fa73c0a..23046d405b3 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-about-view.hbs
@@ -22,9 +22,9 @@
       {{#if (chat-guardian "can-edit-chat-channel")}}
         <div class="chat-form__label-actions">
           <DButton
-            @class="edit-name-slug-btn btn-flat"
             @label="chat.channel_settings.edit"
             @action={{if this.onEditChatChannelName this.onEditChatChannelName}}
+            class="edit-name-slug-btn btn-flat"
           />
         </div>
       {{/if}}
@@ -50,7 +50,6 @@
         {{#if (chat-guardian "can-edit-chat-channel")}}
           <div class="chat-form__label-actions">
             <DButton
-              @class="edit-description-btn btn-flat"
               @label={{if
                 this.channel.description.length
                 "chat.channel_settings.edit"
@@ -60,6 +59,7 @@
                 this.onEditChatChannelDescription
                 this.onEditChatChannelDescription
               }}
+              class="edit-description-btn btn-flat"
             />
           </div>
         {{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs
index 19fa80d7a42..781596d96df 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.hbs
@@ -2,7 +2,7 @@
   <DButton
     @icon="times"
     @action={{@onLeaveChannel}}
-    @class="btn-flat chat-channel-leave-btn"
     @title={{this.leaveChatTitleKey}}
+    class="btn-flat chat-channel-leave-btn"
   />
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs
index e295144af33..9ef7414e025 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.hbs
@@ -158,10 +158,10 @@
       {{#if (chat-guardian "can-archive-channel" @channel)}}
         <div class="chat-form__field">
           <DButton
-            @action={{action "onArchiveChannel"}}
+            @action={{this.onArchiveChannel}}
             @label="chat.channel_settings.archive_channel"
-            @class="archive-btn chat-form__btn btn-flat"
             @icon="archive"
+            class="archive-btn chat-form__btn btn-flat"
           />
         </div>
       {{/if}}
@@ -169,29 +169,29 @@
       {{#if @channel.isClosed}}
         <div class="chat-form__field">
           <DButton
-            @action={{action "onToggleChannelState"}}
+            @action={{this.onToggleChannelState}}
             @label="chat.channel_settings.open_channel"
-            @class="open-btn chat-form__btn btn-flat"
             @icon="unlock"
+            class="open-btn chat-form__btn btn-flat"
           />
         </div>
       {{else}}
         <div class="chat-form__field">
           <DButton
-            @action={{action "onToggleChannelState"}}
+            @action={{this.onToggleChannelState}}
             @label="chat.channel_settings.close_channel"
-            @class="close-btn chat-form__btn btn-flat"
             @icon="lock"
+            class="close-btn chat-form__btn btn-flat"
           />
         </div>
       {{/if}}
 
       <div class="chat-form__field">
         <DButton
-          @action={{action "onDeleteChannel"}}
+          @action={{this.onDeleteChannel}}
           @label="chat.channel_settings.delete_channel"
-          @class="delete-btn chat-form__btn btn-flat"
           @icon="trash-alt"
+          class="delete-btn chat-form__btn btn-flat"
         />
       </div>
     {{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs
index 8f4a16cf64b..710fca376ab 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.hbs
@@ -23,13 +23,13 @@
       {{#each @buttons as |button|}}
         <li class={{concat-class "chat-composer-dropdown__item" button.id}}>
           <DButton
-            @class={{concat-class
-              "chat-composer-dropdown__action-btn"
-              button.id
-            }}
             @icon={{button.icon}}
             @action={{fn this.onButtonClick button}}
             @label={{button.label}}
+            class={{concat-class
+              "chat-composer-dropdown__action-btn"
+              button.id
+            }}
           />
         </li>
       {{/each}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs
index 5b5a10eedc7..eac795d3fc8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.hbs
@@ -14,8 +14,8 @@
 
   <DButton
     @action={{@cancelAction}}
-    @class="btn-flat cancel-message-action"
     @icon="times-circle"
     @title="cancel"
+    class="btn-flat cancel-message-action"
   />
 </div>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs
index b5bbfb7130b..9cb66e6e1ec 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.hbs
@@ -48,10 +48,10 @@
     </span>
 
     <DButton
-      @class="btn-flat chat-composer-upload__remove-btn"
       @action={{@onCancel}}
       @icon="times"
       @title="chat.remove_upload"
+      class="btn-flat chat-composer-upload__remove-btn"
     />
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/close-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/close-button.hbs
index 2c8d97aa0ca..934fe4dcb68 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/close-button.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/close-button.hbs
@@ -2,5 +2,5 @@
   @icon="times"
   @action={{@close}}
   @title="chat.close"
-  @class="btn-flat btn-link chat-drawer-header__close-btn"
+  class="btn-flat btn-link chat-drawer-header__close-btn"
 />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.hbs
index 28d93d22fd0..42b97632284 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer/header/toggle-expand-button.hbs
@@ -4,11 +4,11 @@
     "angle-double-down"
     "angle-double-up"
   }}
-  @class="btn-flat btn-link chat-drawer-header__expand-btn"
   @action={{@toggleExpand}}
   @title={{if
     this.chatStateManager.isDrawerExpanded
     "chat.collapse"
     "chat.expand"
   }}
+  class="btn-flat btn-link chat-drawer-header__expand-btn"
 />
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
index 054f8df7498..9497e261da1 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
@@ -36,18 +36,18 @@
 
       {{#if this.messageInteractor.canInteractWithMessage}}
         <DButton
-          @class="btn-flat react-btn"
           @action={{this.messageInteractor.openEmojiPicker}}
           @icon="discourse-emojis"
           @title="chat.react"
           @forwardEvent={{true}}
+          class="btn-flat react-btn"
         />
       {{/if}}
 
       {{#if this.messageInteractor.canBookmark}}
         <DButton
-          @class="btn-flat bookmark-btn"
           @action={{this.messageInteractor.toggleBookmark}}
+          class="btn-flat bookmark-btn"
         >
           <BookmarkIcon @bookmark={{this.message.bookmark}} />
         </DButton>
@@ -55,10 +55,10 @@
 
       {{#if this.messageInteractor.canReply}}
         <DButton
-          @class="btn-flat reply-btn"
           @action={{this.messageInteractor.reply}}
           @icon="reply"
           @title="chat.reply"
+          class="btn-flat reply-btn"
         />
       {{/if}}
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
index 08c59926d84..887156208fa 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
@@ -34,11 +34,10 @@
         {{#each this.messageInteractor.secondaryActions as |button|}}
           <li class="chat-message-action-item" data-id={{button.id}}>
             <DButton
-              @class="chat-message-action"
               @translatedLabel={{button.name}}
               @icon={{button.icon}}
-              @actionParam={{button.id}}
-              @action={{action this.actAndCloseMenu button.id}}
+              @action={{fn this.actAndCloseMenu button.id}}
+              class="chat-message-action"
             />
           </li>
         {{/each}}
@@ -59,20 +58,20 @@
             {{/each}}
 
             <DButton
-              @class="btn-flat react-btn"
               @action={{this.openEmojiPicker}}
               @icon="discourse-emojis"
               @title="chat.react"
               @forwardEvent={{true}}
               data-id="react"
+              class="btn-flat react-btn"
             />
           {{/if}}
 
           {{#if this.messageInteractor.canBookmark}}
             <DButton
-              @class="btn-flat bookmark-btn"
-              @action={{action this.actAndCloseMenu "toggleBookmark"}}
+              @action={{fn this.actAndCloseMenu "toggleBookmark"}}
               data-id="bookmark"
+              class="btn-flat bookmark-btn"
             >
               <BookmarkIcon @bookmark={{this.message.bookmark}} />
             </DButton>
@@ -80,11 +79,11 @@
 
           {{#if this.messageInteractor.canReply}}
             <DButton
-              @class="chat-message-action reply-btn btn-flat"
-              @action={{action this.actAndCloseMenu "reply"}}
+              @action={{fn this.actAndCloseMenu "reply"}}
               @icon="reply"
               @title="chat.reply"
               data-id="reply"
+              class="chat-message-action reply-btn btn-flat"
             />
           {{/if}}
         </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs
index 73421462cf2..7855e0e861a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message.hbs
@@ -54,17 +54,17 @@
       {{#if this.deletedAndCollapsed}}
         <div class="chat-message-text -deleted">
           <DButton
-            @class="btn-flat chat-message-expand"
             @action={{this.expand}}
             @translatedLabel={{this.deletedMessageLabel}}
+            class="btn-flat chat-message-expand"
           />
         </div>
       {{else if this.hiddenAndCollapsed}}
         <div class="chat-message-text -hidden">
           <DButton
-            @class="btn-flat chat-message-expand"
             @action={{this.expand}}
             @label="chat.hidden"
+            class="btn-flat chat-message-expand"
           />
         </div>
       {{else}}
@@ -103,11 +103,11 @@
 
                   {{#if this.shouldRenderOpenEmojiPickerButton}}
                     <DButton
-                      @class="chat-message-react-btn"
                       @action={{this.messageInteractor.openEmojiPicker}}
                       @icon="discourse-emojis"
                       @title="chat.react"
                       @forwardEvent={{true}}
+                      class="chat-message-react-btn"
                     />
                   {{/if}}
                 </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-notices.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-notices.hbs
index 0587c135ccc..7dde7a306d6 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-notices.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-notices.hbs
@@ -9,8 +9,8 @@
 
       <DButton
         @icon="times"
-        @class="btn-flat chat-notices__notice__clear"
         @action={{fn this.clearNotice notice}}
+        class="btn-flat chat-notices__notice__clear"
       />
     </div>
   {{/each}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs
index 6033b130443..e094a3b9d6c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.hbs
@@ -2,9 +2,9 @@
   <div class="chat-retention-reminder">
     <ChatRetentionReminderText @channel={{@channel}} />
     <DButton
-      @class="btn-flat dismiss-btn"
       @action={{this.dismiss}}
       @icon="times"
+      class="btn-flat dismiss-btn"
     />
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.hbs
index 732d4be7dbb..a199a709b77 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/admin/export-messages.hbs
@@ -4,7 +4,7 @@
   <DButton
     @label="chat.admin.export_messages.create_export"
     @title="chat.admin.export_messages.create_export"
-    @class="btn-primary"
     @action={{this.exportMessages}}
+    class="btn-primary"
   />
 </section>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.hbs
index e73ec9fc469..905c3f03d77 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.hbs
@@ -22,11 +22,11 @@
   </:body>
   <:footer>
     <DButton
-      @class="btn-primary"
       @disabled={{this.buttonDisabled}}
       @action={{this.archiveChannel}}
       @label="chat.channel_archive.title"
-      @id="chat-confirm-archive-channel"
+      id="chat-confirm-archive-channel"
+      class="btn-primary"
     />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs
index 3e7c026a977..ca1838a559c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.hbs
@@ -22,11 +22,11 @@
   <:footer>
     <DButton
       @disabled={{this.buttonDisabled}}
-      @class="btn-danger"
       @action={{this.deleteChannel}}
       @label="chat.channel_delete.confirm"
-      @id="chat-confirm-delete-channel"
+      id="chat-confirm-delete-channel"
+      class="btn-danger"
     />
-    <DButton @label="cancel" @class="btn-flat" @action={{@closeModal}} />
+    <DButton @label="cancel" @action={{@closeModal}} class="btn-flat" />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs
index 3a21233edbd..f3d22acaa11 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.hbs
@@ -27,10 +27,10 @@
   </:body>
   <:footer>
     <DButton
-      @class="btn-primary create"
       @action={{this.onSaveChatChannelDescription}}
       @label="save"
       @disabled={{this.isSaveDisabled}}
+      class="btn-primary create"
     />
     <DModalCancel @close={{@closeModal}} />
   </:footer>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
index b4d8ee1df1c..0256880fac7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
@@ -44,10 +44,10 @@
   </:body>
   <:footer>
     <DButton
-      @class="btn-primary create"
       @action={{this.onSave}}
       @label="save"
       @disabled={{this.isSaveDisabled}}
+      class="btn-primary create"
     />
     <DModalCancel @close={{@closeModal}} />
   </:footer>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs
index 2d09a13ba89..17448ccf585 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.hbs
@@ -18,12 +18,12 @@
   </:body>
   <:footer>
     <DButton
-      @class="btn-primary"
       @icon="sign-out-alt"
       @disabled={{this.disableMoveButton}}
       @action={{this.moveMessages}}
       @label="chat.move_to_channel.confirm_move"
+      class="btn-primary"
     />
-    <DButton @label="cancel" @class="btn-flat" @action={{@closeModal}} />
+    <DButton @label="cancel" @action={{@closeModal}} class="btn-flat" />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs
index 348bf2ccd77..3a7815255b5 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.hbs
@@ -17,10 +17,10 @@
   </:body>
   <:footer>
     <DButton
-      @class="btn-primary"
       @disabled={{this.buttonDisabled}}
       @action={{this.saveThread}}
       @label="save"
+      class="btn-primary"
     />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs
index 85e35103ef5..cc6ab68e9ed 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.hbs
@@ -11,10 +11,10 @@
   </:body>
   <:footer>
     <DButton
-      @class="btn-primary"
       @action={{this.onStatusChange}}
       @label={{this.buttonLabel}}
-      @id="chat-channel-toggle-btn"
+      id="chat-channel-toggle-btn"
+      class="btn-primary"
     />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.hbs
index 7468f8b4ada..ccae3ccd24b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.hbs
@@ -4,39 +4,39 @@
 >
   <div class="chat-selection-management__buttons">
     <DButton
-      @id="chat-quote-btn"
       @icon="quote-left"
       @label="chat.selection.quote_selection"
       @disabled={{not this.anyMessagesSelected}}
       @action={{this.quoteMessages}}
+      id="chat-quote-btn"
     />
 
     {{#if this.site.desktopView}}
       <DButton
-        @id="chat-copy-btn"
         @icon="copy"
         @label="chat.selection.copy"
         @disabled={{not this.anyMessagesSelected}}
         @action={{this.copyMessages}}
+        id="chat-copy-btn"
       />
     {{/if}}
 
     {{#if this.enableMove}}
       <DButton
-        @id="chat-move-to-channel-btn"
         @icon="sign-out-alt"
         @label="chat.selection.move_selection_to_channel"
         @disabled={{not this.anyMessagesSelected}}
         @action={{this.openMoveMessageModal}}
+        id="chat-move-to-channel-btn"
       />
     {{/if}}
 
     <DButton
-      @id="chat-cancel-selection-btn"
       @icon="times"
-      @class="btn-secondary cancel-btn"
       @label="chat.selection.cancel"
       @action={{@pane.cancelSelecting}}
+      id="chat-cancel-selection-btn"
+      class="btn-secondary cancel-btn"
     />
   </div>
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.hbs
index a4fd62890af..c461e8b6367 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.hbs
@@ -30,9 +30,9 @@
     {{#if this.canChangeThreadSettings}}
       <DButton
         @action={{this.openThreadSettings}}
-        @class="btn-flat chat-thread-header__settings"
         @icon="cog"
         @title="chat.thread.settings"
+        class="btn-flat chat-thread-header__settings"
       />
     {{/if}}
     <LinkTo
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.hbs
index 21898c98ec5..fb1198a0a01 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/user-card-button.hbs
@@ -1,8 +1,8 @@
 {{#if this.shouldRender}}
   <DButton
-    @class="btn-primary chat-user-card-btn"
     @action={{this.startChatting}}
     @label="chat.title_capitalized"
     @icon="d-chat"
+    class="btn-primary chat-user-card-btn"
   />
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/components/collapser.hbs b/plugins/chat/assets/javascripts/discourse/components/collapser.hbs
index 7bee61a37b2..56099d8f719 100644
--- a/plugins/chat/assets/javascripts/discourse/components/collapser.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/collapser.hbs
@@ -3,15 +3,15 @@
 
   {{#if this.collapsed}}
     <DButton
-      @action={{action "open"}}
+      @action={{this.open}}
       @icon="caret-right"
-      @class="chat-message-collapser-button chat-message-collapser-closed"
+      class="chat-message-collapser-button chat-message-collapser-closed"
     />
   {{else}}
     <DButton
-      @action={{action "close"}}
+      @action={{this.close}}
       @icon="caret-down"
-      @class="chat-message-collapser-button chat-message-collapser-opened"
+      class="chat-message-collapser-button chat-message-collapser-opened"
     />
   {{/if}}
 </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.hbs b/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.hbs
index 527572462c5..df0b6921b7c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.hbs
@@ -1,25 +1,25 @@
 {{#if @channel.currentUserMembership.following}}
   <DButton
-    @action={{action "onLeaveChannel"}}
+    @action={{this.onLeaveChannel}}
     @translatedLabel={{this.label}}
     @translatedTitle={{this.options.leaveTitle}}
-    @class={{concat-class
+    @icon={{this.options.leaveIcon}}
+    @disabled={{this.isLoading}}
+    class={{concat-class
       "toggle-channel-membership-button -leave btn-flat"
       this.options.leaveClass
     }}
-    @icon={{this.options.leaveIcon}}
-    @disabled={{this.isLoading}}
   />
 {{else}}
   <DButton
-    @action={{action "onJoinChannel"}}
+    @action={{this.onJoinChannel}}
     @translatedLabel={{this.label}}
     @translatedTitle={{this.options.joinTitle}}
-    @class={{concat-class
+    @icon={{this.options.joinIcon}}
+    @disabled={{this.isLoading}}
+    class={{concat-class
       "toggle-channel-membership-button -join"
       this.options.joinClass
     }}
-    @icon={{this.options.joinIcon}}
-    @disabled={{this.isLoading}}
   />
 {{/if}}
\ No newline at end of file
diff --git a/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs b/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs
index 521d3b889a6..dc1d5efd71d 100644
--- a/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs
+++ b/plugins/chat/assets/javascripts/discourse/templates/admin-plugins-chat.hbs
@@ -2,11 +2,11 @@
 
 {{#if this.selectedWebhook}}
   <DButton
-    @class="incoming-chat-webhooks-back"
     @icon="chevron-left"
     @label="chat.incoming_webhooks.back"
     @title="chat.incoming_webhooks.back"
-    @action={{action (mut this.selectedWebhookId) null}}
+    @action={{fn (mut this.selectedWebhookId) null}}
+    class="incoming-chat-webhooks-back"
   />
 
   <form class="form-vertical">
@@ -75,13 +75,13 @@
 
       {{#unless this.emojiPickerIsActive}}
         <DButton
-          @class="btn-primary"
           @label="chat.incoming_webhooks.select_emoji"
-          @action={{action (mut this.emojiPickerIsActive) true}}
+          @action={{fn (mut this.emojiPickerIsActive) true}}
+          class="btn-primary"
         />
         <DButton
           @label="chat.incoming_webhooks.reset_emoji"
-          @action={{action (mut this.selectedWebhook.emoji) null}}
+          @action={{fn (mut this.selectedWebhook.emoji) null}}
           @disabled={{not this.selectedWebhook.emoji}}
         />
       {{/unless}}
@@ -100,11 +100,11 @@
     </div>
 
     <DButton
-      @class="btn-primary"
       @label="chat.incoming_webhooks.save"
       @title="chat.incoming_webhooks.save"
-      @action={{action "saveEdit"}}
+      @action={{this.saveEdit}}
       @disabled={{this.saveEditDisabled}}
+      class="btn-primary"
     />
   </form>
 {{else}}
@@ -126,22 +126,22 @@
       <DButton
         @label="chat.create"
         @title="chat.create"
-        @class="btn-primary create-new-incoming-webhook-btn"
         @disabled={{not this.nameAndChannelValid}}
-        @action={{action "createNewWebhook"}}
+        @action={{this.createNewWebhook}}
+        class="btn-primary create-new-incoming-webhook-btn"
       />
       <DButton
         @label="chat.cancel"
         @title="chat.cancel"
-        @action={{action "resetNewWebhook"}}
+        @action={{this.resetNewWebhook}}
       />
     </div>
   {{else}}
     <DButton
       @label="chat.incoming_webhooks.new"
       @title="chat.incoming_webhooks.new"
-      @class="btn-primary"
-      @action={{action (mut this.creatingNew) true}}
+      @action={{fn (mut this.creatingNew) true}}
+      class="btn-primary"
     />
   {{/if}}
 
@@ -175,16 +175,15 @@
           <div class="incoming-chat-webhooks--row--controls">
             <div>
               <DButton
-                @class="btn"
                 @icon="pencil-alt"
                 @label="chat.incoming_webhooks.edit"
-                @action={{action (mut this.selectedWebhookId) webhook.id}}
+                @action={{fn (mut this.selectedWebhookId) webhook.id}}
               />
               <DButton
-                @class="btn btn-danger"
                 @icon="trash-alt"
                 @title="chat.incoming_webhooks.delete"
-                @action={{action "destroyWebhook" webhook}}
+                @action={{fn this.destroyWebhook webhook}}
+                class="btn-danger"
               />
             </div>
           </div>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 53d838e9c7b..068507e1fac 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -3,7 +3,6 @@
   @class="discourse-local-dates-create-modal"
   @style="overflow: auto"
 >
-
   <div class="form">
     {{#if this.isValid}}
       {{#if this.timezoneIsDifferentFromUserTimezone}}
@@ -29,10 +28,10 @@
         >
           {{d-icon "calendar-alt"}}
           <DButton
-            @id="from-date-time"
-            @action={{action "focusFrom"}}
+            @action={{this.focusFrom}}
             @translatedLabel={{this.formattedFrom}}
-            @class="date-time"
+            id="from-date-time"
+            class="date-time"
           />
         </div>
 
@@ -43,15 +42,15 @@
         >
           {{d-icon "calendar-alt"}}
           <DButton
-            @action={{action "focusTo"}}
+            @action={{this.focusTo}}
             @translatedLabel={{this.formattedTo}}
-            @class="date-time"
+            class="date-time"
           />
           {{#if this.toFilled}}
             <DButton
+              @action={{this.eraseToDateTime}}
               @icon="times"
-              @action={{action "eraseToDateTime"}}
-              @class="delete-to-date"
+              class="delete-to-date"
             />
           {{/if}}
         </div>
@@ -174,22 +173,22 @@
 <div class="modal-footer discourse-local-dates-create-modal-footer">
   {{#if this.isValid}}
     <DButton
-      @class="btn-primary"
-      @action={{action "save"}}
+      @action={{this.save}}
       @label="discourse_local_dates.create.form.insert"
+      class="btn-primary"
     />
   {{/if}}
 
   <DButton
-    @class="btn-flat"
-    @action={{action "cancel"}}
+    @action={{this.cancel}}
     @translatedLabel={{i18n "cancel"}}
+    class="btn-flat"
   />
 
   <DButton
-    @class="btn-default advanced-mode-btn"
-    @action={{action "toggleAdvancedMode"}}
+    @action={{this.toggleAdvancedMode}}
     @icon="cog"
     @label={{this.toggleModeBtnLabel}}
+    class="btn-default advanced-mode-btn"
   />
 </div>
\ No newline at end of file
diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
index f87cc57cb4b..9e6a72aff65 100644
--- a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
@@ -73,7 +73,7 @@
               {{#if this.canRemoveOption}}
                 <DButton
                   @icon="trash-alt"
-                  @action={{action "removeOption" option}}
+                  @action={{fn this.removeOption option}}
                 />
               {{/if}}
             </div>
@@ -81,10 +81,10 @@
 
           <div class="poll-option-controls">
             <DButton
-              class="btn-default poll-option-add"
               @icon="plus"
               @label="poll.ui_builder.poll_options.add"
               @action={{fn this.addOption -1}}
+              class="btn-default poll-option-add"
             />
             {{#if
               (and
@@ -230,24 +230,24 @@
   </:body>
   <:footer>
     <DButton
-      @action={{action "insertPoll"}}
+      @action={{this.insertPoll}}
       @icon="chart-bar"
-      class="btn-primary insert-poll"
       @label="poll.ui_builder.insert"
       @disabled={{this.disableInsert}}
+      class="btn-primary insert-poll"
     />
 
-    <DButton @label="cancel" @class="btn-flat" @action={{@closeModal}} />
+    <DButton @label="cancel" @action={{@closeModal}} class="btn-flat" />
 
     <DButton
-      @action={{action "toggleAdvanced"}}
-      class="btn-default show-advanced"
+      @action={{this.toggleAdvanced}}
       @icon="cog"
       @title={{if
         this.showAdvanced
         "poll.ui_builder.hide_advanced"
         "poll.ui_builder.show_advanced"
       }}
+      class="btn-default show-advanced"
     />
 
   </:footer>
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
index 3d1c17d458d..5f44472c601 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
@@ -3,8 +3,8 @@
     <DButton
       @icon="times"
       @translatedTitle={{bs.text}}
-      @class={{bs.class}}
       @disabled={{bs.disabled}}
+      class={{bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -14,8 +14,8 @@
     <DButton
       @icon="times"
       @translatedTitle={{bs.text}}
-      @class={{bs.class}}
       @disabled={{bs.disabled}}
+      class={{bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -24,8 +24,8 @@
   {{#each @dummy.buttonSizes as |bs|}}
     <DButton
       @translatedLabel={{bs.text}}
-      @class={{bs.class}}
       @disabled={{bs.disabled}}
+      class={{bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -34,8 +34,8 @@
   {{#each @dummy.buttonStates as |bs|}}
     <DButton
       @translatedLabel={{bs.text}}
-      @class={{bs.class}}
       @disabled={{bs.disabled}}
+      class={{bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -47,8 +47,8 @@
     <DButton
       @icon="plus"
       @translatedLabel={{bs.text}}
-      @class={{bs.class}}
       @disabled={{bs.disabled}}
+      class={{bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -58,8 +58,8 @@
     <DButton
       @icon="plus"
       @translatedLabel={{bs.text}}
-      @class={{bs.class}}
       @disabled={{bs.disabled}}
+      class={{bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -69,10 +69,10 @@
 >
   {{#each @dummy.buttonSizes as |bs|}}
     <DButton
-      @class={{concat "btn-primary " bs.class}}
       @icon="plus"
       @translatedLabel={{bs.text}}
       @disabled={{bs.disabled}}
+      class={{concat-class "btn-primary" bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -80,10 +80,10 @@
 <StyleguideExample @title=".btn-primary .btn-icon-text - states">
   {{#each @dummy.buttonStates as |bs|}}
     <DButton
-      @class={{concat "btn-primary " bs.class}}
       @icon="plus"
       @translatedLabel={{bs.text}}
       @disabled={{bs.disabled}}
+      class={{concat-class "btn-primary" bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -93,10 +93,10 @@
 >
   {{#each @dummy.buttonSizes as |bs|}}
     <DButton
-      @class={{concat "btn-danger " bs.class}}
       @icon="trash-alt"
       @translatedLabel={{bs.text}}
       @disabled={{bs.disabled}}
+      class={{concat-class "btn-danger" bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -104,10 +104,10 @@
 <StyleguideExample @title=".btn-danger .btn-icon-text - states">
   {{#each @dummy.buttonStates as |bs|}}
     <DButton
-      @class={{concat "btn-danger " bs.class}}
       @icon="trash-alt"
       @translatedLabel={{bs.text}}
       @disabled={{bs.disabled}}
+      class={{concat-class "btn-danger" bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -137,9 +137,9 @@
 >
   {{#each @dummy.buttonSizes as |bs|}}
     <DButton
-      @class={{concat "btn-flat " bs.class}}
       @disabled={{bs.disabled}}
       @translatedLabel={{bs.text}}
+      class={{concat-class "btn-flat" bs.class}}
     />
   {{/each}}
 </StyleguideExample>
@@ -147,9 +147,9 @@
 <StyleguideExample @title="<DButton> btn-flat btn-text - states">
   {{#each @dummy.buttonStates as |bs|}}
     <DButton
-      @class={{concat "btn-flat " bs.class}}
       @disabled={{bs.disabled}}
       @translatedLabel={{bs.text}}
+      class={{concat-class "btn-flat" bs.class}}
     />
   {{/each}}
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-input-fields.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-input-fields.hbs
index 0196f6a74f3..68271b8723b 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-input-fields.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-input-fields.hbs
@@ -14,10 +14,10 @@
   <div class="inline-form">
     <TextField @placeholder="Placeholder" />
     <DButton
-      @class="btn-primary"
       @icon="search"
-      @type="submit"
       @translatedLabel="Submit"
+      type="submit"
+      class="btn-primary"
     />
   </div>
 </StyleguideExample>
@@ -25,7 +25,7 @@
 <StyleguideExample @title="inline-form with icon button">
   <div class="inline-form">
     <TextField @placeholder="Placeholder" />
-    <DButton @class="btn-primary" @icon="search" @type="submit" />
+    <DButton @icon="search" type="submit" class="btn-primary" />
   </div>
 </StyleguideExample>
 
@@ -38,7 +38,7 @@
 <StyleguideExample @title="full-width inline-form with input and icon button">
   <div class="inline-form full-width">
     <TextField @placeholder="Placeholder" />
-    <DButton @class="btn-primary" @icon="search" @type="submit" />
+    <DButton @icon="search" type="submit" class="btn-primary" />
   </div>
 </StyleguideExample>
 
@@ -55,10 +55,10 @@
       @onChange={{fn (mut value)}}
     />
     <DButton
-      @class="btn-primary"
       @icon="search"
-      @type="submit"
       @translatedLabel="Submit"
+      type="submit"
+      class="btn-primary"
     />
   </div>
 </StyleguideExample>
@@ -68,10 +68,10 @@
     <TextField />
     <MultiSelect @content={{@dummy.options}} @onChange={{@dummyAction}} />
     <DButton
-      @class="btn-primary"
       @icon="search"
-      @type="submit"
       @translatedLabel="Submit"
+      type="submit"
+      class="btn-primary"
     />
   </div>
 </StyleguideExample>
@@ -82,10 +82,10 @@
     <TextField />
     <MultiSelect @content={{@dummy.options}} @onChange={{@dummyAction}} />
     <DButton
-      @class="btn-primary"
       @icon="search"
-      @type="submit"
       @translatedLabel="Submit"
+      type="submit"
+      class="btn-primary"
     />
   </div>
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/03-topic-footer-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/03-topic-footer-buttons.hbs
index 46a8c73cc3a..4b575f0e1ab 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/03-topic-footer-buttons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/03-topic-footer-buttons.hbs
@@ -6,8 +6,8 @@
   <div id="topic-footer-buttons">
     <DButton
       @icon="reply"
-      @class="btn-primary pull-right"
       @label="topic.reply.title"
+      class="btn-primary pull-right"
     />
   </div>
 </StyleguideExample>
\ No newline at end of file
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
index f28074719ac..a182b1d6ffd 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
@@ -223,7 +223,7 @@
             <DButton
               @icon="envelope"
               @label="admin.users.check_email.text"
-              @class="btn-primary"
+              class="btn-primary"
             />
           </dd>
           <dt class="groups">
@@ -239,7 +239,7 @@
           <DButton
             @icon="exclamation-triangle"
             @label="user.admin_delete"
-            @class="btn-danger"
+            class="btn-danger"
           />
         </dl>
       </div>
@@ -378,7 +378,7 @@
             <DButton
               @icon="envelope"
               @label="admin.users.check_email.text"
-              @class="btn-primary"
+              class="btn-primary"
             />
           </dd>
           <dt class="groups">
@@ -394,7 +394,7 @@
           <DButton
             @icon="exclamation-triangle"
             @label="user.admin_delete"
-            @class="btn-danger"
+            class="btn-danger"
           />
         </dl>
       </div>