diff --git a/css/main.css b/css/main.css
index 938880e4c95f8354f398d37c0a9ad700755ec4b7..c5122696e8035bfdaf25a6aef8334946c7eb567f 100644
--- a/css/main.css
+++ b/css/main.css
@@ -100,9 +100,8 @@
 .invoice-form widget-nomenclature div {
   white-space: normal;
   color: var(--color-grey4);
-  font-size: 13px
+  font-size: 12px;
 }
-
 .solid-invoicing select,
 .solid-invoicing input[type="text"],
 .solid-invoicing input[type="date"],
@@ -319,6 +318,14 @@ solid-invoicing .submit input {
   padding: 6px 20px;
   height: 27px;
 }
+.invoices-list [name="state"] .pending {
+  color: var(--color-secondary);
+  border: solid 1px var(--color-secondary);
+}
+.invoices-list [name="state"] .edited {
+  background-color: var(--color-secondary);
+  color: white;
+}
 .invoices-list [name="state"] .paid {
   background-color: #94d176;
   color: white;
@@ -413,7 +420,6 @@ solid-invoicing .submit input {
   padding: 16px;
   font-weight: 600;
   margin-top: 25px;
-  height: 40px;
   line-height: 28px;
 }
 .batches-list [name="batch-header"] solid-display-value::selection,
@@ -547,6 +553,7 @@ widget-money div {
   padding: 0 35px 35px;
   color: #636363;
   font-family: Open Sans, sans-serif;
+  font-size: 14px;
 }
 
 .invoice-dialog .invoice-render {
@@ -691,6 +698,7 @@ widget-money div {
   z-index: 1;
   position: relative;
   border: solid 1px var(--color-heading);
+  display: flex;
 }
 .solid-invoicing solid-delete button {
   color: var(--color-heading);
diff --git a/solid-invoicing.js b/solid-invoicing.js
index 7db371f7403c5367308959cb99ffb889a26d24bc..19743e5528a533222209927aff9d4cfbccd033f8 100644
--- a/solid-invoicing.js
+++ b/solid-invoicing.js
@@ -468,9 +468,9 @@ export class SolidInvoicing extends SolidTemplateElement {
 
     <solid-widget name="widget-state">
       <template>
-        \${value == 'edited' ? '<div class="segment full button text-xsmall text-bold text-center reversed color-secondary bordered">${this.localize('option.edited')}</div>' : '' }
-        \${value == 'pending' ? '<div class="segment full button text-xsmall text-bold text-center color-secondary bordered">${this.localize('option.pending')}</div>' : '' }
-        \${value == 'sent' ? '<div class="segment full button text-xsmall text-bold text-center sent bordered">${this.localize('option.sent')}</div>' : '' }
+        \${value == 'edited' ? '<div class="segment full button text-xsmall text-bold text-center edited ">${this.localize('option.edited')}</div>' : '' }
+        \${value == 'pending' ? '<div class="segment full button text-xsmall text-bold text-center pending">${this.localize('option.pending')}</div>' : '' }
+        \${value == 'sent' ? '<div class="segment full button text-xsmall text-bold text-center sent">${this.localize('option.sent')}</div>' : '' }
         \${value == 'paid' ? '<div class="segment full button text-xsmall text-bold text-center reversed paid bordered">${this.localize('option.paid')}</div>' : '' }
         \${value == 'late' ? '<div class="segment full button text-xsmall text-bold text-center reversed bordered late">${this.localize('option.late')}</div>' : '' }
       </template>
@@ -850,7 +850,7 @@ export class SolidInvoicing extends SolidTemplateElement {
             widget-state="solid-form-dropdown-label"
             upload-url-uploadUrl="${uploadUrl}"
             enum-state="${this.localize('option.edited')} = edited, ${this.localize('option.pending')} = pending, ${this.localize('option.sent')} = sent, ${this.localize('option.late')} = late, ${this.localize('option.paid')} = paid"
-            class-state="custom-select segment half"
+            class-state="custom-select segment half sm-full"
             class-first-line="segment full sm-whitespace-normal"
             class-second-line="segment full sm-whitespace-normal"
             class-third-line="segment full"
@@ -859,7 +859,7 @@ export class SolidInvoicing extends SolidTemplateElement {
             class-htAmount="segment half sm-full"
             class-nomenclatureNote="segment half sm-full"
             class-invoicingDate="segment half sm-full"
-            class-uploadUrl="segment half"
+            class-uploadUrl="segment half sm-full"
             required-freelanceFullname
             required-identifier
             required-invoicingDate