diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html
index 71e08501bf..2fa5e24e6f 100644
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html
@@ -47,9 +47,9 @@
                     <tr>
                         <th class="kc-table-actions" colspan="3" data-ng-show="access.manageClients">
                             <div class="pull-right">
-                                <a class="btn btn-primary" tooltip="Manually register cluster node. This is usually not needed as cluster node should be registered automatically by adapter"
+                                <a class="btn btn-default" tooltip="Manually register cluster node. This is usually not needed as cluster node should be registered automatically by adapter"
                                    tooltip-placement="bottom" href="#/register-node/realms/{{realm.realm}}/clients/{{client.id}}/clustering">Register node manually</a>
-                                <a class="btn btn-primary" data-ng-click="testNodesAvailable()" data-ng-show="nodeRegistrations && nodeRegistrations.length > 0">Test cluster availability</a>
+                                <a class="btn btn-default" data-ng-click="testNodesAvailable()" data-ng-show="nodeRegistrations && nodeRegistrations.length > 0">Test cluster availability</a>
                             </div>
                         </th>
                     </tr>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html
index 5ddd71a0a9..f6648bdada 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html
@@ -19,8 +19,8 @@
                     </div>
 
                     <div class="pull-right" data-ng-show="access.manageRealm">
-                        <a class="btn btn-primary" href="#/create/client/{{realm.realm}}">Create</a>
-                        <a class="btn btn-primary" href="#/import/client/{{realm.realm}}" data-ng-show="importButton">Import</a>
+                        <a class="btn btn-default" href="#/create/client/{{realm.realm}}">Create</a>
+                        <a class="btn btn-default" href="#/import/client/{{realm.realm}}" data-ng-show="importButton">Import</a>
                     </div>
                 </div>
             </th>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html
index 1e418b4de7..044f6c416c 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html
@@ -24,8 +24,8 @@
                     </div>
 
                     <div class="pull-right" data-ng-show="access.manageRealm">
-                        <a class="btn btn-primary" href="#/create/client/{{realm.realm}}/{{client.id}}/mappers">Create</a>
-                        <a class="btn btn-primary" href="#/realms/{{realm.realm}}/clients/{{client.id}}/add-mappers">Add Builtin</a>
+                        <a class="btn btn-default" href="#/create/client/{{realm.realm}}/{{client.id}}/mappers">Create</a>
+                        <a class="btn btn-default" href="#/realms/{{realm.realm}}/clients/{{client.id}}/add-mappers">Add Builtin</a>
                     </div>
                 </div>
             </th>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html
index c9ec943773..8a236f70c1 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html
@@ -14,7 +14,7 @@
         <tr>
             <th class="kc-table-actions" colspan="3" data-ng-show="access.manageClients">
                 <div class="pull-right">
-                    <a class="btn btn-primary" href="#/create/role/{{realm.realm}}/clients/{{client.id}}">Add Role</a>
+                    <a class="btn btn-default" href="#/create/role/{{realm.realm}}/clients/{{client.id}}">Add Role</a>
                 </div>
             </th>
         </tr>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html
index 2b445e149d..61af04cc88 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html
@@ -25,7 +25,7 @@
         <tr>
             <th class="kc-table-actions" colspan="3">
                 <div class="pull-right">
-                    <a class="btn btn-primary" ng-click="loadUsers()" tooltip-placement="left" tooltip="Warning, this is a potentially expensive operation depending on number of active sessions.">Show Sessions</a>
+                    <a class="btn btn-default" ng-click="loadUsers()" tooltip-placement="left" tooltip="Warning, this is a potentially expensive operation depending on number of active sessions.">Show Sessions</a>
                 </div>
             </th>
         </tr>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html
index 57996c8dd9..1598ea5137 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html
@@ -28,8 +28,8 @@
                             <span class="glyphicon glyphicon-minus" data-ng-show="filter"></span>
                             Filter
                         </button>
-                        <button class="btn btn-default btn-primary" data-ng-click="update()">Update</button>
-                        <button class="btn btn-default btn-primary" data-ng-click="reset()">Reset</button>
+                        <button class="btn btn-default btn-default" data-ng-click="update()">Update</button>
+                        <button class="btn btn-default btn-default" data-ng-click="reset()">Reset</button>
                     </div>
                     <form class="form-horizontal" data-ng-show="filter">
                         <div class="form-group">
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html
index 406f312e8f..4df17ba54b 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html
@@ -26,8 +26,8 @@
                         <span class="glyphicon glyphicon-minus" data-ng-show="filter"></span>
                         Filter
                     </button>
-                    <button class="btn btn-default btn-primary" data-ng-click="update()">Update</button>
-                    <button class="btn btn-default btn-primary" data-ng-click="reset()">Reset</button>
+                    <button class="btn btn-default btn-default" data-ng-click="update()">Update</button>
+                    <button class="btn btn-default btn-default" data-ng-click="reset()">Reset</button>
                 </div>
                 <form class="form-horizontal">
                     <div class="form-group" data-ng-show="filter">
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html
index 0c44d31856..6689b5638d 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html
@@ -21,7 +21,7 @@
                     </div>
 
                     <div class="pull-right" data-ng-show="access.manageRealm">
-                        <a class="btn btn-primary" href="#/create/role/{{realm.realm}}">Add Role</a>
+                        <a class="btn btn-default" href="#/create/role/{{realm.realm}}">Add Role</a>
                     </div>
                 </div>
             </th>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html
index 8b62f1a859..2d71f9c2f8 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html
@@ -11,7 +11,7 @@
         <tr>
             <th class="kc-table-actions" colspan="3">
                 <div class="pull-right">
-                    <a class="btn btn-primary" ng-click="logoutAll()">Logout All</a>
+                    <a class="btn btn-default" ng-click="logoutAll()">Logout All</a>
                 </div>
             </th>
         </tr>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html
index a846fe8b5b..cb90423592 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html
@@ -15,10 +15,10 @@
                             </div>
                         </div>
                     </div>
-                    <button class="btn btn-primary" ng-click="query.search = null; firstPage()">View all users</button>
+                    <button class="btn btn-default" ng-click="query.search = null; firstPage()">View all users</button>
 
                     <div class="pull-right" data-ng-show="access.manageUsers">
-                        <a class="btn btn-primary" href="#/create/user/{{realm.realm}}">Add User</a>
+                        <a class="btn btn-default" href="#/create/user/{{realm.realm}}">Add User</a>
                     </div>
                 </div>
             </th>
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html
index 685549db41..9d911c5ab9 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html
@@ -11,9 +11,9 @@
     <table class="table table-striped table-bordered">
         <thead>
         <tr data-ng-show="access.manageUsers">
-            <th class="kc-table-actions" colspan="6">
+            <th class="kc-table-actions" colspan="6">
                 <div class="pull-right" data-ng-show="access.manageUsers">
-                    <a class="btn btn-primary" ng-click="logoutAll()">Logout All Sessions</a>
+                    <a class="btn btn-default" ng-click="logoutAll()">Logout All Sessions</a>
                 </div>
             </th>
         </tr>