diff --git a/app/common/auth/login.html b/app/common/auth/login.html
index 38cc8e663c..269ad9cc7b 100644
--- a/app/common/auth/login.html
+++ b/app/common/auth/login.html
@@ -17,7 +17,7 @@
     </div>
     <div class="modal-actions">
         <div class="form-field">
-            <button type="button" class="button-link" ng-click="cancel()" ng-show="showCancel" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-beta" ng-click="cancel()" ng-show="showCancel" translate="app.cancel">Cancel</button>
             <button type="submit" class="button-alpha" ng-disabled="loginForm.$invalid || processing" translate="nav.login">Login</button>
         </div>
     </div>
diff --git a/app/common/auth/password-reset-confirm.html b/app/common/auth/password-reset-confirm.html
index f6747db063..8df18381c8 100644
--- a/app/common/auth/password-reset-confirm.html
+++ b/app/common/auth/password-reset-confirm.html
@@ -33,7 +33,7 @@
             </div>
         </div>
         <div class="form-field">
-            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-beta" ng-click="cancel()" translate="app.cancel">Cancel</button>
             <button type="submit" class="button-primary"
                 ng-disabled="form.$invalid || processing">
                     <div class="loading" ng-show="processing"><div class="line"></div><div class="line"></div><div class="line"></div></div>
diff --git a/app/common/auth/password-reset.html b/app/common/auth/password-reset.html
index e0ab884094..8ccf0db20c 100644
--- a/app/common/auth/password-reset.html
+++ b/app/common/auth/password-reset.html
@@ -13,7 +13,7 @@
                 required>
         </div>
         <div class="form-field">
-            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-beta" ng-click="cancel()" translate="app.cancel">Cancel</button>
             <button type="submit" class="button-primary"
                 ng-disabled="form.$invalid || processing">
                     <div class="loading" ng-show="processing"><div class="line"></div><div class="line"></div><div class="line"></div></div>
diff --git a/app/common/auth/register.html b/app/common/auth/register.html
index f4beea1162..2f55fdabea 100644
--- a/app/common/auth/register.html
+++ b/app/common/auth/register.html
@@ -59,7 +59,7 @@
 
     <div class="modal-actions">
         <div class="form-field">
-            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-beta" ng-click="cancel()" translate="app.cancel">Cancel</button>
             <button type="submit" class="button-alpha" ng-disabled="form.$invalid || processing" translate="nav.register">Sign up</button>
         </div>
     </div>
diff --git a/app/common/user-profile/user-profile.html b/app/common/user-profile/user-profile.html
index 499357a19d..9aedbec0a4 100644
--- a/app/common/user-profile/user-profile.html
+++ b/app/common/user-profile/user-profile.html
@@ -60,7 +60,7 @@
 
             <div class="modal-actions">
                 <div class="form-field">
-                  <button ng-if="!adminUserSetup" type="button" class="button-link" ng-click="cancel()" translate>
+                  <button ng-if="!adminUserSetup" type="button" class="button-beta" ng-click="cancel()" translate>
                     user_profile.button.cancel
                   </button>
 
diff --git a/app/main/activity/activity.html b/app/main/activity/activity.html
index 5b5a840b4f..757c26dddd 100644
--- a/app/main/activity/activity.html
+++ b/app/main/activity/activity.html
@@ -87,7 +87,7 @@ <h1 class="mode-context-title"><a href="/" ng-bind="nav.site.name"></a></h1>
                             </div>
 
                             <div class="form-field">
-                                <button type="button" class="button-link" ng-click="cancelChangeFilters()" translate="app.cancel">Cancel</button>
+                                <button type="button" class="button-beta" ng-click="cancelChangeFilters()" translate="app.cancel">Cancel</button>
                                 <button type="submit" class="button-alpha" translate="app.apply_filters">Apply filter</button>
                             </div>
                         </div>
diff --git a/app/main/posts/collections/editor.html b/app/main/posts/collections/editor.html
index 0c2bd9045d..38e9dfdfaf 100644
--- a/app/main/posts/collections/editor.html
+++ b/app/main/posts/collections/editor.html
@@ -41,7 +41,7 @@
 
     <div class="modal-actions">
         <div class="form-field">
-            <button type="button" class="button-link  modal-trigger" ng-click="cancel()" translate>app.cancel</button>
+            <button type="button" class="button-beta  modal-trigger" ng-click="cancel()" translate>app.cancel</button>
             <button type="button" class="button-alpha modal-trigger" ng-click="saveCollection(cpyCollection)" translate>app.save_and_close</button>
         </div>
     </div>
diff --git a/app/main/posts/savedsearches/saved-search-list-editor-modal.html b/app/main/posts/savedsearches/saved-search-list-editor-modal.html
index 1bafb60dee..bc89ce3992 100644
--- a/app/main/posts/savedsearches/saved-search-list-editor-modal.html
+++ b/app/main/posts/savedsearches/saved-search-list-editor-modal.html
@@ -16,7 +16,7 @@
     </div>
     <div class="modal-actions">
         <div class="form-field">
-            <button type="button" class="button-link" ng-click="close()" translate>modal.button.close</button>
+            <button type="button" class="button-beta" ng-click="close()" translate>modal.button.close</button>
             <button type="button" class="button-alpha" ng-show="processing">
                 <div class="loading">
                     <div class="line"></div>
diff --git a/app/main/posts/savedsearches/savedsearch-editor.html b/app/main/posts/savedsearches/savedsearch-editor.html
index 5155519be2..eea2c09ba3 100644
--- a/app/main/posts/savedsearches/savedsearch-editor.html
+++ b/app/main/posts/savedsearches/savedsearch-editor.html
@@ -14,7 +14,7 @@
     <role-selector model="savedSearch" title="'app.who_can_see_this'"></role-selector>
     <div class="modal-actions">
         <div class="form-field">
-            <button type="button" class="button-link  modal-trigger" ng-click="cancel()" translate>app.cancel</button>
+            <button type="button" class="button-beta  modal-trigger" ng-click="cancel()" translate>app.cancel</button>
             <button type="button" class="button-alpha modal-trigger" ng-show="!isSaving" ng-click="save(cpySavedSearch)" translate>app.save_and_close</button>
             <button ng-click="saveSearch()" ng-show="isSaving" disabled class="button-beta" type="button">
                 <div class="loading">
diff --git a/app/settings/surveys/task-create.html b/app/settings/surveys/task-create.html
index 5fa8756c97..11220b47fc 100644
--- a/app/settings/surveys/task-create.html
+++ b/app/settings/surveys/task-create.html
@@ -18,7 +18,7 @@
      </div>
   </div>
   <div class="form-field">
-      <button type="button" class="button-link modal-trigger" ng-click="closeModal()" translate="app.cancel">Cancel</button>
+      <button type="button" class="button-beta modal-trigger" ng-click="closeModal()" translate="app.cancel">Cancel</button>
       <button type="button" class="button-alpha modal-trigger" ng-click="addNewTask(newTask)" translate="app.add_and_close">Add &amp; close</button>
   </div>
 </div>
diff --git a/app/settings/user-settings/user-settings.html b/app/settings/user-settings/user-settings.html
index 39309fd857..8aa3d9aba4 100644
--- a/app/settings/user-settings/user-settings.html
+++ b/app/settings/user-settings/user-settings.html
@@ -61,7 +61,7 @@ <h2 class="form-sheet-title" translate="settings.settings_list.user_settings">
                 </div>
 
                 <div class="form-field" ng-show="!hxlMaintainerSet">
-                    <button ng-show="showCancel" type="button" class="button-link" ng-click="cancelMaintainerSet()" translate="app.cancel">Cancel</button>
+                    <button ng-show="showCancel" type="button" class="button-beta" ng-click="cancelMaintainerSet()" translate="app.cancel">Cancel</button>
                     <button class="button button-alpha" translate="app.save" ng-click="saveKey()">Save</button>
                 </div>
 
@@ -95,7 +95,7 @@ <h2 class="form-sheet-title" translate="settings.settings_list.user_settings">
                 </div>
 
                 <div class="form-field" ng-show="!hxlApiKeySet">
-                    <button ng-show="showCancel" type="button" class="button-link" ng-click="cancelApiKeySet()" translate="app.cancel">Cancel</button>
+                    <button ng-show="showCancel" type="button" class="button-beta" ng-click="cancelApiKeySet()" translate="app.cancel">Cancel</button>
                     <button class="button button-alpha" translate="app.save" ng-click="saveKey()">Save</button>
                 </div>
 
diff --git a/app/settings/users/filter-users.html b/app/settings/users/filter-users.html
index b6f6137968..c777eecb9a 100644
--- a/app/settings/users/filter-users.html
+++ b/app/settings/users/filter-users.html
@@ -19,7 +19,7 @@
         </div>
 
         <div class="form-field filter-actions">
-            <button type="button" class="button-link" ng-click="cancel()" translate>app.cancel</button>
+            <button type="button" class="button-beta" ng-click="cancel()" translate>app.cancel</button>
             <button type="submit" class="button-alpha" ng-disabled="applyEnabled"  translate>app.apply_filters</button>
         </div>
     </div>