diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars
index ba49ae05281..bdbdde76194 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -58,8 +58,8 @@
     <div class='controls'>
       {{#if primaryGroupDirty}}
         <div>
-        <button class='btn ok' {{action savePrimaryGroup}}><i class='fa fa-check'></i></button>
-        <button class='btn cancel' {{action resetPrimaryGroup}}><i class='fa fa-times'></i></button>
+        <button class='btn ok no-text' {{action savePrimaryGroup}}><i class='fa fa-check'></i></button>
+        <button class='btn cancel no-text' {{action resetPrimaryGroup}}><i class='fa fa-times'></i></button>
         </div>
       {{/if}}
     </div>
@@ -226,8 +226,8 @@
 
       {{#if dirty}}
         <div>
-        <button class='btn ok' {{action saveTrustLevel target="content"}}><i class='fa fa-check'></i></button>
-        <button class='btn cancel' {{action restoreTrustLevel target="content"}}><i class='fa fa-times'></i></button>
+        <button class='btn ok no-text' {{action saveTrustLevel target="content"}}><i class='fa fa-check'></i></button>
+        <button class='btn cancel no-text' {{action restoreTrustLevel target="content"}}><i class='fa fa-times'></i></button>
         </div>
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
index ddcce10f66d..3c243f7a68b 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
@@ -1,6 +1,6 @@
 {{#if selected}}
   <div id='bulk-select'>
-    <button class='btn' {{action showBulkActions}}><i class="fa fa-wrench"></i></button>
+    <button class='btn no-text' {{action showBulkActions}}><i class="fa fa-wrench"></i></button>
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index 240112738cf..07c872f8382 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -22,8 +22,8 @@
             {{/if}}
             {{textField id='edit-title' value=newTitle}}
 
-            <button class='btn btn-primary btn-small' {{action finishedEditingTopic}}><i class='fa fa-check'></i></button>
-            <button class='btn btn-small' {{action cancelEditingTopic}}><i class='fa fa-times'></i></button>
+            <button class='btn btn-primary btn-small no-text' {{action finishedEditingTopic}}><i class='fa fa-check'></i></button>
+            <button class='btn btn-small no-text' {{action cancelEditingTopic}}><i class='fa fa-times'></i></button>
           {{else}}
             <h1>
               <span class="private-message-glyph"><i class='fa fa-envelope'></i></span>
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index cc420a4b005..77c8eee18b5 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -542,9 +542,6 @@ ol.category-breadcrumb {
   right: 20px;
   padding: 5px;
   background-color: $primary_background_color;
-  button {
-    padding: 3px 0 3px 6px;
-  }
 }
 
 button.dismiss-read {