diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs
index 77cb5dcc8b..ee4e699ba7 100644
--- a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs
+++ b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs
@@ -16,7 +16,7 @@
 
 <div class="row">
   <div class="large-12 columns">
-    <button id="import_wilds" class="button tiny success right radius" >{{tr "Import Wilds"}}</button>
+    <button id="import_wilds" class="button small success right radius" >{{tr "Import Wilds"}}</button>
     <table id="datatable_host_wilds" class="datatable twelve">
       <thead>
         <tr>
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
index a8bd2232af..ef80af7f47 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
@@ -42,8 +42,8 @@
         <tr>
           <td class="key_td">{{tr "Password"}}</td>
           <td class="value_td" colspan="2">
-            <button id="update_password" type="button" class="button tiny radius secondary" >
-              {{tr "Update password"}} <a><i class="fa fa-pencil-square-o"/></a>
+            <button id="update_password" type="button" class="button small radius secondary" >
+              {{tr "Update password"}} <i class="fa fa-pencil-square-o"/>
             </button>
           </td>
         </tr>
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/actions.js b/src/sunstone/public/app/tabs/vms-tab/panels/actions.js
index 343da7c904..124aa5f98e 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/actions.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/actions.js
@@ -70,7 +70,7 @@ define(function(require) {
               <th>' + Locale.tr("DONE") + '</th>\
               <th>' + Locale.tr("MESSAGE") + '</th>\
               <th colspan="">' + Locale.tr("Actions") + '</th>\
-              <th><button id="add_scheduling_action" class="button tiny success right radius" >' + Locale.tr("Add action") + '</button></th>\
+              <th><button id="add_scheduling_action" class="button small success right radius" >' + Locale.tr("Add action") + '</button></th>\
            </tr>\
           </thead>' +
             fromJSONtoActionsTable(that.element.USER_TEMPLATE.SCHED_ACTION) +
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs
index 55530fa6ce..14dc6b6c07 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs
@@ -41,9 +41,9 @@
           <td>
           {{#isTabActionEnabled "vms-tab" "VM.resize"}}
           {{#if resizeStateEnabled}}
-            <button id="resize_capacity" class="button tiny success right radius" >{{tr "Resize"}}</button>
+            <button id="resize_capacity" class="button small success right radius" >{{tr "Resize"}}</button>
           {{else}}
-            <button id="resize_capacity" class="button tiny success right radius" disabled="disabled">{{tr "Resize"}}</button>
+            <button id="resize_capacity" class="button small success right radius" disabled="disabled">{{tr "Resize"}}</button>
           {{/if}}
           {{/isTabActionEnabled}}
           </td>
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/network.js b/src/sunstone/public/app/tabs/vms-tab/panels/network.js
index 84d873b167..b3a0f383c3 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/network.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/network.js
@@ -91,10 +91,10 @@ define(function(require) {
             that.element.LCM_STATE) &&
           OpenNebulaVM.isNICAttachSupported(that.element)) {
         html += '\
-             <button id="attach_nic" class="button tiny success right radius" >' + Locale.tr("Attach nic") + '</button>'
+             <button id="attach_nic" class="button small success right radius" >' + Locale.tr("Attach nic") + '</button>'
       } else {
         html += '\
-             <button id="attach_nic" class="button tiny success right radius" disabled="disabled">' + Locale.tr("Attach nic") + '</button>'
+             <button id="attach_nic" class="button small success right radius" disabled="disabled">' + Locale.tr("Attach nic") + '</button>'
       }
     }
 
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js b/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js
index 169e7fcfb6..4150c13d62 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js
@@ -78,10 +78,10 @@ define(function(require) {
       // If VM is not RUNNING, then we forget about the attach disk form.
       if (that.element.STATE == OpenNebulaVM.STATES.ACTIVE && that.element.LCM_STATE == OpenNebulaVM.LCM_STATES.RUNNING) {
         html += '\
-           <button id="take_snapshot" class="button tiny success right radius" >' + Locale.tr("Take snapshot") + '</button>'
+           <button id="take_snapshot" class="button small success right radius" >' + Locale.tr("Take snapshot") + '</button>'
       } else {
         html += '\
-           <button id="take_snapshot" class="button tiny success right radius" disabled="disabled">' + Locale.tr("Take snapshot") + '</button>'
+           <button id="take_snapshot" class="button small success right radius" disabled="disabled">' + Locale.tr("Take snapshot") + '</button>'
       }
     }
 
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs
index 01ab58791f..6644fed3f7 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs
@@ -29,7 +29,7 @@
             <th>{{tr "Actions"}}
               {{#isTabActionEnabled "vms-tab" "VM.attachdisk"}}
               <span class="right">
-                <button id="attach_disk" class="button tiny success right radius">
+                <button id="attach_disk" class="button small success right radius">
                   {{tr "Attach disk"}}
                 </button>
               </span>
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index 26fcb89ace..ee77099c0b 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -49,7 +49,7 @@
           <th>{{tr "Actions"}}</th>
           <th>
             {{#isTabActionEnabled "vrouters-tab" "VirtualRouter.attachnic"}}
-            <button class="attach_nic button tiny success right radius" >
+            <button class="attach_nic button small success right radius" >
               {{tr "Attach nic"}}
             </button>
             {{/isTabActionEnabled}}