diff --git a/assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.hbs b/assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.hbs
index 3667d1c..0f57f33 100644
--- a/assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.hbs
+++ b/assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.hbs
@@ -1,11 +1,11 @@
 {{#if topic.assigned_to_user.username}}
-{{d-button class="assign"
+{{d-button class="btn-default assign"
            icon="user-times"
            action="unassign"
            label="discourse_assign.unassign.title"
            title="discourse_assign.unassign.help"}}
 {{else}}
-{{d-button class="assign"
+{{d-button class="btn-default assign"
            icon="user-plus"
            action="assign"
            label="discourse_assign.assign.title"
diff --git a/assets/javascripts/discourse/templates/user-activity-assigned.hbs b/assets/javascripts/discourse/templates/user-activity-assigned.hbs
index 59aac28..5f6be7d 100644
--- a/assets/javascripts/discourse/templates/user-activity-assigned.hbs
+++ b/assets/javascripts/discourse/templates/user-activity-assigned.hbs
@@ -1,6 +1,6 @@
 <div class='assign-controls'>
   {{#if model.topic_list.assigned_messages_count}}
-    {{#link-to 'userPrivateMessages.assigned' user.model class="btn assign-messages-assigned"}}
+    {{#link-to 'userPrivateMessages.assigned' user.model class="btn btn-default assign-messages-assigned"}}
       {{d-icon "envelope" class="glyph"}}
       {{i18n 'user.messages.assigned_title' count=model.topic_list.assigned_messages_count}}
     {{/link-to}}
@@ -9,6 +9,7 @@
   {{#if canUnassignAll}}
     {{d-button
       action=(action "unassignAll")
+      class="btn-default"
       icon="times"
       label="discourse_assign.unassign_all.title"}}
   {{/if}}