diff --git a/app/views/registrar/contacts/_form.haml b/app/views/registrar/contacts/_form.haml
index 697306848..7b3c2df32 100644
--- a/app/views/registrar/contacts/_form.haml
+++ b/app/views/registrar/contacts/_form.haml
@@ -1,4 +1,4 @@
-= render 'registrar/shared/error_messages', f: f 
+= render 'registrar/shared/error_messages', f: f
 = f.hidden_field :id
 = f.hidden_field :password
 .row
@@ -7,7 +7,7 @@
 .row
   .col-md-8
     = render 'registrar/contacts/form_partials/address', f: f
-- if !@contact.persisted? 
+- if !@contact.persisted?
   .row
     .col-md-8
       = render 'registrar/contacts/form_partials/code', f: f
@@ -18,6 +18,6 @@
 .row
   .col-md-8.text-right
     - if @contact.persisted?
-      = button_tag t(:save), class: 'btn btn-primary'
+      = button_tag t(:save), class: 'btn btn-warning'
     - else
-      = button_tag t(:create), class: 'btn btn-primary'
+      = button_tag t(:create), class: 'btn btn-warning'
diff --git a/app/views/registrar/deposits/new.haml b/app/views/registrar/deposits/new.haml
index 6211c2e4f..abb04f916 100644
--- a/app/views/registrar/deposits/new.haml
+++ b/app/views/registrar/deposits/new.haml
@@ -25,4 +25,4 @@
   %hr
   .row
     .col-md-8.text-right
-      = button_tag(t(:add), class: 'btn btn-primary')
+      = button_tag(t(:add), class: 'btn btn-warning')
diff --git a/app/views/registrar/domains/_form.haml b/app/views/registrar/domains/_form.haml
index 42244a100..385a2f507 100644
--- a/app/views/registrar/domains/_form.haml
+++ b/app/views/registrar/domains/_form.haml
@@ -25,7 +25,7 @@
 
   .row
     .col-md-8.text-right
-      = button_tag(t('shared.save'), class: 'btn btn-primary')
+      = button_tag(t('shared.save'), class: 'btn btn-warning')
 
 :javascript
   $(function () {
diff --git a/app/views/registrar/domains/index.haml b/app/views/registrar/domains/index.haml
index 294f53432..3a65ddcbe 100644
--- a/app/views/registrar/domains/index.haml
+++ b/app/views/registrar/domains/index.haml
@@ -1,5 +1,5 @@
 - content_for :actions do
-  = link_to(t(:new), new_registrar_domain_path, class: 'btn btn-default')
+  = link_to(t(:new), new_registrar_domain_path, class: 'btn btn-primary')
   = link_to(t(:transfer), transfer_registrar_domains_path, class: 'btn btn-default')
   = link_to(t(:keyrelay), registrar_keyrelay_path, class: 'btn btn-default')
   = link_to(t(:nameservers), registrar_nameservers_path, class: 'btn btn-default')
@@ -38,7 +38,7 @@
               = Time.zone.parse(x['valid_to']).try(:to_date)
             %td
               = link_to(t(:edit), edit_registrar_domains_path(domain_name: x['name']),
-                class: 'btn btn-default btn-xs')
+                class: 'btn btn-primary btn-xs')
               = link_to(t(:renew), renew_registrar_domains_path(domain_name: x['name']),
                 class: 'btn btn-default btn-xs')
               = link_to(t(:delete), delete_registrar_domains_path(domain_name: x['name']),
diff --git a/app/views/registrar/domains/renew_index.haml b/app/views/registrar/domains/renew_index.haml
index aa61ab889..51dee074a 100644
--- a/app/views/registrar/domains/renew_index.haml
+++ b/app/views/registrar/domains/renew_index.haml
@@ -7,24 +7,24 @@
         .col-md-3.control-label
           = label_tag :domain_name, t(:name), class: 'required'
         .col-md-7
-          = text_field_tag :domain_name, params[:domain_name], 
+          = text_field_tag :domain_name, params[:domain_name],
             class: 'form-control', placeholder: t('domain_name'), autocomplete: 'off', required: true
 
       .form-group
         .col-md-3.control-label
           = label_tag :cur_exp_date, t(:cur_exp_date), class: 'required'
         .col-md-7
-          = text_field_tag :cur_exp_date, params[:cur_exp_date], 
+          = text_field_tag :cur_exp_date, params[:cur_exp_date],
             class: 'form-control', placeholder: 'yyyy-mm-dd', autocomplete: 'off', required: true
 
       .form-group
         .col-md-3.control-label
           = label_tag :domain_period, t(:period), class: 'required'
         .col-md-7
-          = select_tag :period, 
+          = select_tag :period,
             options_for_select(Depp::Domain::PERIODS, params[:period]), { class: 'form-control' }
 
       %hr
       .form-group
         .col-md-10.text-right
-          %button.btn.btn-primary= t(:renew)
+          %button.btn.btn-warning= t(:renew)
diff --git a/app/views/registrar/domains/transfer_index.haml b/app/views/registrar/domains/transfer_index.haml
index 05e7c2722..5eab1f5ae 100644
--- a/app/views/registrar/domains/transfer_index.haml
+++ b/app/views/registrar/domains/transfer_index.haml
@@ -7,13 +7,13 @@
         .col-md-3.control-label
           = label_tag :domain_name, t(:name), class: 'required'
         .col-md-7
-          = text_field_tag :domain_name, params[:domain_name], class: 'form-control', 
+          = text_field_tag :domain_name, params[:domain_name], class: 'form-control',
             placeholder: t(:domain_name), autocomplete: 'off', autofocus: true, required: true
       .form-group
         .col-md-3.control-label
           = label_tag :password, t(:password), class: 'required'
         .col-md-7
-          = text_field_tag :password, params[:password], 
+          = text_field_tag :password, params[:password],
             class: 'form-control', autocomplete: 'off', required: true
       .form-group
         .col-md-3.control-label
@@ -22,6 +22,6 @@
           = file_field_tag 'legal_document', required: true
       .form-group
         .col-md-10.text-right
-          %button.btn.btn-primary{ name: 'query' }= t(:query)
-          %button.btn.btn-primary{ name: 'approve' }= t(:approve)
-          %button.btn.btn-primary{ name: 'reject' }= t(:reject)
+          %button.btn.btn-warning{ name: 'query' }= t(:query)
+          %button.btn.btn-warning{ name: 'approve' }= t(:approve)
+          %button.btn.btn-warning{ name: 'reject' }= t(:reject)
diff --git a/app/views/registrar/invoices/forward.haml b/app/views/registrar/invoices/forward.haml
index e32f81628..2f2b3a66f 100644
--- a/app/views/registrar/invoices/forward.haml
+++ b/app/views/registrar/invoices/forward.haml
@@ -12,4 +12,4 @@
 
       .row
         .col-md-12.text-right
-          = button_tag(t(:forward), class: 'btn btn-primary')
+          = button_tag(t(:forward), class: 'btn btn-warning')
diff --git a/app/views/registrar/invoices/index.haml b/app/views/registrar/invoices/index.haml
index 1b49f7545..18f027fb0 100644
--- a/app/views/registrar/invoices/index.haml
+++ b/app/views/registrar/invoices/index.haml
@@ -39,7 +39,7 @@
             = f.label t(:maximum_total)
             = f.search_field :sum_cache_lteq, class: 'form-control', placeholder: t(:maximum_total), autocomplete: 'off'
         .col-md-3{style: 'padding-top: 25px;'}
-          %button.btn.btn-primary
+          %button.btn.btn-default
              
             %span.glyphicon.glyphicon-search
              
diff --git a/app/views/registrar/invoices/show.haml b/app/views/registrar/invoices/show.haml
index dc4145bf2..ed0c4d1d2 100644
--- a/app/views/registrar/invoices/show.haml
+++ b/app/views/registrar/invoices/show.haml
@@ -2,7 +2,7 @@
   = link_to(t(:download), download_pdf_registrar_invoice_path(@invoice), class: 'btn btn-default')
   = link_to(t(:forward), forward_registrar_invoice_path(@invoice), class: 'btn btn-default')
   - if !@invoice.cancelled? && !@invoice.binded?
-    = link_to(t(:cancel), cancel_registrar_invoice_path(@invoice), method: :patch, class: 'btn btn-default')
+    = link_to(t(:cancel), cancel_registrar_invoice_path(@invoice), method: :patch, class: 'btn btn-warning')
   = link_to(t(:back), registrar_invoices_path, class: 'btn btn-default')
 = render 'shared/title', name: @invoice.to_s
 = render 'shared/full_errors', object: @invoice
diff --git a/app/views/registrar/keyrelays/show.haml b/app/views/registrar/keyrelays/show.haml
index 40b40db04..399c64925 100644
--- a/app/views/registrar/keyrelays/show.haml
+++ b/app/views/registrar/keyrelays/show.haml
@@ -61,4 +61,4 @@
 
       .form-group
         .col-md-10.text-right
-          %button.btn.btn-primary= t(:upload_key)
+          %button.btn.btn-warning= t(:upload_key)
diff --git a/app/views/registrar/nameservers/index.haml b/app/views/registrar/nameservers/index.haml
index 2c1b1b8d4..493f17cd0 100644
--- a/app/views/registrar/nameservers/index.haml
+++ b/app/views/registrar/nameservers/index.haml
@@ -21,7 +21,7 @@
              
           %button.btn.btn-default.js-reset-form
             = t(:clear_fields)
-          %button.btn.btn-primary{name: 'replace'}
+          %button.btn.btn-warning{name: 'replace'}
             = t(:replace)
       .row
         .col-md-12
diff --git a/app/views/registrar/polls/show.haml b/app/views/registrar/polls/show.haml
index 134edbb9b..fcfa994a3 100644
--- a/app/views/registrar/polls/show.haml
+++ b/app/views/registrar/polls/show.haml
@@ -11,10 +11,10 @@
             .pull-left= t('message_no', id: msg_q['id'])
             .pull-right
               - if @data.css('panData').any? # this is a keyrelay request
-                = link_to(t('confirm'), 'javascript: void(0);', class: 'btn btn-primary btn-xs js-keyrelay-confirm')
+                = link_to(t('confirm'), 'javascript: void(0);', class: 'btn btn-warning btn-xs js-keyrelay-confirm')
               - if @data.css('trnData trStatus').any? # this is a transfer request
                 - unless ['serverApproved', 'clientApproved'].include?(@data.css('trStatus').first.text)
-                  = link_to(t('confirm'), 'javascript: void(0);', class: 'btn btn-primary btn-xs js-transfer-confirm')
+                  = link_to(t('confirm'), 'javascript: void(0);', class: 'btn btn-warning btn-xs js-transfer-confirm')
               = link_to(t('dequeue'), registrar_poll_path(id: msg_q['id']), method: :delete, class: 'btn btn-primary btn-xs')
           .panel-body
             %dl.dl-horizontal