diff --git a/css/main.css b/css/main.css
index a46be41236ff38df119d0293b6ad9d22284499e4..bbe7754eb33e715f17656ecafc62d28afd09091d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -219,12 +219,6 @@ solid-invoicing .submit input {
   justify-content: center;
   width: 260px;
 }
-.invoices-list header solid-router .button {
-  color: var(--color-heading)!important;
-}
-.invoices-list header solid-router .button:hover {
-  color: var(--color-third)!important;
-}
 .invoices-list solid-router .button:before {
   margin-right: 7px;
 }
@@ -706,19 +700,8 @@ widget-money div {
   margin-right: 150px;
   z-index: 1;
   position: relative;
-  border: solid 1px var(--color-heading);
   display: flex;
 }
-.solid-invoicing solid-delete button {
-  color: var(--color-heading);
-}
-.solid-invoicing solid-delete:hover {
-  background-color: var(--color-heading);
-  color: white;
-}
-.solid-invoicing solid-delete:hover button:not(.button-delete-cancel):not(.button-delete-confirm){
-  color: white;
-}
 .solid-invoicing solid-delete dialog {
   position: fixed;
   top: 30%;
@@ -732,6 +715,12 @@ widget-money div {
   font-size: 14px;
   margin-bottom: 30px;
 }
+.solid-invoicing solid-delete:hover .button-delete-cancel {
+  color: var(--color-secondary) !important;
+}
+.solid-invoicing solid-delete .button-delete-cancel:hover {
+  color: white !important;
+}
 
 /* Batches */
 .invoice-form widget-form-batches{
@@ -924,26 +913,7 @@ widget-money div {
   color: grey;
 }
 
-.solid-invoicing .popup-buttons .popup-buttons__validate,
-.solid-invoicing .button-delete-confirm,
-.solid-invoicing .button-delete-cancel,
-.solid-invoicing .popup-buttons .popup-buttons__cancel {
-  border: 1px solid var(--color-heading, gray);
-}
-.solid-invoicing .popup-buttons .popup-buttons__validate:hover,
-.solid-invoicing .button-delete-confirm:hover,
-.solid-invoicing .button-delete-cancel,
-.solid-invoicing .popup-buttons .popup-buttons__cancel {
-  color: var(--color-heading, gray);
-  background: transparent;
-}
-.solid-invoicing .popup-buttons .popup-buttons__validate,
-.solid-invoicing .button-delete-confirm,
-.solid-invoicing .button-delete-cancel:hover,
-.solid-invoicing .popup-buttons .popup-buttons__cancel:hover {
-  background-color: var(--color-heading, gray);
-  color: white;
-}
+
 .solid-invoicing .button-delete-confirm {
   margin-right: 10px;
 }
diff --git a/solid-invoicing.js b/solid-invoicing.js
index 3a08a8e400d4efea752d269755ed06775563bd8a..07f145cf53c7402f15dcab257a7815e0c20285d7 100644
--- a/solid-invoicing.js
+++ b/solid-invoicing.js
@@ -555,7 +555,7 @@ export class SolidInvoicing extends SolidTemplateElement {
         <header class="segment">
           <solid-router default-route="invoice-list" ${prefix}>
             <solid-route name="invoice-list"></solid-route>
-            <solid-route name="add-invoice" class="segment full button text-xsmall text-bold text-uppercase text-center reversed color-third bordered icon icon-plus icon-margin-right-xsmall">${this.localize('button.invoice_create')}</solid-route>
+            <solid-route name="add-invoice" class="segment full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus icon-margin-right-xsmall">${this.localize('button.invoice_create')}</solid-route>
             <solid-route name="show-invoice" use-id></solid-route>
             <solid-route name="edit-invoice" use-id></solid-route>
             <solid-route name="duplicate-invoice" use-id></solid-route>
@@ -609,7 +609,7 @@ export class SolidInvoicing extends SolidTemplateElement {
             required-invoicingDate
             required-tvaRate
             submit-button="${this.localize('button.edit_submit_form')}"
-            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-check"
+            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-check reversed color-secondary bordered"
             ></solid-form>
         </dialog>
 
@@ -655,17 +655,17 @@ export class SolidInvoicing extends SolidTemplateElement {
             required-invoicingDate
             required-tvaRate
             submit-button="${this.localize('button.edit_submit_form')}"
-            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-check" 
+            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-check reversed color-secondary bordered" 
           ></solid-form>
-          <solid-delete class="segment sm-full button text-xsmall text-bold text-uppercase text-center icon icon-trash" 
+          <solid-delete class="segment sm-full button text-xsmall text-bold text-uppercase text-center icon icon-trash color-secondary bordered" 
             bind-resources
             next="invoice-list"
             confirmation-message="${this.localize('confirm.delete_invoice')}"
             confirmation-type="dialog"
             confirmation-submit-text="${this.localize('validate.delete_invoice')}"
             confirmation-cancel-text="${this.localize('cancel.delete_invoice')}"
-            confirmation-submit-class="button-delete-confirm segment sm-full button text-xsmall text-bold text-uppercase text-center "
-            confirmation-cancel-class="cancel button-delete-cancel segment sm-full button text-xsmall text-bold text-uppercase text-center"
+            confirmation-submit-class="button-delete-confirm segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered"
+            confirmation-cancel-class="cancel button-delete-cancel segment sm-full button text-xsmall text-bold text-uppercase text-center color-secondary bordered"
             data-label="${this.localize('button.delete_submit_form')}"
           ></solid-delete>
         </dialog>
@@ -693,8 +693,8 @@ export class SolidInvoicing extends SolidTemplateElement {
             naked
           ></solid-form>
           <div class="popup-buttons">
-            <button class="popup-buttons__cancel close-duplication-dialog">${this.localize('button.duplicate_cancel')}</button>
-            <button class="popup-buttons__validate duplication-button">${this.localize('button.duplicate_confirm')}</button>
+            <button class="popup-buttons__cancel close-duplication-dialog button color-secondary bordered">${this.localize('button.duplicate_cancel')}</button>
+            <button class="popup-buttons__validate duplication-button button reversed color-secondary bordered">${this.localize('button.duplicate_confirm')}</button>
           </div>
         </dialog>
         <solid-display
@@ -800,7 +800,7 @@ export class SolidInvoicing extends SolidTemplateElement {
           <solid-router default-route="freelance-invoice-list" ${prefix}>
             <solid-route name="freelance-invoice-list"></solid-route>
             <solid-route name="edit-freelance-invoice" use-id></solid-route>
-            <solid-route name="add-freelance-invoice" class="segment full button text-xsmall text-bold text-uppercase text-center reversed color-third bordered icon icon-cloud-upload icon-margin-right-xsmall">${this.localize('button.invoice_import')}</solid-route>
+            <solid-route name="add-freelance-invoice" class="segment full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-cloud-upload icon-margin-right-xsmall">${this.localize('button.invoice_import')}</solid-route>
           </solid-router>
           <div class="show-list segment half sm-full cursor-pointer text-bold text-large text-uppercase text-color-heading padding-xsmall icon icon-arrow-down">${this.localize('title.freelance_invoices')}</div>
         </header>
@@ -840,7 +840,7 @@ export class SolidInvoicing extends SolidTemplateElement {
             required-uploadUrl
             next="freelance-invoice-list"
             submit-button="${this.localize('button.submit_form')}"
-            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-rocket"
+            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-rocket reversed color-secondary bordered"
           ></solid-form>
         </dialog>
 
@@ -882,17 +882,17 @@ export class SolidInvoicing extends SolidTemplateElement {
             required-htAmount
             next="freelance-invoice-list"
             submit-button="${this.localize('button.submit_form')}"
-            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-check"
+            class-submit-button="submit sm-full button text-xsmall text-bold text-uppercase text-center icon icon-check reversed color-secondary bordered"
           ></solid-form>
-          <solid-delete class="sm-full button text-xsmall text-bold text-uppercase text-center icon icon-trash" 
+          <solid-delete class="sm-full button text-xsmall text-bold text-uppercase text-center icon icon-trash color-secondary bordered" 
           bind-resources
           next="freelance-invoice-list"
           confirmation-message="${this.localize('confirm.delete_invoice')}"
           confirmation-type="dialog"
           confirmation-submit-text="${this.localize('validate.delete_invoice')}"
           confirmation-cancel-text="${this.localize('cancel.delete_invoice')}"
-          confirmation-submit-class="button-delete-confirm segment sm-full button text-xsmall text-bold text-uppercase text-center "
-          confirmation-cancel-class="cancel button-delete-cancel segment sm-full button text-xsmall text-bold text-uppercase text-center"
+          confirmation-submit-class="button-delete-confirm segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered"
+          confirmation-cancel-class="cancel button-delete-cancel segment sm-full button text-xsmall text-bold text-uppercase text-center bordered color-secondary"
           data-label="${this.localize('button.delete_submit_form')}"
         ></solid-delete>
         </dialog>