diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
index 6cce00c13..7dfd5683b 100644
--- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
@@ -219,7 +219,7 @@
 
         <div class="form-actions horizontal">
           <a class="subtle-link standalone cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-          <button type="submit" class="btn btn-create submit align-right"><%- @T( 'Create' ) %></button>
+          <button type="submit" class="btn btn--create submit align-right"><%- @T( 'Create' ) %></button>
         </div>
       </form>
     </div>
diff --git a/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
index e6b91a8bf..ce11d67c8 100644
--- a/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
@@ -19,7 +19,7 @@
     </div>
     <div class="modal-footer horizontal">
       <a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-      <button type="submit" class="btn btn-create js-submit align-right"><%- @T( 'Submit' ) %></button>
+      <button type="submit" class="btn btn--create js-submit align-right"><%- @T( 'Submit' ) %></button>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/app/views/agent_user_create.jst.eco b/app/assets/javascripts/app/views/agent_user_create.jst.eco
index d968f6bbd..4396424e9 100644
--- a/app/assets/javascripts/app/views/agent_user_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco
@@ -10,7 +10,7 @@
     <div class="modal-body" id="form-user"></div>
     <div class="modal-footer horizontal">
       <a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-      <button type="submit" class="btn btn-create js-submit align-right"><%- @T( 'Create' ) %></button>
+      <button type="submit" class="btn btn--create js-submit align-right"><%- @T( 'Create' ) %></button>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco b/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
index 957e20456..d10ef6364 100644
--- a/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
+++ b/app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
@@ -7,7 +7,7 @@
         <p><%- @T('The way to communicate with us is this thing called "Ticket".') %></p>
         <p><%- @T('Please click the button below to create your first one.') %></p>
 
-        <p><a class="btn btn-primary" href="#customer_ticket_new"><%- @T('Create your first Ticket') %></a></p>
+        <p><a class="btn btn--primary" href="#customer_ticket_new"><%- @T('Create your first Ticket') %></a></p>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
index bfa35931b..47af85cd9 100644
--- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco
@@ -18,7 +18,7 @@
 
         <div class="form-actions horizontal">
           <a class="subtle-link standalone cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-          <button type="submit" class="btn btn-create submit align-right"><%- @T( 'Create' ) %></button>
+          <button type="submit" class="btn btn--create submit align-right"><%- @T( 'Create' ) %></button>
         </div>
       </form>
 
diff --git a/app/assets/javascripts/app/views/getting_started.jst.eco b/app/assets/javascripts/app/views/getting_started.jst.eco
index a70ad3bd0..ce630e1aa 100644
--- a/app/assets/javascripts/app/views/getting_started.jst.eco
+++ b/app/assets/javascripts/app/views/getting_started.jst.eco
@@ -8,14 +8,14 @@
     <% if @master_user: %>
     <div class="master_user hero-left">
       <form class="form-stacked" id="form-master">
-        <button type="submit" class="btn btn-primary submit pull-right"><%- @T( 'Next Step' ) %></button>
+        <button type="submit" class="btn btn--primary submit pull-right"><%- @T( 'Next Step' ) %></button>
       </form>
     </div>
     <% end %>
     <div class="agent_user hero-left hide">
       <form class="form-stacked" id="form-agent">
         <div class="form-controls">
-          <button type="submit" class="btn btn-primary submit pull-right"><%- @T( 'Send Invitation' ) %></button>
+          <button type="submit" class="btn btn--primary submit pull-right"><%- @T( 'Send Invitation' ) %></button>
         </div>
       </form>
     </div>
diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco
index 0411d665d..99b67a059 100644
--- a/app/assets/javascripts/app/views/login.jst.eco
+++ b/app/assets/javascripts/app/views/login.jst.eco
@@ -15,7 +15,7 @@
       </div>
 
       <div class="form-controls">
-        <button class="btn btn-primary" type="submit"><%- @T( 'Sign in' ) %></button>
+        <button class="btn btn--primary" type="submit"><%- @T( 'Sign in' ) %></button>
 
         <% if @C('user_lost_password'): %>
           <a href="#reset_password" class="subtle-link standalone pull-right"><%- @T( 'Forgot password?' ) %></a>
diff --git a/app/assets/javascripts/app/views/maintenance.jst.eco b/app/assets/javascripts/app/views/maintenance.jst.eco
index b2a46bdc8..7d09d5ac5 100644
--- a/app/assets/javascripts/app/views/maintenance.jst.eco
+++ b/app/assets/javascripts/app/views/maintenance.jst.eco
@@ -22,5 +22,5 @@
     </div>
   </div>
   </fieldset>
-  <button type="submit" class="btn btn-primary submit"><%- @T('Send to clients') %></button>
+  <button type="submit" class="btn btn--primary submit"><%- @T('Send to clients') %></button>
 </form>
diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco
index c49d7ac78..57967392e 100644
--- a/app/assets/javascripts/app/views/modal.jst.eco
+++ b/app/assets/javascripts/app/views/modal.jst.eco
@@ -22,7 +22,7 @@
         <a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
   <% end %>
   <% if @button: %>
-        <button type="submit" class="btn btn-create js-submit align-right"><%- @T( @button ) %></button>
+        <button type="submit" class="btn btn--create js-submit align-right"><%- @T( @button ) %></button>
   <% end %>
       </div>
     </div>
diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco
index 91cf19ae7..054a0bf89 100644
--- a/app/assets/javascripts/app/views/package.jst.eco
+++ b/app/assets/javascripts/app/views/package.jst.eco
@@ -13,7 +13,7 @@
     <p>
       <form action="<%= App.Config.get('api_path') %>/packages" method="post" enctype="multipart/form-data">
         <input type="file" name="file_upload"/>
-        <button class="btn btn-primary" type="submit"><%- @T('Install Package') %></button>
+        <button class="btn btn--primary" type="submit"><%- @T('Install Package') %></button>
       </form>
     </p>
   </div>
diff --git a/app/assets/javascripts/app/views/password/reset.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco
index afb08c97b..b934523ce 100644
--- a/app/assets/javascripts/app/views/password/reset.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset.jst.eco
@@ -10,7 +10,7 @@
         <div class="form-password-item"></div>
         <div class="form-controls">
           <a class="subtle-link standalone pull-left cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-          <button class="btn btn-primary submit pull-right"><%- @T( 'Submit' ) %></button>
+          <button class="btn btn--primary submit pull-right"><%- @T( 'Submit' ) %></button>
         </div>
       </form>
     <% end %>
diff --git a/app/assets/javascripts/app/views/password/reset_change.jst.eco b/app/assets/javascripts/app/views/password/reset_change.jst.eco
index 5b194a5fc..135d2cd75 100644
--- a/app/assets/javascripts/app/views/password/reset_change.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset_change.jst.eco
@@ -2,7 +2,7 @@
   <div class="hero-unit">
     <h2><%- @T( 'Choose your new password.' ) %><small></small></h2>
     <form id="form-password-change">
-      <button class="btn btn-primary submit"><%- @T( 'Submit' ) %></button>
+      <button class="btn btn--primary submit"><%- @T( 'Submit' ) %></button>
     </form>
   </div>
 </div>
diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco
index 09348e852..4975a4b66 100644
--- a/app/assets/javascripts/app/views/signup.jst.eco
+++ b/app/assets/javascripts/app/views/signup.jst.eco
@@ -4,7 +4,7 @@
       <form class="signup">
         <div class="form-controls">
           <a class="subtle-link standalone pull-left" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-          <button class="btn btn-primary submit pull-right"><%- @T( 'Create my account' ) %></button>
+          <button class="btn btn--primary submit pull-right"><%- @T( 'Create my account' ) %></button>
         </div>
       </form>
   </div>
diff --git a/app/assets/javascripts/app/views/task_widget.jst.eco b/app/assets/javascripts/app/views/task_widget.jst.eco
index d210a06c4..cc1701ca1 100644
--- a/app/assets/javascripts/app/views/task_widget.jst.eco
+++ b/app/assets/javascripts/app/views/task_widget.jst.eco
@@ -3,7 +3,7 @@
   <% if !_.isEmpty( @taskBarActions ): %>
   <div class="taskbar-new">
     <div class="btn-group">
-      <a class="btn btn-small btn-primary dropdown-toggle" data-toggle="dropdown" href="#new">
+      <a class="btn btn-small btn--primary dropdown-toggle" data-toggle="dropdown" href="#new">
         <%- @T('New') %>
         <span class="caret"></span>
       </a>
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb
index 9880e9642..b2216e910 100644
--- a/app/assets/stylesheets/zzz.css.erb
+++ b/app/assets/stylesheets/zzz.css.erb
@@ -1390,14 +1390,14 @@ footer {
   padding: 9px 24px 8px;
 }
 
-.btn-primary {
+.btn--primary {
   color: white;
   background: #419ed7;
   border-color: #419ed7;
 }
 
-.btn-create,
-.btn-create:hover {
+.btn--create,
+.btn--create:hover {
   color: white;
   background: hsl(145,51%,45%);
 }