diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 60615f6e14e..c1922f4ff1e 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -2,8 +2,8 @@
   <div class="title">
     {{#if editingName}}
       {{text-field value=model.name autofocus="true"}}
-      {{d-button action=(action "finishedEditingName") class="btn-primary btn-small submit-edit" icon="check"}}
-      {{d-button action=(action "cancelEditingName") class="btn-small cancel-edit" icon="times"}}
+      {{d-button action=(action "finishedEditingName") class="btn-primary submit-edit" icon="check"}}
+      {{d-button action=(action "cancelEditingName") class="btn-default cancel-edit" icon="times"}}
     {{else}}
       {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a>
     {{/if}}
@@ -49,8 +49,8 @@
                                        value=colorSchemeId
                                        icon="paint-brush"}}
          {{#if colorSchemeChanged}}
-            {{d-button action=(action "changeScheme") class="btn-primary btn-small submit-edit" icon="check"}}
-            {{d-button action=(action "cancelChangeScheme") class="btn-default btn-small cancel-edit" icon="times"}}
+            {{d-button action=(action "changeScheme") class="btn-primary submit-edit" icon="check"}}
+            {{d-button action=(action "cancelChangeScheme") class="btn-default cancel-edit" icon="times"}}
          {{/if}}
       </div>
       {{#link-to 'adminCustomize.colors' class="btn btn-default edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}}
@@ -119,7 +119,7 @@
         <li>
           <span class='col'>${{upload.name}}: <a href={{upload.url}} target='_blank'>{{upload.filename}}</a></span>
           <span class='col'>
-            {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-small cancel-edit" icon="times"}}
+            {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
           </span>
         </li>
         {{/each}}
@@ -147,7 +147,7 @@
       {{#if model.childThemes.length}}
         <ul class='removable-list'>
           {{#each model.childThemes as |child|}}
-            <li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action=(action "removeChildTheme") actionParam=child class="btn-default btn-small cancel-edit col" icon="times"}}</li>
+            <li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action=(action "removeChildTheme") actionParam=child class="btn-default cancel-edit col" icon="times"}}</li>
           {{/each}}
         </ul>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index a945b8d5360..a97d800540e 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -18,8 +18,8 @@
         </div>
 
         <p class="actions">
-          <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
-          {{d-button action=(action "refreshProblems") class="btn-default btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
+          {{d-button action=(action "refreshProblems") class="btn-default" icon="refresh" label="admin.dashboard.refresh_problems"}}
+          {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index c72f7a22f94..a7078f10ca1 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -13,7 +13,7 @@
           <div class='grant-info-item'>
             {{i18n 'badges.allow_title'}}
             {{d-button
-              class="btn btn-small pad-left no-text"
+              class="btn btn-default pad-left no-text"
               action=(action "toggleSetUserTitle")
               icon="pencil"}}
           </div>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index 5275167de10..62473a5a82f 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -11,6 +11,6 @@
 {{else}}
   <div class='ac-wrap composer-user-selector-limited' {{action "toggleSelector"}}>
     <span>{{limitedUsernames}}</span>
-    <span class='btn-small btn-primary'>{{hiddenUsersCount}}</span>
+    <span class='btn btn-primary'>{{hiddenUsersCount}}</span>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 6e543693adc..c9f50287bce 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -31,7 +31,7 @@
       {{/if}}
       {{#if category.topic_url}}
         <br>
-        {{d-button class="btn-small" action=(action "showCategoryTopic") icon="pencil" label="category.change_in_category_topic"}}
+        {{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil" label="category.change_in_category_topic"}}
       {{/if}}
     </section>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index dec825ae6a4..e4544391568 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -26,13 +26,13 @@
                   nameProperty="description"
                   content=category.availablePermissions
                   value=selectedPermission}}
-      <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small add-permission">
+      <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-default add-permission">
         {{i18n 'category.add_permission'}}
       </button>
     {{/if}}
   {{else}}
     {{#unless category.is_special}}
-      <button {{action "editPermissions"}} class="btn btn-default btn-small edit-permission">{{i18n 'category.edit_permissions'}}</button>
+      <button {{action "editPermissions"}} class="btn btn-default btn-default edit-permission">{{i18n 'category.edit_permissions'}}</button>
     {{/unless}}
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
index 10cc6e057bc..f4c4ef7a93b 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
@@ -1,5 +1,5 @@
 {{#if value}}
-  {{#d-button class="btn-small group-manage-logs-filter" action=(action "clearFilter") actionParam=type}}
+  {{#d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type}}
     <span>{{label}}</span>: {{filterText}}
     {{d-icon "times-circle"}}
   {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
index f98ab03efaf..d7754b460c8 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
@@ -1,6 +1,6 @@
 <tr class="group-manage-logs-row">
   <td>
-    {{#d-button class="btn-small" action=(action "filter") actionParam=(hash value=log.action key="action")}}
+    {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.action key="action")}}
       {{log.actionTitle}}
     {{/d-button}}
   </td>
@@ -8,7 +8,7 @@
   <td>
     <span>{{avatar log.acting_user imageSize='tiny'}}</span>
 
-    {{#d-button class="btn-small" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user")}}
+    {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user")}}
       {{log.acting_user.username}}
     {{/d-button}}
   </td>
@@ -17,7 +17,7 @@
     {{#if log.target_user}}
       <span>{{avatar log.target_user imageSize='tiny'}}</span>
 
-      {{#d-button class="btn-small" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user")}}
+      {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user")}}
         {{log.target_user.username}}
       {{/d-button}}
     {{/if}}
@@ -25,7 +25,7 @@
 
   <td>
     {{#if log.subject}}
-      {{#d-button class="btn-small" action=(action "filter") actionParam=(hash value=log.subject key="subject")}}
+      {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.subject key="subject")}}
         {{log.subject}}
       {{/d-button}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 9e6732afde5..b92445f0703 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -31,8 +31,8 @@
 
             {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
             <div class="edit-controls">
-              {{d-button action=(action "finishedEditingTopic") class="btn-primary btn-small submit-edit" icon="check"}}
-              {{d-button action=(action "cancelEditingTopic") class="btn-default btn-small cancel-edit" icon="times"}}
+              {{d-button action=(action "finishedEditingTopic") class="btn-primary submit-edit" icon="check"}}
+              {{d-button action=(action "cancelEditingTopic") class="btn-default cancel-edit" icon="times"}}
 
               {{#if canRemoveTopicFeaturedLink}}
                 <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}">
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index e420481b039..d4b2b261f29 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -99,9 +99,6 @@
       margin-bottom: 0;
       font-size: $font-down-2;
     }
-    .btn-small {
-      font-size: $font-down-2;
-    }
   }
 
   .field-error {
diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss
index eb4e6bc1726..5a0b6da568a 100644
--- a/app/assets/stylesheets/common/admin/dashboard_next.scss
+++ b/app/assets/stylesheets/common/admin/dashboard_next.scss
@@ -279,7 +279,13 @@
     }
 
     .actions {
-      margin: 0;
+      margin: 1em 0 0 0;
+      display: flex;
+      align-items: center;
+      color: $primary-medium;
+      .btn {
+        margin-right: 1em;
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/composer-user-selector.scss b/app/assets/stylesheets/common/base/composer-user-selector.scss
index f3ea48c8abf..a1614ffdfdc 100644
--- a/app/assets/stylesheets/common/base/composer-user-selector.scss
+++ b/app/assets/stylesheets/common/base/composer-user-selector.scss
@@ -1,10 +1,11 @@
 div.ac-wrap.composer-user-selector-limited {
   width: 400px;
-
-  .btn-small {
-    border-radius: 10px;
-    position: relative;
-    top: -2px;
-    float: none;
+  padding: 0 10px;
+  margin-bottom: 5px;
+  .btn-primary {
+    margin-left: 0.5em;
+    padding: 3px 6px 2px;
+    font-size: $font-down-1;
+    min-height: unset;
   }
 }
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 4b3db86c9e7..de3a1759af9 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -60,8 +60,8 @@
 .title-wrapper {
   display: flex;
   flex-wrap: wrap;
-  .btn-small {
-    margin: 0 6px 0 0;
+  button {
+    margin: 0 0.5em 0 0;
   }
   a.topic-featured-link {
     display: inline-block;
@@ -88,9 +88,6 @@ a.badge-category {
     display: flex;
     flex-wrap: wrap;
     width: 90%;
-    .btn-small {
-      margin: 0 6px 0 0;
-    }
     a.topic-featured-link {
       display: inline-block;
     }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 5db0b876f74..409c291a310 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -189,13 +189,7 @@ sub sub {
   width: 100%;
 
   input#edit-title {
-    box-sizing: border-box;
     width: 100%;
-    height: 32px;
-  }
-  .btn-small {
-    padding: 6px 12px;
-    margin: 6px 6px 0 0;
   }
 
   .select-kit.combo-box.category-chooser {