diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/bisq/desktop/bisq.css
index 3a2388d48dd..e24b924a145 100644
--- a/desktop/src/main/java/bisq/desktop/bisq.css
+++ b/desktop/src/main/java/bisq/desktop/bisq.css
@@ -1,51 +1,379 @@
-/*
-Theme colors:
+@font-face {
+    src: url("/fonts/IBMPlexSans-Regular.ttf");
+}
+@font-face {
+    src: url("/fonts/IBMPlexSans-Bold.ttf");
+}
+@font-face {
+    src: url("/fonts/IBMPlexSans-Medium.ttf");
+}
+@font-face {
+    src: url("/fonts/IBMPlexMono-Regular.ttf");
+}
+@font-face {
+    src: url("/fonts/IBMPlexSans-Light.ttf");
+}
+.root {
+    -fx-font-size: 13;
+    -fx-font-family: "IBM Plex Sans";
+}
 
-logo colors:
+.root {
+    -bs-green-soft: white;
+    -bs-bg-green: #98b999;
+    -bs-color-green-1: #c4d9c5;
+    -bs-color-green-2: #98b999;
+    -bs-color-green-3: #619864;
+    -bs-color-green-4: #15bc1d;
+    -bs-color-green-5: #2a7e2e;
+    -bs-color-blue-1: #b4e1ee;
+    -bs-color-blue-2: #69a3b5;
+    -bs-color-blue-3: #56adc8;
+    -bs-color-blue-4: #1f8cad;
+    -bs-color-blue-5: #0b4c60;
+    -bs-turquoise: #2cadaf;
+    -bs-blue: #1f8cad;
+    -bs-blue-transparent: rgba(11, 76, 96, 0.27);
+    -bs-yellow: #ffb70f;
+    -bs-yellow-light: #f9d686;
+    -bs-red: #d83431;
+    -bs-red-soft: white;
+}
 
-bisq blue: 0f86c3
-bisq grey: 666666
+/*******************************************************************************
+ *                                                                             *
+ * Table                                                                       *
+ *                                                                             *
+ ******************************************************************************/
+.table-view .table-cell {
+    -fx-alignment: center-left;
+    -fx-padding: 2 0 2 0;
+    /*-fx-padding: 3 0 2 0;*/
+}
 
-00abff
-orange web page quotes : ff7f00
+.table-view .table-row-cell:even .table-cell {
+    -fx-background-color: -bs-background-color;
+}
 
+.table-view .table-row-cell:odd .table-cell {
+    -fx-background-color: derive(-bs-background-color, 5%);
+}
 
-main bg grey: dddddd
-content bg grey: f4f4f4
-tab pane upper bg gradient color mid dark grey to bright grey: cfcfcf -> dddddd
-upper border on tab: cfcfcf
-lower border on tab: b5b5b5
-upper gradient color on tab: d3d3d3
-lower gradient color on tab: dddddd
-bg color of non edit textFields: fafafa
-*/
+.table-view .table-cell.last-column {
+    -fx-alignment: center-right;
+    -fx-padding: 2 10 2 0;
+}
 
-@font-face {
-    src: url("/fonts/IBMPlexSans-Regular.ttf");
+.table-view .table-cell.last-column.avatar-column {
+    -fx-alignment: center;
+    -fx-padding: 2 0 2 0;
 }
 
-@font-face {
-    src: url("/fonts/IBMPlexSans-Bold.ttf");
+.table-view .column-header.last-column {
+    -fx-padding: 0 10 0 0;
 }
 
-@font-face {
-    src: url("/fonts/IBMPlexSans-Medium.ttf");
+.table-view .column-header.last-column .label {
+    -fx-alignment: center-right;
 }
 
-@font-face {
-    src: url("/fonts/IBMPlexSans-Light.ttf");
+.table-view .column-header.last-column.avatar-column {
+    -fx-padding: 0;
 }
 
-@font-face {
-    src: url("/fonts/IBMPlexMono-Regular.ttf");
+.table-view .column-header.last-column.avatar-column .label {
+    -fx-alignment: center;
+}
+
+.table-view .table-cell.first-column {
+    -fx-padding: 2 0 2 10;
+}
+
+.table-view .column-header.first-column {
+    -fx-padding: 0 0 0 10;
+}
+
+.number-column.table-cell {
+    -fx-font-size: 1em;
+    -fx-padding: 0 0 0 0;
+    -fx-background-color: -bs-background-color;
+}
+
+.table-view .filler {
+    -fx-background-color: -bs-color-gray-0;
+}
+
+.table-view {
+    -fx-control-inner-background-alt: -fx-control-inner-background;
+    -fx-background-color: -bs-background-color;
+}
+
+.table-view .column-header .label {
+    -fx-alignment: center-left;
+    -fx-font-weight: normal;
+    -fx-font-size: 0.923em;
+    -fx-padding: 0;
+}
+
+.table-view .column-header {
+    -fx-background-color: -bs-color-gray-0;
+    -fx-padding: 0;
+}
+
+.table-view .focus {
+    -fx-alignment: center-left;
+}
+
+.table-view .text {
+    -fx-fill: -bs-text-color;
+}
+
+/* horizontal scrollbars are never needed and are flickering at scaling so lets turn them off */
+.table-view > .scroll-bar:horizontal {
+    -fx-opacity: 0;
+}
+
+.table-view:focused {
+    -fx-background-color: -fx-box-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+    -fx-padding: 1;
+}
+
+.table-view:focused .table-row-cell:focused {
+    -fx-background-color: -fx-table-cell-border-color, -fx-background;
+    -fx-background-insets: 0, 0 0 1 0;
+}
+
+.offer-table .table-row-cell {
+    -fx-border-color: -bs-background-color;
+    -fx-table-cell-border-color: -bs-background-color;
+}
+
+.table-row-cell {
+    -fx-border-width: 0 0 1 0;
+    -fx-border-color: -bs-color-gray-1;
+    -fx-table-cell-border-color: -bs-background-color;
+}
+
+.table-row-cell:selected {
+    -fx-border-width: 0 0 1 0;
+    -fx-table-cell-border-color: transparent;
+}
+
+.table-row-cell:empty {
+    -fx-border-width: 0;
+    -fx-background-color: -bs-background-color;
+    -fx-table-cell-border-color: transparent;
+}
+
+.table-view .table-row-cell:selected .table-row-cell:row-selection .table-row-cell:cell-selection .text {
+    -fx-fill: -bs-text-color;
+}
+
+.table-view .table-row-cell:selected .button .text {
+    -fx-fill: -bs-text-color;
+}
+
+.table-view .table-row-cell .copy-icon .text,
+.table-view .table-row-cell .copy-icon .text:hover {
+    -fx-fill: -fx-accent;
+}
+
+.table-view .table-row-cell:selected .copy-icon .text {
+    -fx-fill: -bs-text-color;
+}
+
+.table-view .table-row-cell:selected .copy-icon .text:hover {
+    -fx-fill: -bs-text-color;
+}
+
+.table-view .table-row-cell:selected .hyperlink .text {
+    -fx-fill: -bs-text-color;
+    -fx-border-style: none;
+    -fx-border-width: 0px;
+}
+
+.table-view .table-row-cell .hyperlink .text {
+    -fx-fill: -bs-rd-font-dark;
+    -fx-border-style: none;
+    -fx-border-width: 0px;
+}
+
+.table-view .table-row-cell .hyperlink .text:hover,
+.table-view .table-row-cell:selected .hyperlink .text:hover {
+    -fx-fill: -bs-text-color;
+    -fx-border-style: none;
+    -fx-border-width: 0px;
+}
+
+.table-view .table-row-cell .hyperlink:hover,
+.table-view .table-row-cell .hyperlink:visited,
+.table-view .table-row-cell .hyperlink:hover:visited {
+    -fx-underline: false;
+    -fx-border-style: none;
+    -fx-border-width: 0px;
+}
+
+.table-view .table-row-cell .hyperlink:focused {
+    -fx-border-style: none;
+    -fx-border-width: 0px;
+}
+
+.table-view.large-rows .table-row-cell {
+    -fx-cell-size: 47px;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Icons                                                                       *
+ *                                                                             *
+ ******************************************************************************/
+.icon, icon:hover {
+    -fx-cursor: hand;
+}
+
+.hidden-icon-button {
+    -fx-background-color: transparent;
+    -fx-padding: 0;
+    -fx-cursor: hand;
+}
+
+#icon-button {
+    -fx-cursor: hand;
+    -fx-background-color: transparent;
+}
+
+.copy-icon-disputes {
+    -fx-text-fill: -bs-background-color;
+}
+
+.copy-icon:hover {
+    -fx-text-fill: -bs-text-color;
+}
+
+.received-funds-icon {
+    -fx-text-fill: -bs-green-soft;
+}
+
+.sent-funds-icon {
+    -fx-text-fill: -bs-red-soft;
+}
+
+.version {
+    -fx-text-fill: -bs-text-color;
+    -fx-underline: false;
+    -fx-cursor: null;
+}
+
+.version-new {
+    -fx-text-fill: -bs-rd-error-red;
+    -fx-underline: true;
+    -fx-cursor: hand;
+}
+
+.opaque-icon {
+    -fx-fill: -bs-color-gray-2;
+    -fx-opacity: 1;
+}
+
+.opaque-icon-character {
+    -fx-font-size: 3em;
+    -fx-text-fill: -bs-color-gray-2;
+    -fx-padding: 24 2 0 2;
+}
+
+.opaque-icon-character.small {
+    -fx-font-size: 1em;
+    -fx-padding: 27 2 0 2;
+}
+
+#non-clickable-icon {
+    -fx-text-fill: -bs-color-gray-4;
+}
+
+.delete-icon {
+    -fx-fill: -bs-red;
+}
+
+.delete {
+    -fx-text-fill: -bs-rd-error-red;
+    -fx-fill: -bs-rd-error-red;
+}
+
+.delete:hover {
+    -fx-text-fill: -bs-text-color;
+    -fx-fill: -bs-text-color;
 }
 
 /********************************************************************************************************************
  *                                                                                                                  *
- * General                                                                                                          *
+ * Popups                                                                                                           *
  *                                                                                                                  *
  ********************************************************************************************************************/
+.popup-headline {
+    -fx-font-size: 1.538em;
+    -fx-text-fill: -bs-rd-font-dark;
+}
 
+.popup-headline-information {
+    -fx-font-size: 1.538em;
+    -fx-text-fill: -bs-color-primary;
+}
+
+.popup-headline-warning {
+    -fx-font-size: 1.538em;
+    -fx-text-fill: -bs-rd-error-red;
+}
+
+.popup-icon-information {
+    -fx-text-fill: -bs-color-primary;
+}
+
+.popup-icon-warning {
+    -fx-text-fill: -bs-rd-error-red;
+}
+
+.popup-bg, .notification-popup-bg, .peer-info-popup-bg {
+    -fx-font-size: 1.077em;
+    -fx-text-fill: -bs-rd-font-dark;
+    -fx-background-color: -bs-background-color;
+    -fx-background-radius: 0;
+    -fx-background-insets: 44;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent-dark, 44, 0, 0, 0);
+}
+
+.popup-bg-top {
+    -fx-font-size: 1.077em;
+    -fx-text-fill: -bs-rd-font-dark;
+    -fx-background-color: -bs-background-color;
+    -fx-background-radius: 0;
+    -fx-background-insets: 44;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent-dark, 44, 0, 0, 0);
+}
+
+.notification-popup-headline, peer-info-popup-headline {
+    -fx-font-size: 1.077em;
+    /*-fx-font-weight: bold;*/
+    -fx-text-fill: -bs-color-primary;
+}
+
+.notification-popup-bg {
+    -fx-font-size: 0.846em;
+    -fx-background-insets: 44;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent-dark, 44, 0, -1, 3);
+}
+
+.peer-info-popup-bg {
+    -fx-font-size: 0.846em;
+    -fx-background-insets: 44;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent-dark, 44, 0, -1, 3);
+}
+
+/********************************************************************************************************************
+ *                                                                                                                  *
+ * General                                                                                                          *
+ *                                                                                                                  *
+ ********************************************************************************************************************/
 /* Text */
 .error-text {
     -fx-text-fill: -bs-rd-error-red;
@@ -56,7 +384,7 @@ bg color of non edit textFields: fafafa
 }
 
 .success-text {
-    -fx-text-fill: -bs-rd-green;
+    -fx-text-fill: -bs-color-primary;
 }
 
 .highlight, .highlight-static {
@@ -65,23 +393,23 @@ bg color of non edit textFields: fafafa
 }
 
 .highlight:hover {
-    -fx-text-fill: -bs-rd-black;
-    -fx-fill: -bs-rd-black;
+    -fx-text-fill: -bs-text-color;
+    -fx-fill: -bs-text-color;
 }
 
 .info {
-    -fx-text-fill: -bs-rd-green;
-    -fx-fill: -bs-rd-green;
+    -fx-text-fill: -bs-color-primary;
+    -fx-fill: -bs-color-primary;
 }
 
 .info:hover {
-    -fx-text-fill: -bs-grey;
-    -fx-fill: -bs-grey;
+    -fx-text-fill: -bs-color-gray-6;
+    -fx-fill: -bs-color-gray-6;
 }
 
 .sub-info {
-    -fx-text-fill: -bs-medium-grey;
-    -fx-fill: -bs-medium-grey;
+    -fx-text-fill: -bs-color-gray-4;
+    -fx-fill: -bs-color-gray-4;
 }
 
 .headline-label {
@@ -101,12 +429,12 @@ bg color of non edit textFields: fafafa
 }
 
 .warning:hover {
-    -fx-text-fill: -bs-grey;
-    -fx-fill: -bs-grey;
+    -fx-text-fill: -bs-color-gray-6;
+    -fx-fill: -bs-color-gray-6;
 }
 
 .zero-decimals {
-    -fx-text-fill: -bs-light-grey;
+    -fx-text-fill: -bs-color-gray-3;
 }
 
 .confirmation-label {
@@ -117,7 +445,7 @@ bg color of non edit textFields: fafafa
 .confirmation-value {
     -fx-font-size: 1.077em;
     -fx-font-family: "IBM Plex Mono";
-    -fx-text-fill: -bs-rd-font-dark-grey;
+    -fx-text-fill: -bs-rd-font-dark-gray;
 }
 
 .confirmation-text-field-as-label:readonly {
@@ -128,7 +456,6 @@ bg color of non edit textFields: fafafa
 }
 
 /* Other UI Elements */
-
 .separator *.line {
     -fx-border-style: solid;
     -fx-border-width: 0 0 1 0;
@@ -141,7 +468,7 @@ bg color of non edit textFields: fafafa
 
 .jfx-progress-bar > .bar,
 .jfx-progress-bar:indeterminate > .bar {
-    -fx-background-color: -bs-rd-green;
+    -fx-background-color: -bs-color-primary;
 }
 
 .jfx-progress-bar.error > .bar,
@@ -155,7 +482,7 @@ bg color of non edit textFields: fafafa
 
 .jfx-spinner:indeterminate .arc,
 .jfx-spinner:determinate .arc {
-    -fx-stroke: -bs-rd-green;
+    -fx-stroke: -bs-color-primary;
 }
 
 .busyanimation .text.percentage {
@@ -163,51 +490,37 @@ bg color of non edit textFields: fafafa
 }
 
 .jfx-button, .action-button {
-    -fx-background-color: -bs-rd-grey-light;
-    -fx-text-fill: -bs-rd-font-dark-grey;
+    -fx-background-color: -bs-color-gray-2;
+    -fx-text-fill: -bs-rd-font-dark-gray;
     -fx-font-size: 0.923em;
     -fx-font-weight: normal;
     -fx-background-radius: 2px;
     -fx-pref-height: 32;
     -fx-min-height: -fx-pref-height;
     -fx-padding: 0 40 0 40;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent, 2, 0, 0, 0, 1);
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent, 2, 0, 0, 0, 1);
     -fx-cursor: hand;
 }
 
 .jfx-button:hover, .jfx-button:focused {
-    -fx-background-color: derive(-bs-rd-grey-light, -10%);
+    -fx-background-color: derive(-bs-color-gray-2, -10%);
 }
 
 .action-button:hover, .action-button:focused {
-    -fx-background-color: derive(-bs-rd-green-dark, -10%);
+    -fx-background-color: derive(-bs-color-primary-dark, -10%);
 }
 
 .action-button {
-    -fx-background-color: -bs-rd-green-dark;
-    -fx-text-fill: -bs-rd-white;
+    -fx-background-color: -bs-color-primary-dark;
+    -fx-text-fill: -bs-background-color;
 }
 
 .compact-button, .table-cell .jfx-button, .action-button.compact-button {
     -fx-padding: 0 10 0 10;
 }
 
-.text-button {
-    -fx-background-color: transparent;
-    -fx-underline: true;
-    -fx-padding: 0 10 0 10;
-    -fx-pref-height: 28;
-    -fx-min-height: -fx-pref-height;
-}
-
-.text-button:hover {
-    -fx-text-fill: -bs-rd-black;
-    -fx-background-color: transparent;
-    -fx-underline: false;
-}
-
 .jfx-checkbox {
-    -jfx-checked-color: -bs-rd-green;
+    -jfx-checked-color: -bs-color-primary;
     -fx-font-size: 0.692em;
 }
 
@@ -227,16 +540,33 @@ bg color of non edit textFields: fafafa
 }
 
 .jfx-combo-box {
-    -jfx-focus-color: -bs-rd-green;
-    -jfx-unfocus-color: -bs-rd-grey-line;
-    -fx-background-color: -bs-rd-white;
+    -jfx-focus-color: -bs-color-primary;
+    -jfx-unfocus-color: -bs-color-gray-line;
+    -fx-background-color: -bs-background-color;
 }
 
 .jfx-combo-box > .list-cell {
-    -fx-text-fill: -bs-rd-black;
+    -fx-text-fill: -bs-text-color;
     -fx-font-family: "IBM Plex Sans Medium";
 }
 
+.list-view {
+    -fx-background-color: -bs-background-gray;
+}
+.list-view .list-cell {
+    -fx-background-color: -bs-background-color;
+}
+.list-view .list-cell:odd {
+    -fx-background-color: derive(-bs-background-color, -5%);
+}
+.list-view .list-cell:even {
+    -fx-background-color: derive(-bs-background-color, 5%);
+}
+.list-view .list-cell .text {
+    -fx-text-fill: -bs-rd-font-dark-gray;
+    -fx-fill: -bs-rd-font-dark-gray;
+}
+
 .jfx-combo-box > .arrow-button > .arrow {
     -fx-background-color: null;
     -fx-border-color: -jfx-unfocus-color;
@@ -254,6 +584,20 @@ bg color of non edit textFields: fafafa
     -fx-background-color: -fx-selection-bar;
 }
 
+.list-view:focused,
+.tree-view:focused,
+.table-view:focused,
+.tree-table-view:focused,
+.table-view:focused,
+.tree-table-view:focused {
+    -fx-background-insets: 0;
+}
+
+.list-view:focused {
+    -fx-background-color: #25b136;
+    -fx-background-insets: 0;
+}
+
 /* Selected rows */
 .list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
 .tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected,
@@ -275,8 +619,9 @@ bg color of non edit textFields: fafafa
 }
 
 .jfx-text-field {
-    -jfx-focus-color: -bs-rd-green;
-    -fx-background-color: -bs-rd-white;
+    -jfx-focus-color: -bs-color-primary;
+    -fx-background-color: -bs-color-gray-0;
+    -fx-text-fill: -bs-rd-font-dark;
     -fx-background-radius: 3 3 0 0;
     -fx-padding: 0.333333em 0.333333em 0.333333em 0.333333em;
 }
@@ -290,11 +635,11 @@ bg color of non edit textFields: fafafa
 }
 
 .jfx-text-field-top-label {
-    -fx-text-fill: -bs-dim-grey;
+    -fx-text-fill: -bs-color-gray-6;
 }
 
 .jfx-text-field:readonly, .hyperlink-with-icon {
-    -fx-background-color: -bs-rd-grey-medium-light;
+    -fx-background-color: -bs-background-gray;
     -fx-padding: 0.333333em 0.333333em 0.333333em 0.333333em;
 }
 
@@ -317,13 +662,13 @@ bg color of non edit textFields: fafafa
 }
 
 #info-field {
-    -fx-prompt-text-fill: -bs-rd-black;
+    -fx-prompt-text-fill: -bs-text-color;
 }
 
 .jfx-password-field {
-    -fx-background-color: -bs-rd-white;
+    -fx-background-color: -bs-background-color;
     -fx-background-radius: 3 3 0 0;
-    -jfx-focus-color: -bs-rd-green;
+    -jfx-focus-color: -bs-color-primary;
     -fx-padding: 0.333333em 0.333333em 0.333333em 0.333333em;
 }
 
@@ -352,13 +697,13 @@ bg color of non edit textFields: fafafa
 }
 
 .input-with-border {
-    -fx-background-color: -bs-rd-white;
+    -fx-background-color: -bs-background-color;
     -fx-border-width: 1;
-    -fx-border-color: -bs-rd-grey-background-dark;
+    -fx-border-color: -bs-color-gray-2;
     -fx-border-radius: 3;
     -fx-pref-height: 43;
     -fx-pref-width: 310;
-    -fx-effect: innershadow(gaussian, -bs-rd-black-transparent, 3, 0, 0, 1);
+    -fx-effect: innershadow(gaussian, -bs-text-color-transparent, 3, 0, 0, 1);
 }
 
 .input-with-border .text-field {
@@ -379,7 +724,7 @@ bg color of non edit textFields: fafafa
 }
 
 .input-with-border-readonly {
-    -fx-background-color: -bs-rd-grey-medium-light;
+    -fx-background-color: -bs-color-gray-1;
     -fx-border-width: 0;
     -fx-pref-width: 300;
 }
@@ -387,7 +732,7 @@ bg color of non edit textFields: fafafa
 .input-with-border-readonly .text-field {
     -fx-alignment: center-right;
     -fx-font-size: 1em;
-    -fx-background-color: -bs-rd-grey-medium-light;
+    -fx-background-color: -bs-color-gray-1;
 }
 
 .input-with-border-readonly .text-field > .input-line {
@@ -411,40 +756,44 @@ bg color of non edit textFields: fafafa
     -fx-pref-width: 15;
     -fx-pref-height: 15;
 }
-
-.jfx-badge.new .badge-pane {
-    -fx-pref-width: 30;
+.jfx-badge .badge-pane .text {
+    -fx-fill: white;
 }
 
-.jfx-badge .badge-pane .label {
+.jfx-badge .badge-pane {
     -fx-font-weight: bold;
     -fx-font-size: 0.692em;
-    -fx-text-fill: -bs-rd-white;
+    -fx-text-fill: -bs-background-color;
 }
 
 .jfx-badge {
     -fx-padding: -3 0 0 0;
 }
 
+.jfx-badge.new .badge-pane {
+    -fx-pref-width: 30;
+}
+
 .jfx-toggle-button,
 .jfx-toggle-button:armed,
 .jfx-toggle-button:hover,
 .jfx-toggle-button:focused,
 .jfx-toggle-button:selected,
 .jfx-toggle-button:focused:selected {
-    -jfx-toggle-color: -bs-rd-green-dark;
+    -jfx-toggle-color: -bs-color-primary-dark;
     -jfx-size: 8;
 }
 
 .jfx-text-area {
-    -jfx-focus-color: -bs-rd-green;
-    -jfx-unfocus-color: -bs-rd-grey-line;
-    -fx-background-color: -bs-rd-white;
+    -jfx-focus-color: -bs-color-primary;
+    -jfx-unfocus-color: -bs-color-gray-line;
+    -fx-background-color: -bs-background-color;
     -fx-padding: 0.333333em 0.333333em 0.333333em 0.333333em;
 }
 
 .jfx-text-area:readonly {
     -fx-background-color: transparent;
+    -jfx-focus-color: transparent;
 }
 
 .jfx-text-area > .input-line {
@@ -465,7 +814,7 @@ bg color of non edit textFields: fafafa
 }
 
 .jfx-date-picker {
-    -jfx-default-color: -bs-rd-green;
+    -jfx-default-color: -bs-color-primary;
 }
 
 .jfx-date-picker .jfx-text-field {
@@ -492,7 +841,7 @@ bg color of non edit textFields: fafafa
 }
 
 .date-picker-popup .month-year-pane {
-    -fx-background-color: -bs-rd-green-dark;
+    -fx-background-color: -bs-color-primary-dark;
 }
 
 .scroll-bar {
@@ -515,25 +864,25 @@ bg color of non edit textFields: fafafa
 }
 
 .scroll-bar:horizontal .thumb {
-    -fx-background-color: -bs-rd-grey-background-darker;
+    -fx-background-color: -bs-color-gray-2;
     -fx-background-insets: 2 0 2 0;
     -fx-background-radius: 3;
 }
 
 .scroll-bar:vertical .thumb {
-    -fx-background-color: -bs-rd-grey-background-darker;
+    -fx-background-color: -bs-color-gray-2;
     -fx-background-insets: 0 2 0 2;
     -fx-background-radius: 3;
 }
 
 .scroll-bar:horizontal .thumb:hover,
 .scroll-bar:vertical .thumb:hover {
-    -fx-background-color: -bs-rd-grey-background-darker-2;
+    -fx-background-color: -bs-color-gray-6;
 }
 
 .scroll-bar:horizontal .thumb:pressed,
 .scroll-bar:vertical .thumb:pressed {
-    -fx-background-color: -bs-rd-grey-background-darkest;
+    -fx-background-color: -bs-color-gray-6;
 }
 
 .scroll-bar:vertical .increment-button,
@@ -554,11 +903,10 @@ bg color of non edit textFields: fafafa
 
 .scroll-bar:vertical:focused,
 .scroll-bar:horizontal:focused {
-    -fx-background-color: transparent, -bs-rd-grey-background-darkest, -bs-rd-grey-background-darkest;
+    -fx-background-color: transparent, -bs-color-gray-6, -bs-color-gray-6;
 }
 
 /* Behavior */
-
 .show-hand {
     -fx-cursor: hand;
 }
@@ -568,7 +916,6 @@ bg color of non edit textFields: fafafa
 }
 
 /* Font */
-
 .very-small-text {
     -fx-font-size: 0.692em;
 }
@@ -586,28 +933,28 @@ bg color of non edit textFields: fafafa
 }
 
 /* Splash */
-
 #splash {
-    -fx-background-color: -bs-rd-white;
+    -fx-background-color: -bs-background-color;
 }
 
 /* Main UI */
 #base-content-container {
-    -fx-background-color: -bs-bg-grey;
+    -fx-background-color: -bs-background-gray;
 }
 
 .content-pane {
-    -fx-background-color: linear-gradient(-bs-rd-grey-background 0%, -bs-rd-grey-background-bottom 100%);
+    -fx-background-color: linear-gradient(-bs-content-pane-bg-top 0%, -bs-content-pane-bg-bottom 100%);
 }
 
 #footer-pane {
-    -fx-background-color: -bs-bg-grey;
+    -fx-background-color: -bs-footer-pane-background;
     -fx-font-size: 0.923em;
-    -fx-text-fill: -bs-rd-font-dark;
+    -fx-text-fill: -bs-footer-pane-text;
 }
 
 #footer-pane-line {
-    -fx-background: -bs-bg-grey2;
+    -fx-border-color: -bs-footer-pane-line;
+    -fx-background-color: -bs-footer-pane-line;
 }
 
 #headline-label {
@@ -616,7 +963,6 @@ bg color of non edit textFields: fafafa
 }
 
 /* Main navigation */
-
 .top-navigation {
     -fx-background-color: -bs-rd-nav-background;
     -fx-border-width: 0 0 1 0;
@@ -626,7 +972,7 @@ bg color of non edit textFields: fafafa
 }
 
 .top-navigation .separator:vertical .line {
-    -fx-border-color: transparent transparent transparent -bs-rd-white-transparent;
+    -fx-border-color: transparent transparent transparent -bs-rd-nav-border-color;
     -fx-border-width: 1;
     -fx-border-insets: 0 0 0 1;
 }
@@ -643,9 +989,9 @@ bg color of non edit textFields: fafafa
 }
 
 .nav-price-balance {
-    -fx-background-color: -bs-rd-grey-background;
+    -fx-background-color: -bs-color-gray-background;
     -fx-background-radius: 3;
-    -fx-effect: innershadow(gaussian, -bs-rd-black-transparent, 3, 0, 0, 1);
+    -fx-effect: innershadow(gaussian, -bs-text-color-transparent, 3, 0, 0, 1);
     -fx-pref-height: 41;
     -fx-padding: 0 10 0 0;
 }
@@ -676,14 +1022,10 @@ bg color of non edit textFields: fafafa
     -fx-fill: -bs-rd-nav-deselected;
 }
 
-.nav-button-japanese .text {
-    -fx-font-size: 1em;
-}
-
 .nav-button:selected {
-    -fx-background-color: -bs-rd-white;
+    -fx-background-color: -bs-background-color;
     -fx-border-radius: 4;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent, 4, 0, 0, 0, 2);
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent, 4, 0, 0, 0, 2);
 }
 
 .nav-button:selected .text {
@@ -698,6 +1040,9 @@ bg color of non edit textFields: fafafa
 .nav-balance-label {
     -fx-font-size: 0.769em;
     -fx-alignment: center-left;
+}
+
+.nav-balance-label, .nav-balance-label > .text {
     -fx-text-fill: -bs-rd-font-balance-label;
 }
 
@@ -705,7 +1050,7 @@ bg color of non edit textFields: fafafa
     -fx-font-weight: bold;
     -fx-alignment: center;
     -fx-font-size: 0.846em;
-    -fx-text-fill: -bs-rd-white;
+    -fx-text-fill: -bs-background-color;
 }
 
 .text-field {
@@ -723,77 +1068,20 @@ bg color of non edit textFields: fafafa
 }
 
 /** Confirmation Indicator */
-
 .progress-indicator > .determinate-indicator > .indicator {
     -fx-background-color: -fx-control-inner-background;
     -fx-border-color: -fx-box-border;
     -fx-border-width: 1;
-    -fx-padding: 0.166667em; /* 2px */
-}
-
-/*******************************************************************************
- *                                                                             *
- * Icons                                                                       *
- *                                                                             *
- ******************************************************************************/
-
-.icon, icon:hover {
-    -fx-cursor: hand;
-}
-
-.hidden-icon-button {
-    -fx-background-color: transparent;
-    -fx-padding: 0;
-    -fx-cursor: hand;
-}
-
-#icon-button {
-    -fx-cursor: hand;
-    -fx-background-color: transparent;
-}
-
-.copy-icon-disputes {
-    -fx-text-fill: -bs-rd-white;
-}
-
-.copy-icon:hover {
-    -fx-text-fill: -bs-rd-black;
-}
-
-.received-funds-icon {
-    -fx-text-fill: -bs-green-soft;
-}
-
-.sent-funds-icon {
-    -fx-text-fill: -bs-red-soft;
-}
-
-.version {
-    -fx-text-fill: -bs-rd-black;
-    -fx-underline: false;
-    -fx-cursor: null;
-}
-
-.version-new {
-    -fx-text-fill: -bs-rd-error-red;
-    -fx-underline: true;
-    -fx-cursor: hand;
+    -fx-padding: 0.166667em;
+    /* 2px */
 }
 
-.opaque-icon {
-    -fx-fill: -bs-rd-grey-light;
-    -fx-opacity: 1;
-}
-
-.opaque-icon-character {
-    -fx-font-size: 3em;
-    -fx-text-fill: -bs-rd-grey-light;
-    -fx-padding: 24 2 0 2;
+.separated-phase-bar-active {
+    -fx-text-fill: -fx-accent;
 }
 
-.opaque-icon-character.small {
-    -fx-font-size: 1em;
-    -fx-padding: 27 2 0 2;
+.separated-phase-bar-inactive {
+    -fx-text-fill: black;
 }
 
 /*******************************************************************************
@@ -801,28 +1089,32 @@ bg color of non edit textFields: fafafa
  * Tooltip                                                                     *
  *                                                                             *
  ******************************************************************************/
-
 .tooltip {
-    -fx-background: -bs-rd-white;
-    -fx-text-fill: -bs-rd-black;
-    -fx-background-color: -bs-rd-white;
+    -fx-background: -bs-background-color;
+    -fx-text-fill: -bs-text-color;
+    -fx-background-color: -bs-background-color;
     -fx-background-radius: 6px;
     -fx-background-insets: 0;
-    -fx-padding: 0.667em 0.75em 0.667em 0.75em; /* 10px */
-    -fx-effect: dropshadow(three-pass-box, -bs-rd-black-transparent, 10, 0.0, 0, 3);
+    -fx-padding: 0.667em 0.75em 0.667em 0.75em;
+    /* 10px */
+    -fx-effect: dropshadow(three-pass-box, -bs-text-color-transparent, 10, 0, 0, 3);
     -fx-font-size: 0.85em;
 }
 
+.tooltip-hyperlink-icon {
+    -fx-text-fill: -bs-rd-font-lighter;
+}
+
 /* Same style like non editable textfield. But textfield spans a whole column in a grid, so we use generally
 textfield */
 #label-with-background {
-    -fx-background-color: -bs-bg-light;
+    -fx-background-color: -bs-color-gray-1;
     -fx-border-radius: 4;
     -fx-padding: 4 4 4 4;
 }
 
 #funds-confidence {
-    -fx-progress-color: -bs-dim-grey;
+    -fx-progress-color: -bs-color-gray-6;
     -fx-max-width: 20;
     -fx-max-height: 20;
 }
@@ -844,7 +1136,7 @@ textfield */
 }
 
 .hyperlink:hover {
-    -fx-text-fill: -bs-rd-black;
+    -fx-text-fill: -bs-text-color;
 }
 
 .hyperlink:hover,
@@ -855,702 +1147,755 @@ textfield */
 
 /*******************************************************************************
  *                                                                             *
- * Table                                                                       *
+ * Images                                                                      *
  *                                                                             *
  ******************************************************************************/
-
-.table-view .table-cell {
-    -fx-alignment: center-left;
-    -fx-padding: 2 0 2 0;
-    /*-fx-padding: 3 0 2 0;*/
+.qr-code {
+    -fx-cursor: hand;
 }
 
-.table-view .table-cell.last-column {
-    -fx-alignment: center-right;
-    -fx-padding: 2 10 2 0;
+/*******************************************************************************
+ *                                                                             *
+ * Textarea                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.text-area {
+    -fx-border-color: -bs-background-gray;
 }
 
-.table-view .table-cell.last-column.avatar-column {
-    -fx-alignment: center;
-    -fx-padding: 2 0 2 0;
+/*******************************************************************************
+ *                                                                             *
+ * Tab pane                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.jfx-tab-pane {
+    -fx-padding: 0;
+    -jfx-disable-animation: true;
 }
 
-.table-view .column-header.last-column {
-    -fx-padding: 0 10 0 0;
+.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button {
+    -fx-background-color: transparent;
+    -fx-pref-width: 20;
+    -fx-pref-height: 20;
+    -fx-min-width: -fx-pref-width;
+    -fx-max-width: -fx-pref-width;
+    -fx-min-height: -fx-pref-height;
+    -fx-max-height: -fx-pref-height;
 }
 
-.table-view .column-header.last-column .label {
-    -fx-alignment: center-right;
+.jfx-tab-pane .tab-content-area {
+    -fx-background-color: -bs-tab-content-area;
 }
 
-.table-view .column-header.last-column.avatar-column {
-    -fx-padding: 0;
+.jfx-tab-pane .viewport {
+    -fx-background-color: -bs-viewport-background;
 }
 
-.table-view .column-header.last-column.avatar-column .label {
-    -fx-alignment: center;
+.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button .jfx-rippler {
+    -jfx-rippler-fill: -fx-accent;
 }
 
-.table-view .table-cell.first-column {
-    -fx-padding: 2 0 2 10;
+.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button > .jfx-svg-glyph {
+    -fx-shape: "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z";
+    -jfx-size: 9;
+    -fx-background-color: -bs-rd-font-light;
 }
 
-.table-view .column-header.first-column {
-    -fx-padding: 0 0 0 10;
+.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button {
+    -fx-padding: 0 0 2 0;
 }
 
-.number-column.table-cell {
-    -fx-font-size: 1em;
-    -fx-padding: 0 0 0 0;
+.jfx-tab-pane .headers-region .tab:selected .tab-container .tab-close-button > .jfx-svg-glyph {
+    -fx-background-color: -fx-accent;
 }
 
-.table-view .filler {
-    -fx-background-color: -bs-rd-grey-very-light;
+.jfx-tab-pane .tab-header-background {
+    -fx-background-color: -bs-color-gray-background;
+    -fx-border-width: 0 0 1 0;
+    -fx-border-color: -bs-rd-tab-border;
 }
 
-.table-view {
-    -fx-control-inner-background-alt: -fx-control-inner-background;
+.jfx-tab-pane .headers-region .tab-selected-line {
+    -fx-background-color: -fx-accent;
+    -fx-pref-height: 1;
 }
 
-.table-view .column-header .label {
-    -fx-alignment: center-left;
+.jfx-tab-pane .headers-region .tab .tab-container .tab-label {
+    -fx-text-fill: -bs-rd-font-light;
+    -fx-padding: 14;
+    -fx-font-size: 0.769em;
     -fx-font-weight: normal;
-    -fx-font-size: 0.923em;
-    -fx-padding: 0;
 }
 
-.table-view .column-header {
-    -fx-background-color: -bs-rd-grey-very-light;
+.jfx-tab-pane .depth-container {
+    -fx-effect: none;
+}
+
+.jfx-tab-pane .headers-region .tab:selected .tab-container .tab-label {
+    -fx-text-fill: -fx-accent;
+}
+
+.jfx-tab-pane .headers-region > .tab > .jfx-rippler {
+    -jfx-rippler-fill: -fx-accent;
+}
+
+.jfx-tab-pane .headers-region .tab:closable {
+    -fx-border-color: transparent;
+    -fx-border-width: 0;
+    -fx-border-style: none;
+    -fx-border-insets: 0;
+    -fx-padding: 9;
+}
+
+.jfx-tab-pane .headers-region .tab:closable .tab-container .tab-label {
+    -fx-padding: 5;
+}
+
+#form-header-text {
+    -fx-font-weight: bold;
+    -fx-font-size: 1.077em;
+}
+
+#form-title {
+    -fx-font-weight: bold;
+}
+
+/* scroll-pane */
+.scroll-pane {
+    -fx-background-insets: 0;
     -fx-padding: 0;
+    -fx-background-color: -bs-scroll-pane-background;
 }
 
-.table-view .focus {
-    -fx-alignment: center-left;
+.scroll-pane:focused {
+    -fx-background-insets: 0;
 }
 
-.table-view .text {
-    -fx-fill: -bs-rd-black;
+.scroll-pane .corner {
+    -fx-background-insets: 0;
 }
 
-/* horizontal scrollbars are never needed and are flickering at scaling so lets turn them off */
-.table-view > .scroll-bar:horizontal {
-    -fx-opacity: 0;
+/* validation */
+.validation-error {
+    -fx-text-fill: -bs-red;
 }
 
-.table-view:focused {
-    -fx-background-color: -fx-box-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-padding: 1;
+/*******************************************************************************
+ *                                                                             *
+ * Grid pane                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.grid-pane {
+    -fx-background-color: -bs-background-gray;
+    -fx-background-radius: 5;
+    -fx-effect: null;
+    -fx-effect: dropshadow(gaussian, -bs-color-gray-10, 10, 0, 0, 0);
+    -fx-background-insets: 10;
 }
 
-.table-view:focused .table-row-cell:focused {
-    -fx-background-color: -fx-table-cell-border-color, -fx-background;
-    -fx-background-insets: 0, 0 0 1 0;
+#address-text-field {
+    -fx-cursor: hand;
+    -fx-text-fill: -fx-accent;
+    -fx-prompt-text-fill: -bs-text-color;
 }
 
-.offer-table .table-row-cell {
-    -fx-border-color: -bs-rd-white;
-    -fx-table-cell-border-color: -bs-rd-white;
+#address-text-field:hover {
+    -fx-text-fill: -bs-text-color;
 }
 
-.table-row-cell {
-    -fx-border-width: 0 0 1 0;
-    -fx-border-color: -bs-very-light-grey;
-    -fx-table-cell-border-color: -bs-rd-white;
+/*
+ * Copyright (c) 2008, 2013 Oracle and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * This file is available and licensed under the following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Oracle Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/* ====== CANDLE STICK CHART =========================================================== */
+.chart-horizontal-grid-lines, .chart-vertical-grid-lines {
+    -fx-stroke: -bs-color-gray-1;
+}
+
+.chart-horizontal-zero-line, .chart-vertical-zero-line {
+    -fx-stroke: -bs-color-gray-2;
+}
+
+.candlestick-tooltip-label {
+    -fx-font-size: 0.75em;
+    -fx-font-weight: bold;
+    -fx-text-fill: #666666;
+    -fx-padding: 2 5 2 0;
 }
 
-.table-row-cell:selected {
-    -fx-border-width: 0 0 1 0;
-    -fx-table-cell-border-color: transparent;
+.candlestick-average-line {
+    -fx-stroke: -bs-candle-stick-average-line;
+    -fx-stroke-width: 1px;
 }
 
-.table-row-cell:empty {
-    -fx-border-width: 0;
-    -fx-background-color: -bs-rd-white;
-    -fx-table-cell-border-color: transparent;
+.candlestick-line {
+    -stick-line-fill: -bs-sell;
+    -fx-stroke: -stick-line-fill;
+    -fx-stroke-width: 1px;
 }
 
-.table-view .table-row-cell:selected .table-row-cell:row-selection .table-row-cell:cell-selection .text {
-    -fx-fill: -bs-rd-black;
+.candlestick-line.close-above-open {
+    -stick-line-fill: -bs-candle-stick-won;
 }
 
-.table-view .table-row-cell:selected .button .text {
-    -fx-fill: -bs-rd-black;
+.candlestick-line.open-above-close {
+    -stick-line-fill: -bs-candle-stick-loss;
 }
 
-.table-view .table-row-cell .copy-icon .text,
-.table-view .table-row-cell .copy-icon .text:hover {
-    -fx-fill: -fx-accent;
+.candlestick-bar {
+    -fx-padding: 5;
+    -demo-bar-fill: -bs-sell;
+    -fx-background-color: -demo-bar-fill;
+    -fx-background-insets: 0;
 }
 
-.table-view .table-row-cell:selected .copy-icon .text {
-    -fx-fill: -bs-rd-black;
+.candlestick-bar.close-above-open {
+    -demo-bar-fill: -bs-candle-stick-won;
 }
 
-.table-view .table-row-cell:selected .copy-icon .text:hover {
-    -fx-fill: -bs-rd-black;
+.candlestick-bar.open-above-close {
+    -demo-bar-fill: -bs-candle-stick-loss;
 }
 
-.table-view .table-row-cell:selected .hyperlink .text {
-    -fx-fill: -bs-rd-black;
-    -fx-border-style: none;
-    -fx-border-width: 0px;
+.candlestick-bar.empty {
+    -demo-bar-fill: #cccccc;
 }
 
-.table-view .table-row-cell .hyperlink .text {
-    -fx-fill: -bs-rd-font-dark;
-    -fx-border-style: none;
-    -fx-border-width: 0px;
+.volume-bar {
+    -fx-padding: 5;
+    -fx-background-color: -bs-volume-transparent;
+    -fx-background-insets: 0;
 }
 
-.table-view .table-row-cell .hyperlink .text:hover,
-.table-view .table-row-cell:selected .hyperlink .text:hover {
-    -fx-fill: -bs-rd-black;
-    -fx-border-style: none;
-    -fx-border-width: 0px;
+.chart-alternative-row-fill {
+    -fx-fill: transparent;
+    -fx-stroke: transparent;
+    -fx-stroke-width: 0;
 }
 
-.table-view .table-row-cell .hyperlink:hover,
-.table-view .table-row-cell .hyperlink:visited,
-.table-view .table-row-cell .hyperlink:hover:visited {
-    -fx-underline: false;
-    -fx-border-style: none;
-    -fx-border-width: 0px;
+.chart-plot-background {
+    -fx-background-color: -bs-background-color;
 }
 
-.table-view .table-row-cell .hyperlink:focused {
-    -fx-border-style: none;
-    -fx-border-width: 0px;
+/* splash screen */
+/*noinspection CssUnknownTarget*/
+#image-splash-logo {
+    -fx-image: url('/images/logo_splash.png?1565598211');
 }
 
-.table-view.large-rows .table-row-cell {
-    -fx-cell-size: 47px;
+/* shared*/
+#image-info {
+    -fx-image: url('/images/info.png?1565598211');
 }
 
-/*******************************************************************************
- *                                                                             *
- * Icons                                                                       *
- *                                                                             *
- ******************************************************************************/
+#light_close {
+    -fx-image: url('/images/light_close.png?1565598211');
+}
 
-#non-clickable-icon {
-    -fx-text-fill: -bs-medium-grey;
+#image-alert-round {
+    -fx-image: url('/images/alert_round.png?1565598211');
 }
 
-.delete-icon {
-    -fx-fill: -bs-red;
+#image-green_circle {
+    -fx-image: url('/images/green_circle.png?1565598211');
 }
 
-.delete {
-    -fx-text-fill: -bs-rd-error-red;
-    -fx-fill: -bs-rd-error-red;
+#image-blue_circle {
+    -fx-image: url('/images/blue_circle.png?1565598211');
 }
 
-.delete:hover {
-    -fx-text-fill: -bs-rd-black;
-    -fx-fill: -bs-rd-black;
+#image-remove {
+    -fx-image: url('/images/remove.png?1565598211');
 }
 
-/*******************************************************************************
- *                                                                             *
- * Images                                                                      *
- *                                                                             *
- ******************************************************************************/
+#image-buy-white {
+    -fx-image: url('/images/buy_white.png?1565598211');
+}
 
-.qr-code {
-    -fx-cursor: hand;
+#image-buy-green {
+    -fx-image: url('/images/buy_green.png?1565598211');
 }
 
-/*******************************************************************************
- *                                                                             *
- * Textarea                                                                    *
- *                                                                             *
- ******************************************************************************/
+#image-sell-white {
+    -fx-image: url('/images/sell_white.png?1565598211');
+}
 
-.text-area {
-    -fx-border-color: -bs-bg-grey;
+#image-sell-red {
+    -fx-image: url('/images/sell_red.png?1565598211');
 }
 
-/*******************************************************************************
- *                                                                             *
- * Tab pane                                                                    *
- *                                                                             *
- ******************************************************************************/
+#image-expand {
+    -fx-image: url('/images/expand.png?1565598211');
+}
+
+#image-collapse {
+    -fx-image: url('/images/collapse.png?1565598211');
+}
+
+/* navigation buttons */
+#image-nav-market {
+    -fx-image: url('/images/nav/market.png');
+}
+
+#image-nav-market-active {
+    -fx-image: url('/images/nav/market_active.png');
+}
+
+#image-nav-buyoffer {
+    -fx-image: url('/images/nav/buyoffer.png');
+}
+
+#image-nav-buyoffer-active {
+    -fx-image: url('/images/nav/buyoffer_active.png');
+}
+
+#image-nav-selloffer {
+    -fx-image: url('/images/nav/selloffer.png');
+}
+
+#image-nav-selloffer-active {
+    -fx-image: url('/images/nav/selloffer_active.png');
+}
+
+#image-nav-portfolio {
+    -fx-image: url('/images/nav/portfolio.png');
+}
+
+#image-nav-portfolio-active {
+    -fx-image: url('/images/nav/portfolio_active.png');
+}
+
+#image-nav-funds {
+    -fx-image: url('/images/nav/funds.png');
+}
+
+#image-nav-funds-active {
+    -fx-image: url('/images/nav/funds_active.png');
+}
+
+#image-nav-disputes {
+    -fx-image: url('/images/nav/disputes.png');
+}
 
-.jfx-tab-pane {
-    -fx-padding: 0;
-    -jfx-disable-animation: true;
+#image-nav-disputes-active {
+    -fx-image: url('/images/nav/disputes_active.png');
 }
 
-.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button {
-    -fx-background-color: transparent;
-    -fx-pref-width: 20;
-    -fx-pref-height: 20;
-    -fx-min-width: -fx-pref-width;
-    -fx-max-width: -fx-pref-width;
-    -fx-min-height: -fx-pref-height;
-    -fx-max-height: -fx-pref-height;
+#image-nav-settings {
+    -fx-image: url('/images/nav/settings.png');
 }
 
-.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button .jfx-rippler {
-    -jfx-rippler-fill: -fx-accent;
+#image-nav-settings-active {
+    -fx-image: url('/images/nav/settings_active.png');
 }
 
-.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button > .jfx-svg-glyph {
-    -fx-shape: "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z";
-    -jfx-size: 9;
-    -fx-background-color: -bs-rd-font-light;
+#image-nav-account {
+    -fx-image: url('/images/nav/account.png');
 }
 
-.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button {
-    -fx-padding: 0 0 2 0;
+#image-nav-account-active {
+    -fx-image: url('/images/nav/account_active.png');
 }
 
-.jfx-tab-pane .headers-region .tab:selected .tab-container .tab-close-button > .jfx-svg-glyph {
-    -fx-background-color: -fx-accent;
+#image-nav-dao {
+    -fx-image: url('/images/nav/dao.png');
 }
 
-.jfx-tab-pane .tab-header-background {
-    -fx-background-color: -bs-rd-grey-background;
-    -fx-border-width: 0 0 1 0;
-    -fx-border-color: -bs-rd-tab-border;
+#image-nav-dao-active {
+    -fx-image: url('/images/nav/dao_active.png');
 }
 
-.jfx-tab-pane .headers-region .tab-selected-line {
-    -fx-background-color: -fx-accent;
-    -fx-pref-height: 1;
+/* account*/
+#image-tick {
+    -fx-image: url('/images/tick.png?1565598211');
 }
 
-.jfx-tab-pane .headers-region .tab .tab-container .tab-label {
-    -fx-text-fill: -bs-rd-font-light;
-    -fx-padding: 14;
-    -fx-font-size: 0.769em;
-    -fx-font-weight: normal;
+#image-arrow-blue {
+    -fx-image: url('/images/arrow_blue.png?1565598211');
 }
 
-.jfx-tab-pane .depth-container {
-    -fx-effect: none;
+#image-arrow-grey {
+    -fx-image: url('/images/arrow_grey.png?1565598211');
 }
 
-.jfx-tab-pane .headers-region .tab:selected .tab-container .tab-label {
-    -fx-text-fill: -fx-accent;
+/* connection state*/
+#image-connection-tor {
+    -fx-image: url('/images/connection/tor.png?1565598211');
 }
 
-.jfx-tab-pane .headers-region > .tab > .jfx-rippler {
-    -jfx-rippler-fill: -fx-accent;
+#image-connection-direct {
+    -fx-image: url('/images/connection/direct.png?1565598211');
 }
 
-.jfx-tab-pane .headers-region .tab:closable {
-    -fx-border-color: transparent;
-    -fx-border-width: 0;
-    -fx-border-style: none;
-    -fx-border-insets: 0;
-    -fx-padding: 9;
+#image-connection-nat {
+    -fx-image: url('/images/connection/nat.png?1565598211');
 }
 
-.jfx-tab-pane .headers-region .tab:closable .tab-container .tab-label {
-    -fx-padding: 5;
+#image-connection-relay {
+    -fx-image: url('/images/connection/relay.png?1565598211');
 }
 
-#form-header-text {
-    -fx-font-weight: bold;
-    -fx-font-size: 1.077em;
+#image-connection-synced {
+    -fx-image: url('/images/connection/synced.png?1565598211');
 }
 
-#form-title {
-    -fx-font-weight: bold;
+/* software update*/
+#image-update-in-progress {
+    -fx-image: url('/images/update/update_in_progress.png?1565598211');
 }
 
-/* scroll-pane */
+#image-update-up-to-date {
+    -fx-image: url('/images/update/update_up_to_date.png?1565598211');
+}
 
-.scroll-pane {
-    -fx-background-insets: 0;
-    -fx-padding: 0;
+#image-update-available {
+    -fx-image: url('/images/update/update_available.png?1565598211');
 }
 
-.scroll-pane:focused {
-    -fx-background-insets: 0;
+#image-update-failed {
+    -fx-image: url('/images/update/update_failed.png?1565598211');
 }
 
-.scroll-pane .corner {
-    -fx-background-insets: 0;
+/* offer state */
+#image-offer_state_unknown {
+    -fx-image: url('/images/offer/offer_state_unknown.png?1565598211');
 }
 
-/* validation */
-.validation-error {
-    -fx-text-fill: -bs-red;
+#image-offer_state_available {
+    -fx-image: url('/images/offer/offer_state_available.png?1565598211');
 }
 
-/* Account */
+#image-offer_state_not_available {
+    -fx-image: url('/images/offer/offer_state_not_available.png?1565598211');
+}
 
-#content-pane-top {
-    -fx-background-color: -bs-light-grey2,
-    linear-gradient(-bs-light-grey2 0%, -bs-light-grey3 100%),
-    linear-gradient(-bs-bg-grey3 0%, -bs-bg-grey 100%);
-    -fx-background-insets: 0 0 0 0, 0, 1;
+#image-attachment {
+    -fx-image: url('/images/attachment.png?1565598211');
 }
 
-#info-icon-label {
-    -fx-font-size: 1.231em;
-    -fx-text-fill: -bs-very-dark-grey3;
+#bubble_arrow_grey_left {
+    -fx-image: url('/images/bubble_arrow_grey_left.png?1565598211');
 }
 
-/* OfferPayload book */
-#num-offers {
-    -fx-font-size: 0.923em;
+#bubble_arrow_blue_left {
+    -fx-image: url('/images/bubble_arrow_blue_left.png?1565598211');
 }
 
-/* Create offer */
-#direction-icon-label {
-    -fx-font-weight: bold;
-    -fx-font-size: 1.231em;
-    -fx-text-fill: -bs-grey;
+#bubble_arrow_grey_right {
+    -fx-image: url('/images/bubble_arrow_grey_right.png?1565598211');
 }
 
-#input-description-label {
-    -fx-font-size: 0.846em;
-    -fx-alignment: center-left;
+#bubble_arrow_blue_right {
+    -fx-image: url('/images/bubble_arrow_blue_right.png?1565598211');
 }
 
-#create-offer-calc-label {
-    -fx-font-weight: bold;
-    -fx-font-size: 1.538em;
-    -fx-padding: 15 5 0 5;
+#link {
+    -fx-image: url('/images/link.png?1565598211');
 }
 
-#toggle-price-left {
-    -fx-border-radius: 4 0 0 4;
-    -fx-padding: 4 4 4 4;
-    -fx-border-color: -bs-medium-grey;
-    -fx-border-style: solid none solid solid;
-    -fx-border-insets: 0 -2 0 0;
-    -fx-background-insets: 0 -2 0 0;
-    -fx-background-radius: 4 0 0 4;
+#invert {
+    -fx-image: url('/images/invert.png?1565598211');
 }
 
-#toggle-price-right {
-    -fx-border-radius: 0 4 4 0;
-    -fx-padding: 4 4 4 4;
-    -fx-border-color: -bs-medium-grey;
-    -fx-border-style: solid solid solid none;
-    -fx-border-insets: 0 0 0 -2;
-    -fx-background-insets: 0 0 0 -2;
-    -fx-background-radius: 0 4 4 0;
+#avatar_1 {
+    -fx-image: url('/images/avatars/avatar_1.png?1565598211');
 }
 
-#totals-separator {
-    -fx-background: -bs-medium-grey;
+#avatar_2 {
+    -fx-image: url('/images/avatars/avatar_2.png?1565598211');
 }
 
-#payment-info {
-    -fx-background-color: -bs-content-bg-grey;
+#avatar_3 {
+    -fx-image: url('/images/avatars/avatar_3.png?1565598211');
 }
 
-.toggle-button-active {
-    -fx-background-color: -bs-blue-transparent;
+#avatar_4 {
+    -fx-image: url('/images/avatars/avatar_4.png?1565598211');
 }
 
-.toggle-button-inactive {
-    -fx-background-color: -bs-very-light-grey;
+#avatar_5 {
+    -fx-image: url('/images/avatars/avatar_5.png?1565598211');
 }
 
-#trade-fee-textfield {
-    -fx-font-size: 0.9em;
-    -fx-alignment: center-right;
+#avatar_6 {
+    -fx-image: url('/images/avatars/avatar_6.png?1565598211');
 }
 
-/* Open Offer */
-.offer-disabled .label {
-    -fx-text-fill: -bs-light-grey;
+#avatar_7 {
+    -fx-image: url('/images/avatars/avatar_7.png?1565598211');
 }
 
-/* OfferBook */
+#avatar_8 {
+    -fx-image: url('/images/avatars/avatar_8.png?1565598211');
+}
 
-.table-title {
-    -fx-font-size: 1.077em;
-    -fx-font-family: "IBM Plex Sans Medium";
-    -fx-alignment: center-left;
+#avatar_9 {
+    -fx-image: url('/images/avatars/avatar_9.png?1565598211');
 }
 
-.currency-label-small {
-    -fx-font-size: 0.692em;
-    -fx-text-fill: -bs-rd-font-lighter;
-    -fx-alignment: center;
-    -fx-pref-height: 35px;
-    -fx-pref-width: 45px;
+#avatar_10 {
+    -fx-image: url('/images/avatars/avatar_10.png?1565598211');
 }
 
-.offer-label-small {
-    -fx-font-size: 0.692em;
-    -fx-alignment: center-right;
-    -fx-text-fill: -bs-rd-black;
+#avatar_11 {
+    -fx-image: url('/images/avatars/avatar_11.png?1565598211');
 }
 
-.currency-label-selected {
-    -fx-text-fill: -bs-rd-black;
-    -fx-font-family: "IBM Plex Sans Medium";
+#avatar_12 {
+    -fx-image: url('/images/avatars/avatar_12.png?1565598211');
 }
 
-.currency-label {
-    -fx-font-size: 1.077em;
-    -fx-text-fill: -bs-rd-font-dark-grey;
-    -fx-alignment: center-left;
-    -fx-pref-height: 35px;
+#avatar_13 {
+    -fx-image: url('/images/avatars/avatar_13.png?1565598211');
 }
 
-/* Offer */
+#avatar_14 {
+    -fx-image: url('/images/avatars/avatar_14.png?1565598211');
+}
 
-.percentage-label {
-    -fx-alignment: center;
+#avatar_15 {
+    -fx-image: url('/images/avatars/avatar_15.png?1565598211');
 }
 
-.offer-separator {
-    -fx-background: -bs-grey;
+#poloniex {
+    -fx-image: url('/images/poloniex.png?1565598211');
 }
 
-#address-text-field {
-    -fx-cursor: hand;
-    -fx-text-fill: -fx-accent;
-    -fx-prompt-text-fill: -bs-rd-black;
+#btcaverage {
+    -fx-image: url('/images/btcaverage.png?1565598211');
 }
 
-#address-text-field:hover {
-    -fx-text-fill: -bs-rd-black;
+#accepted {
+    -fx-image: url('/images/accepted.png?1565598211');
 }
 
-/* Account setup */
-#wizard-item-background-deactivated {
-    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, -bs-very-light-grey);
-    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, -bs-light-grey);
-    -fx-background-color: -fx-shadow-highlight-color,
-    -fx-outer-border,
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
+#rejected {
+    -fx-image: url('/images/rejected.png?1565598211');
 }
 
-#wizard-item-background-active {
-    -fx-body-color: linear-gradient(to bottom, -bs-bg-grey5, -bs-bg-grey6);
-    -fx-outer-border: linear-gradient(to bottom, -bs-bg-blue1, -bs-bg-blue2);
-    -fx-background-color: -fx-shadow-highlight-color,
-    -fx-outer-border,
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
+#dao-screenshot-governance {
+    -fx-image: url("dao-screenshot-governance.png");
 }
 
-#wizard-item-background-completed {
-    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, -bs-very-light-grey);
-    -fx-outer-border: linear-gradient(to bottom, -bs-bg-green, -bs-bg-green2);
-    -fx-background-color: -fx-shadow-highlight-color,
-    -fx-outer-border,
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
+#dao-screenshot-trading {
+    -fx-image: url("dao-screenshot-trading.png");
 }
 
-/* Account settings */
+#dao-screenshot-cheaper-fees {
+    -fx-image: url("dao-screenshot-cheaper-fees.png");
+}
 
-#account-settings-item-background-disabled {
-    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, -bs-very-light-grey);
-    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, -bs-light-grey);
-    -fx-background-color: -fx-shadow-highlight-color,
-    -fx-outer-border,
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
+/********************************************************************************************************************
+ *                                                                                                                  *
+ * DAO                                                                                                              *
+ *                                                                                                                  *
+ ********************************************************************************************************************/
+.dao-tx-type-trade-fee-icon,
+.dao-tx-type-trade-fee-icon:hover {
+    -fx-text-fill: -bs-color-green-2;
 }
 
-#account-settings-item-background-active {
-    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, -bs-very-light-grey);
-    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, -bs-light-grey);
-    -fx-background-color: -fx-shadow-highlight-color,
-    -fx-outer-border,
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
+.dao-tx-type-unverified-icon,
+.dao-tx-type-unverified-icon:hover {
+    -fx-text-fill: -bs-yellow;
 }
 
-#account-settings-item-background-selected {
-    -fx-body-color: linear-gradient(to bottom, -bs-bg-grey5, -bs-bg-grey6);
-    -fx-outer-border: linear-gradient(to bottom, -bs-bg-blue1, -bs-bg-blue2);
-    -fx-background-color: -fx-shadow-highlight-color,
-    -fx-outer-border,
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
+.dao-tx-type-invalid-icon,
+.dao-tx-type-invalid-icon:hover {
+    -fx-text-fill: -bs-red-soft;
 }
 
-/* Pending trayes */
+.dao-tx-type-self-icon,
+.dao-tx-type-self-icon:hover {
+    -fx-text-fill: -bs-color-gray-2;
+}
 
-#trade-wizard-item-background-disabled {
-    -fx-text-fill: -bs-rd-font-light;
+.dao-tx-type-proposal-fee-icon,
+.dao-tx-type-proposal-fee-icon:hover {
+    -fx-text-fill: -bs-color-green-4;
 }
 
-#trade-wizard-item-background-active {
-    -fx-text-fill: -bs-rd-black;
-    -fx-font-family: "IBM Plex Sans Medium";
+.dao-tx-type-genesis-icon,
+.dao-tx-type-genesis-icon:hover {
+    -fx-text-fill: -fx-accent;
 }
 
-.trade-step-label {
-    -fx-text-fill: -bs-rd-white;
+.dao-tx-type-received-funds-icon,
+.dao-tx-type-received-funds-icon:hover {
+    -fx-text-fill: -bs-green-soft;
 }
 
-.trade-step-disabled-bg {
-    -fx-fill: -bs-rd-grey-background-darker-2;
+.dao-tx-type-sent-funds-icon,
+.dao-tx-type-sent-funds-icon:hover {
+    -fx-text-fill: -bs-red-soft;
 }
 
-.trade-step-active-bg {
-    -fx-fill: -bs-rd-green-dark;
+.dao-tx-type-vote-icon,
+.dao-tx-type-vote-icon:hover {
+    -fx-text-fill: -bs-color-blue-5;
 }
 
-#open-support-button {
-    -fx-font-weight: bold;
-    -fx-font-size: 1.077em;
-    -fx-background-color: -bs-warning;
+.dao-tx-type-vote-reveal-icon,
+.dao-tx-type-vote-reveal-icon:hover {
+    -fx-text-fill: -bs-color-blue-4;
 }
 
-#open-dispute-button {
-    -fx-font-weight: bold;
-    -fx-text-fill: -bs-rd-white;
-    -fx-font-size: 1.077em;
-    -fx-background-color: -bs-rd-error-red;
+.dao-tx-type-issuance-icon,
+.dao-tx-type-issuance-icon:hover {
+    -fx-text-fill: -bs-color-green-3;
 }
 
-/* TitledGroupBg */
+.dao-tx-type-lockup-icon,
+.dao-tx-type-lockup-icon:hover {
+    -fx-text-fill: -bs-color-blue-5;
+}
 
-.titled-group-bg-label, .titled-group-bg-label-active {
-    -fx-font-size: 1.077em;
-    -fx-font-family: "IBM Plex Sans Medium";
-    -fx-text-fill: -bs-rd-black;
-    -fx-background-color: transparent;
+.dao-tx-type-unlock-icon,
+.dao-tx-type-unlock-icon:hover {
+    -fx-text-fill: -bs-color-green-3;
 }
 
-.titled-group-bg, .titled-group-bg-active {
-    -fx-body-color: -bs-rd-grey-background;
-    -fx-border-color: -bs-rd-separator;
-    -fx-border-width: 0 0 1 0;
-    -fx-background-color: transparent;
-    -fx-background-insets: 0;
+.dao-accepted-icon {
+    -fx-text-fill: -bs-color-primary;
 }
 
-.titled-group-bg.last, .titled-group-bg-active.last {
-    -fx-border-width: 0;
+.dao-rejected-icon {
+    -fx-text-fill: -bs-rd-error-red;
 }
 
-/* TableGroupHeadline */
-#table-group-headline {
-    -fx-background-color: -bs-content-bg-grey;
-    -fx-background-insets: 10 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
+.dao-ignored-icon {
+    -fx-text-fill: -bs-color-gray-4;
 }
 
-/* copied form modena.css text-input */
-#flow-pane-checkboxes-bg {
-    -fx-text-fill: -fx-text-inner-color;
-    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
-    -fx-highlight-text-fill: -fx-text-inner-color;
-    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 3, 2;
-    -fx-padding: 0.333333em 0.583em 0.333333em 0.583em; /* 4 7 4 7 */
+.compensation-root {
+    -fx-background-insets: 0, 0 0 0 0;
+}
+
+.info-icon {
+    -fx-text-fill: -fx-accent;
+}
+
+.info-icon-button {
+    -fx-cursor: hand;
+    -fx-background-color: transparent;
+}
+
+.dao-remove-proposal-icon {
+    -fx-text-fill: -fx-accent;
 }
 
-#flow-pane-checkboxes-non-editable-bg {
-    -fx-text-fill: -fx-text-inner-color;
-    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
-    -fx-highlight-text-fill: -fx-text-inner-color;
-    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -bs-very-light-grey);
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 3, 2;
-    -fx-padding: 0.333333em 0.583em 0.333333em 0.583em; /* 4 7 4 7 */
+.dao-news-titled-group .titled-group-bg-label-active {
+    -fx-font-size: 0.923em;
 }
 
-/* message-list-view*/
-#message-list-view.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
-    -fx-background-color: -bs-rd-white;
+.dao-news-teaser {
+    -fx-font-size: 1.538em;
+    -fx-font-family: "IBM Plex Sans Light";
 }
 
-#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell {
-    -fx-background-color: -bs-rd-white;
+.dao-news-section-header {
+    -fx-font-size: 1.923em;
+    -fx-text-fill: -bs-rd-green-dark;
+    -fx-font-family: "IBM Plex Sans Light";
 }
 
-#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled {
-    -fx-background-color: -bs-rd-white;
+.dao-news-section-content, .dao-news-content, .dao-news-section-link {
+    -fx-font-size: 0.923em;
 }
 
-#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
-    -fx-background-color: -bs-rd-white;
+.dao-news-section-content {
+    -fx-text-fill: -bs-rd-black;
 }
 
-#message-list-view.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell {
-    -fx-background-color: -bs-rd-white;
+.dao-news-content, .dao-news-section-link, .dao-news-section-link .hyperlink, .dao-launch-version {
+    -fx-text-fill: -bs-rd-font-light;
+    -fx-fill: -bs-rd-font-light;
 }
 
-#message-list-view.list-cell {
-    -fx-padding: 0.25em 0.583em 0.25em 0.583em;
+.dao-news-link {
+    -fx-text-fill: -fx-accent;
+    -fx-padding: 16 0 0 0;
 }
 
-#message-list-view.list-view {
-    -fx-background-color: -fx-box-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-padding: 1;
+.dao-news-link .hyperlink {
+    -fx-fill: -fx-accent;
 }
 
-#message-list-view.list-view:focused {
-    -fx-background-color: -fx-box-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-padding: 1;
+.dao-launch-version {
+    -fx-font-size: 1.077em;
 }
 
-/* bubble */
-#message-bubble-green {
-    -fx-background-color: -bs-rd-green;
-    -fx-background-radius: 10 10 10 10;
+.dao-launch-headline {
+    -fx-font-size: 2.154em;
+    -fx-text-fill: -bs-rd-font-dark-grey;
+    -fx-font-family: "IBM Plex Sans Light";
 }
 
-#message-bubble-blue {
-    -fx-background-color: -bs-rd-message-bubble;
-    -fx-background-radius: 10 10 10 10;
+.dao-launch-description {
+    -fx-font-size: 1.538em;
+    -fx-text-fill: -bs-rd-font-dark-grey;
+    -fx-font-family: "IBM Plex Sans Light";
 }
 
-#message-bubble-grey {
-    -fx-background-color: -bs-light-grey;
-    -fx-background-radius: 10 10 10 10;
+.dao-launch-paging-button {
+    -fx-text-fill: -bs-rd-font-light;
+    -fx-fill: -bs-rd-font-light;
 }
 
-.attachment-icon {
-    -fx-text-fill: -bs-rd-white;
-    -fx-cursor: hand;
+.dao-launch-tab-box {
+    -fx-border-style: solid;
+    -fx-border-width: 1 0 0 0;
+    -fx-border-color: -bs-rd-tab-border;
 }
 
-.attachment-icon-black {
-    -fx-text-fill: -bs-rd-black;
+.slider-section-button {
     -fx-cursor: hand;
+    -fx-background-color: transparent;
+    -fx-translate-y: -1;
+    -fx-padding: 11;
 }
 
-/*******************************************************************************
- *                                                                             *
- * Grid pane                                                                   *
- *                                                                             *
- ******************************************************************************/
+.slider-section-button .text {
+    -fx-font-size: 0.923em;
+    -fx-fill: -bs-rd-font-dark-grey;
+    -fx-font-family: "IBM Plex Sans Light";
+}
 
-.grid-pane {
-    -fx-background-color: -bs-content-bg-grey;
-    -fx-background-radius: 5;
-    -fx-effect: null;
-    -fx-effect: dropshadow(gaussian, -bs-dark-grey, 10, 0, 0, 0);
-    -fx-background-insets: 10;
+.slider-section-button:selected {
+    -fx-border-style: solid;
+    -fx-border-width: 1 0 0 0;
+    -fx-border-color: -bs-rd-green;
+}
+
+.slider-section-button:selected .text {
+    -fx-fill: -bs-rd-green;
 }
 
 /********************************************************************************************************************
@@ -1558,38 +1903,33 @@ textfield */
  * Market overview                                                                                                  *
  *                                                                                                                  *
  ********************************************************************************************************************/
-
-.chart-pane {
-    -fx-background-color: -bs-rd-white;
-}
-
-#charts .chart-legend, #charts-dao .chart-legend {
+#charts .chart-legend {
     -fx-font-size: 1.077em;
     -fx-alignment: center;
 }
 
-#charts .axis, #price-chart .axis, #volume-chart .axis, #charts-dao .axis {
+#charts .axis, #price-chart .axis, #volume-chart .axis {
     -fx-tick-label-fill: -bs-rd-font-lighter;
     -fx-tick-label-font-size: 0.769em;
 }
 
-#charts .chart-plot-background, #charts-dao .chart-plot-background {
-    -fx-background-color: -bs-rd-white;
+#charts .chart-plot-background {
+    -fx-background-color: -bs-background-color;
 }
 
 #charts .default-color0.chart-area-symbol {
-    -fx-background-color: -bs-sell, -bs-rd-white;
+    -fx-background-color: -bs-sell, -bs-background-color;
 }
 
-#charts .default-color1.chart-area-symbol, #charts-dao .default-color0.chart-area-symbol {
-    -fx-background-color: -bs-buy, -bs-rd-white;
+#charts .default-color1.chart-area-symbol {
+    -fx-background-color: -bs-buy, -bs-background-color;
 }
 
 #charts .default-color0.chart-series-area-line {
     -fx-stroke: -bs-sell;
 }
 
-#charts .default-color1.chart-series-area-line, #charts-dao .default-color0.chart-series-area-line {
+#charts .default-color1.chart-series-area-line {
     -fx-stroke: -bs-buy;
 }
 
@@ -1597,7 +1937,7 @@ textfield */
     -fx-fill: -bs-sell-transparent;
 }
 
-#charts .default-color1.chart-series-area-fill, #charts-dao .default-color0.chart-series-area-fill {
+#charts .default-color1.chart-series-area-fill {
     -fx-fill: -bs-buy-transparent;
 }
 
@@ -1605,21 +1945,21 @@ textfield */
     -fx-font-size: 0.769em;
     -fx-alignment: center-left;
 }
+
 /********************************************************************************************************************
  *                                                                                                                  *
  * Highlight buttons                                                                                                  *
  *                                                                                                                  *
  ********************************************************************************************************************/
-
 #buy-button-big {
     -fx-font-size: 1em;
     -fx-background-color: -bs-buy;
-    -fx-text-fill: -bs-rd-white;
+    -fx-text-fill: white;
 }
 
 #buy-button {
     -fx-background-color: -bs-buy;
-    -fx-text-fill: -bs-rd-white;
+    -fx-text-fill: white;
 }
 
 #buy-button-big:hover, #buy-button:hover,
@@ -1629,13 +1969,13 @@ textfield */
 
 #sell-button-big {
     -fx-background-color: -bs-sell;
-    -fx-text-fill: -bs-rd-white;
+    -fx-text-fill: white;
     -fx-font-size: 1em;
 }
 
 #sell-button {
     -fx-background-color: -bs-sell;
-    -fx-text-fill: -bs-rd-white;
+    -fx-text-fill: white;
 }
 
 #sell-button-big:hover, #sell-button:hover,
@@ -1645,381 +1985,454 @@ textfield */
 
 #sell-button-big.grey-style, #buy-button-big.grey-style,
 #sell-button.grey-style, #buy-button.grey-style {
-    -fx-background-color: -bs-rd-grey-light;
-    -fx-text-fill: -bs-rd-font-dark-grey;
+    -fx-background-color: -bs-color-gray-2;
+    -fx-text-fill: -bs-rd-font-dark-gray;
 }
 
 .action-button:disabled, #sell-button:disabled, #buy-button:disabled {
-    -fx-background-color: -bs-rd-grey-very-light;
-    -fx-text-fill: -bs-rd-font-dark-grey;
+    -fx-background-color: -bs-color-gray-0;
+    -fx-text-fill: -bs-rd-font-dark-gray;
 }
 
-/********************************************************************************************************************
- *                                                                                                                  *
- * Popups                                                                                                           *
- *                                                                                                                  *
- ********************************************************************************************************************/
+#price-feed-combo {
+    -fx-background-color: none;
+}
 
-.popup-headline {
-    -fx-font-size: 1.538em;
-    -fx-text-fill: -bs-rd-font-dark;
+#price-feed-combo > .list-cell {
+    -fx-text-fill: -bs-text-color;
+    -fx-font-family: "IBM Plex Sans";
 }
 
-.popup-headline-information {
-    -fx-font-size: 1.538em;
-    -fx-text-fill: -bs-rd-green;
+#invert-market-price {
+    -fx-text-fill: -bs-color-gray-11;
 }
 
-.popup-headline-warning {
-    -fx-font-size: 1.538em;
-    -fx-text-fill: -bs-rd-error-red;
+#popup-qr-code-info {
+    -fx-font-size: 0.846em;
 }
 
-.popup-icon-information {
-    -fx-text-fill: -bs-rd-green;
+#ident-num-label {
+    -fx-font-weight: bold;
+    -fx-alignment: center;
+    -fx-font-size: 0.769em;
+    -fx-text-fill: -bs-background-color;
 }
 
-.popup-icon-warning {
-    -fx-text-fill: -bs-rd-error-red;
+#toggle-left {
+    -fx-border-radius: 4 0 0 4;
+    -fx-border-color: -bs-rd-separator-dark;
+    -fx-border-style: solid;
+    -fx-border-width: 0 1 0 0;
+    -fx-background-radius: 4 0 0 4;
+    -fx-background-color: -bs-background-color;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent, 4, 0, 0, 0, 2);
 }
 
-.popup-bg, .notification-popup-bg, .peer-info-popup-bg {
-    -fx-font-size: 1.077em;
-    -fx-text-fill: -bs-rd-font-dark;
-    -fx-background-color: -bs-rd-white;
+#toggle-center {
+    -fx-border-radius: 0;
+    -fx-border-color: -bs-rd-separator-dark;
+    -fx-border-style: solid;
+    -fx-border-width: 0 1 0 0;
+    -fx-border-insets: 0;
+    -fx-background-insets: 0;
     -fx-background-radius: 0;
-    -fx-background-insets: 44;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent-dark, 44, 0, 0, 0);
+    -fx-background-color: -bs-background-color;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent, 4, 0, 0, 0, 2);
 }
 
-.popup-bg-top {
-    -fx-font-size: 1.077em;
-    -fx-text-fill: -bs-rd-font-dark;
-    -fx-background-color: -bs-rd-white;
-    -fx-background-radius: 0;
-    -fx-background-insets: 44;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent-dark, 44, 0, 0, 0);
+#toggle-center:selected, #toggle-left:selected, #toggle-right:selected {
+    -fx-text-fill: -bs-background-color;
+    -fx-background-color: -bs-toggle-selected;
 }
 
-.notification-popup-headline, peer-info-popup-headline {
-    -fx-font-size: 1.077em;
-    /*-fx-font-weight: bold;*/
-    -fx-text-fill: -bs-rd-green;
+#toggle-right {
+    -fx-border-radius: 0 4 4 0;
+    -fx-border-width: 0;
+    -fx-background-radius: 0 4 4 0;
+    -fx-background-color: -bs-background-color;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-transparent, 4, 0, 0, 0, 2);
 }
 
-.notification-popup-bg {
-    -fx-font-size: 0.846em;
-    -fx-background-insets: 44;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent-dark, 44, 0, -1, 3);
+#toggle-left:hover, #toggle-right:hover, #toggle-center:hover {
+    -fx-background-color: -bs-toggle-selected;
 }
 
-.peer-info-popup-bg {
-    -fx-font-size: 0.846em;
-    -fx-background-insets: 44;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent-dark, 44, 0, -1, 3);
+/* Account */
+#content-pane-top {
+    -fx-background-color: -bs-color-gray-2, linear-gradient(-bs-color-gray-2 0%, -bs-color-gray-3 100%), linear-gradient(-bs-color-gray-2 0%, -bs-background-gray 100%);
+    -fx-background-insets: 0 0 0 0, 0, 1;
 }
 
-#price-feed-combo {
-    -fx-background-color: none;
+#info-icon-label {
+    -fx-font-size: 1.231em;
+    -fx-text-fill: -bs-color-gray-10;
 }
 
-#price-feed-combo > .list-cell {
-    -fx-text-fill: -bs-rd-black;
-    -fx-font-family: "IBM Plex Sans";
+/* OfferPayload book */
+#num-offers {
+    -fx-font-size: 0.923em;
 }
 
-#invert-market-price {
-    -fx-text-fill: -bs-very-dark-grey2;
+/* Create offer */
+#direction-icon-label {
+    -fx-font-weight: bold;
+    -fx-font-size: 1.231em;
+    -fx-text-fill: -bs-color-gray-6;
 }
 
-#popup-qr-code-info {
+#input-description-label {
     -fx-font-size: 0.846em;
+    -fx-alignment: center-left;
 }
 
-#ident-num-label {
+#create-offer-calc-label {
     -fx-font-weight: bold;
-    -fx-alignment: center;
-    -fx-font-size: 0.769em;
-    -fx-text-fill: -bs-rd-white;
+    -fx-font-size: 1.538em;
+    -fx-padding: 15 5 0 5;
 }
 
-#toggle-left {
+#toggle-price-left {
     -fx-border-radius: 4 0 0 4;
-    -fx-border-color: -bs-rd-separator-dark;
-    -fx-border-style: solid;
-    -fx-border-width: 0 1 0 0;
+    -fx-padding: 4 4 4 4;
+    -fx-border-color: -bs-color-gray-4;
+    -fx-border-style: solid none solid solid;
+    -fx-border-insets: 0 -2 0 0;
+    -fx-background-insets: 0 -2 0 0;
     -fx-background-radius: 4 0 0 4;
-    -fx-background-color: -bs-rd-white;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent, 4, 0, 0, 0, 2);
 }
 
-#toggle-center {
-    -fx-border-radius: 0;
-    -fx-border-color: -bs-rd-separator-dark;
-    -fx-border-style: solid;
-    -fx-border-width: 0 1 0 0;
-    -fx-border-insets: 0;
-    -fx-background-insets: 0;
-    -fx-background-radius: 0;
-    -fx-background-color: -bs-rd-white;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent, 4, 0, 0, 0, 2);
+#toggle-price-right {
+    -fx-border-radius: 0 4 4 0;
+    -fx-padding: 4 4 4 4;
+    -fx-border-color: -bs-color-gray-4;
+    -fx-border-style: solid solid solid none;
+    -fx-border-insets: 0 0 0 -2;
+    -fx-background-insets: 0 0 0 -2;
+    -fx-background-radius: 0 4 4 0;
+}
+
+#totals-separator {
+    -fx-background: -bs-color-gray-4;
+}
+
+#payment-info {
+    -fx-background-color: -bs-color-gray-1;
+}
+
+.toggle-button-active {
+    -fx-background-color: -bs-blue-transparent;
+}
+
+.toggle-button-inactive {
+    -fx-background-color: -bs-color-gray-1;
+}
+
+#trade-fee-textfield {
+    -fx-font-size: 0.9em;
+    -fx-alignment: center-right;
+}
+
+/* Open Offer */
+.offer-disabled .label {
+    -fx-text-fill: -bs-color-gray-3;
+}
+
+/* OfferBook */
+.table-title {
+    -fx-font-size: 1.077em;
+    -fx-font-family: "IBM Plex Sans Medium";
+    -fx-alignment: center-left;
 }
 
-#toggle-center:selected, #toggle-left:selected, #toggle-right:selected {
-    -fx-text-fill: -bs-rd-white;
-    -fx-background-color: -bs-toggle-selected;
+.currency-label-small {
+    -fx-font-size: 0.692em;
+    -fx-text-fill: -bs-rd-font-lighter;
+    -fx-alignment: center;
+    -fx-pref-height: 35px;
+    -fx-pref-width: 45px;
 }
 
-#toggle-right {
-    -fx-border-radius: 0 4 4 0;
-    -fx-border-width: 0;
-    -fx-background-radius: 0 4 4 0;
-    -fx-background-color: -bs-rd-white;
-    -fx-effect: dropshadow(gaussian, -bs-rd-black-transparent, 4, 0, 0, 0, 2);
+.offer-label-small {
+    -fx-font-size: 0.692em;
+    -fx-alignment: center-right;
+    -fx-text-fill: -bs-text-color;
 }
 
-#toggle-left:hover, #toggle-right:hover, #toggle-center:hover {
-    -fx-background-color: -bs-toggle-selected;
+.currency-label-selected {
+    -fx-text-fill: -bs-text-color;
+    -fx-font-family: "IBM Plex Sans Medium";
 }
 
-/********************************************************************************************************************
- *                                                                                                                  *
- * Arbitration                                                                                                      *
- *                                                                                                                  *
- ********************************************************************************************************************/
-
-.message {
-    -fx-text-fill: -bs-rd-black;
+.currency-label {
+    -fx-font-size: 1.077em;
+    -fx-text-fill: -bs-rd-font-dark-gray;
+    -fx-alignment: center-left;
+    -fx-pref-height: 35px;
 }
 
-.my-message {
-    -fx-text-fill: -bs-rd-white;
+/* Offer */
+.offer-separator {
+    -fx-background: -bs-color-gray-6;
 }
 
-.message-header {
-    -fx-text-fill: -bs-light-grey;
-    -fx-font-size: 0.846em;
+/* Account setup */
+#wizard-item-background-deactivated {
+    -fx-body-color: linear-gradient(to bottom, -bs-color-gray-1, -bs-color-gray-1);
+    -fx-outer-border: linear-gradient(to bottom, -bs-background-gray, -bs-color-gray-3);
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-.my-message-header {
-    -fx-text-fill: -bs-rd-message-bubble;
-    -fx-fill: -bs-rd-message-bubble;
-    -fx-font-size: 0.846em;
+#wizard-item-background-active {
+    -fx-body-color: linear-gradient(to bottom, -bs-color-gray-0, -bs-color-gray-1);
+    -fx-outer-border: linear-gradient(to bottom, -bs-color-blue-1, -bs-color-blue-2);
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-/********************************************************************************************************************
- *                                                                                                                  *
- * DAO                                                                                                              *
- *                                                                                                                  *
- ********************************************************************************************************************/
-
-.dao-tx-type-trade-fee-icon,
-.dao-tx-type-trade-fee-icon:hover {
-    -fx-text-fill: #689f43;
+#wizard-item-background-completed {
+    -fx-body-color: linear-gradient(to bottom, -bs-color-gray-1, -bs-color-gray-1);
+    -fx-outer-border: linear-gradient(to bottom, -bs-bg-green, -bs-color-green-2);
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-.dao-tx-type-unverified-icon,
-.dao-tx-type-unverified-icon:hover {
-    -fx-text-fill: #ffac00;
+/* Account settings */
+#account-settings-item-background-disabled {
+    -fx-body-color: linear-gradient(to bottom, -bs-color-gray-1, -bs-color-gray-1);
+    -fx-outer-border: linear-gradient(to bottom, -bs-background-gray, -bs-color-gray-3);
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-.dao-tx-type-invalid-icon,
-.dao-tx-type-invalid-icon:hover {
-    -fx-text-fill: #ff4500;
+#account-settings-item-background-active {
+    -fx-body-color: linear-gradient(to bottom, -bs-color-gray-1, -bs-color-gray-1);
+    -fx-outer-border: linear-gradient(to bottom, -bs-background-gray, -bs-color-gray-3);
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-.dao-tx-type-self-icon,
-.dao-tx-type-self-icon:hover {
-    -fx-text-fill: #818181;
+#account-settings-item-background-selected {
+    -fx-body-color: linear-gradient(to bottom, -bs-color-gray-0, -bs-color-gray-1);
+    -fx-outer-border: linear-gradient(to bottom, -bs-color-blue-1, -bs-color-blue-2);
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-.dao-tx-type-proposal-fee-icon,
-.dao-tx-type-proposal-fee-icon:hover {
-    -fx-text-fill: #6c8b3b;
+/* Pending trades */
+#trade-wizard-item-background-disabled {
+    -fx-text-fill: -bs-rd-font-light;
 }
 
-.dao-tx-type-genesis-icon,
-.dao-tx-type-genesis-icon:hover {
-    -fx-text-fill: -fx-accent;
+#trade-wizard-item-background-active {
+    -fx-text-fill: -bs-text-color;
+    -fx-font-family: "IBM Plex Sans Medium";
 }
 
-.dao-tx-type-received-funds-icon,
-.dao-tx-type-received-funds-icon:hover {
-    -fx-text-fill: -bs-green-soft;
+.trade-step-label {
+    -fx-text-fill: -bs-background-color;
 }
 
-.dao-tx-type-sent-funds-icon,
-.dao-tx-type-sent-funds-icon:hover {
-    -fx-text-fill: -bs-red-soft;
+.trade-step-disabled-bg {
+    -fx-fill: -bs-color-gray-6;
 }
 
-.dao-tx-type-vote-icon,
-.dao-tx-type-vote-icon:hover {
-    -fx-text-fill: #0a4576;
+.trade-step-active-bg {
+    -fx-fill: -bs-color-primary-dark;
 }
 
-.dao-tx-type-vote-reveal-icon,
-.dao-tx-type-vote-reveal-icon:hover {
-    -fx-text-fill: #4AC5FF;
+.trade-msg-state-undefined {
+    -fx-text-fill: -bs-yellow;
 }
 
-.dao-tx-type-issuance-icon,
-.dao-tx-type-issuance-icon:hover {
-    -fx-text-fill: #04a908;
+.trade-msg-state-sent {
+    -fx-text-fill: -bs-yellow-light;
 }
 
-.dao-tx-type-lockup-icon,
-.dao-tx-type-lockup-icon:hover {
-    -fx-text-fill: #203e7f;
+.trade-msg-state-arrived {
+    -fx-text-fill: -bs-turquoise;
 }
 
-.dao-tx-type-unlock-icon,
-.dao-tx-type-unlock-icon:hover {
-    -fx-text-fill: #438e6c;
+.trade-msg-state-stored {
+    -fx-text-fill: -bs-color-blue-4;
 }
 
-.dao-accepted-icon {
-    -fx-text-fill: -bs-rd-green;
+.trade-msg-state-acknowledged {
+    -fx-text-fill: -bs-color-primary;
 }
 
-.dao-rejected-icon {
+.trade-msg-state-failed {
     -fx-text-fill: -bs-rd-error-red;
 }
 
-.dao-ignored-icon {
-    -fx-text-fill: -bs-medium-grey;
-}
-
-.compensation-root {
-    -fx-background-insets: 0, 0 0 0 0
+#open-support-button {
+    -fx-font-weight: bold;
+    -fx-font-size: 1.077em;
+    -fx-background-color: -bs-warning;
 }
 
-.info-icon {
-    -fx-text-fill: -fx-accent;
+#open-dispute-button {
+    -fx-font-weight: bold;
+    -fx-text-fill: -bs-background-color;
+    -fx-font-size: 1.077em;
+    -fx-background-color: -bs-rd-error-red;
 }
 
-.info-icon-button {
-    -fx-cursor: hand;
+/* TitledGroupBg */
+.titled-group-bg-label, .titled-group-bg-label-active {
+    -fx-font-size: 1.077em;
+    -fx-font-family: "IBM Plex Sans Medium";
+    -fx-text-fill: -bs-text-color;
     -fx-background-color: transparent;
 }
 
-.dao-remove-proposal-icon {
-    -fx-text-fill: -fx-accent;
+.titled-group-bg, .titled-group-bg-active {
+    -fx-body-color: -bs-color-gray-background;
+    -fx-border-color: -bs-rd-separator;
+    -fx-border-width: 0 0 1 0;
+    -fx-background-color: transparent;
+    -fx-background-insets: 0;
 }
 
-.dao-news-titled-group .titled-group-bg-label-active {
-    -fx-font-size: 0.923em;
+.titled-group-bg.last, .titled-group-bg-active.last {
+    -fx-border-width: 0;
 }
 
-.dao-news-teaser {
-    -fx-font-size: 1.538em;
-    -fx-font-family: "IBM Plex Sans Light";
+/* TableGroupHeadline */
+#table-group-headline {
+    -fx-background-color: -bs-color-gray-1;
+    -fx-background-insets: 10 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-.dao-news-section-header {
-    -fx-font-size: 1.923em;
-    -fx-text-fill: -bs-rd-green-dark;
-    -fx-font-family: "IBM Plex Sans Light";
+/* copied form modena.css text-input */
+#flow-pane-checkboxes-bg {
+    -fx-text-fill: -fx-text-inner-color;
+    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
+    -fx-highlight-text-fill: -fx-text-inner-color;
+    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
+    -fx-background-insets: 0, 1;
+    -fx-background-radius: 3, 2;
+    -fx-padding: 0.333333em 0.583em 0.333333em 0.583em;
+    /* 4 7 4 7 */
 }
 
-.dao-news-section-content, .dao-news-content, .dao-news-section-link {
-    -fx-font-size: 0.923em;
+#flow-pane-checkboxes-non-editable-bg {
+    -fx-text-fill: -fx-text-inner-color;
+    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
+    -fx-highlight-text-fill: -fx-text-inner-color;
+    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -bs-color-gray-1);
+    -fx-background-insets: 0, 1;
+    -fx-background-radius: 3, 2;
+    -fx-padding: 0.333333em 0.583em 0.333333em 0.583em;
+    /* 4 7 4 7 */
 }
 
-.dao-news-section-content {
-    -fx-text-fill: -bs-rd-black;
+/* message-list-view*/
+#message-list-view.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
+    -fx-background-color: -bs-background-color;
 }
 
-.dao-news-content, .dao-news-section-link, .dao-news-section-link .hyperlink, .dao-launch-version {
-    -fx-text-fill: -bs-rd-font-light;
-    -fx-fill: -bs-rd-font-light;
+#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-background-color: -bs-background-color;
 }
 
-.dao-news-link {
-    -fx-text-fill: -fx-accent;
-    -fx-padding: 16 0 0 0;
+#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled {
+    -fx-background-color: -bs-background-color;
 }
 
-.dao-news-link .hyperlink {
-    -fx-fill: -fx-accent;
+#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
+    -fx-background-color: -bs-background-color;
 }
 
-.dao-inSync {
-    -fx-text-fill: -bs-rd-green;
+#message-list-view.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-background-color: -bs-background-color;
 }
 
-.dao-inConflict {
-    -fx-text-fill: -bs-rd-error-red;
+#message-list-view.list-cell {
+    -fx-padding: 0.25em 0.583em 0.25em 0.583em;
 }
 
-.dao-kpi-big {
-    -fx-font-size: 1.923em;
-    -fx-text-fill: -bs-rd-black;
-    -fx-font-family: "IBM Plex Sans Light";
+#message-list-view.list-view {
+    -fx-background-color: -fx-box-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+    -fx-padding: 1;
 }
 
-.dao-kpi-subtext {
-    -fx-text-fill: -bs-rd-font-light;
-    -fx-font-size: 0.923em;
+#message-list-view.list-view:focused {
+    -fx-background-color: -fx-box-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+    -fx-padding: 1;
 }
 
-.dao-launch-version {
-    -fx-font-size: 1.077em;
+/* bubble */
+#message-bubble-green {
+    -fx-background-color: -bs-color-primary;
+    -fx-background-radius: 10 10 10 10;
 }
 
-.dao-launch-headline {
-    -fx-font-size: 2.154em;
-    -fx-text-fill: -bs-rd-font-dark-grey;
-    -fx-font-family: "IBM Plex Sans Light";
+#message-bubble-blue {
+    -fx-background-color: -bs-rd-message-bubble;
+    -fx-background-radius: 10 10 10 10;
 }
 
-.dao-launch-description {
-    -fx-font-size: 1.538em;
-    -fx-text-fill: -bs-rd-font-dark-grey;
-    -fx-font-family: "IBM Plex Sans Light";
+#message-bubble-grey {
+    -fx-background-color: -bs-color-gray-3;
+    -fx-background-radius: 10 10 10 10;
 }
 
-.dao-launch-paging-button {
-    -fx-text-fill: -bs-rd-font-light;
-    -fx-fill: -bs-rd-font-light;
+.attachment-icon {
+    -fx-text-fill: -bs-background-color;
+    -fx-cursor: hand;
 }
 
-.dao-launch-tab-box {
-    -fx-border-style: solid;
-    -fx-border-width: 1 0 0 0;
-    -fx-border-color: -bs-rd-tab-border;
+.attachment-icon-black {
+    -fx-text-fill: -bs-text-color;
+    -fx-cursor: hand;
 }
 
-.slider-section-button {
-    -fx-cursor: hand;
-    -fx-background-color: transparent;
-    -fx-translate-y: -1;
-    -fx-padding: 11;
+/********************************************************************************************************************
+ *                                                                                                                  *
+ * Arbitration                                                                                                      *
+ *                                                                                                                  *
+ ********************************************************************************************************************/
+.message {
+    -fx-text-fill: -bs-text-color;
 }
 
-.slider-section-button .text {
-    -fx-font-size: 0.923em;
-    -fx-fill: -bs-rd-font-dark-grey;
-    -fx-font-family: "IBM Plex Sans Light";
+.my-message {
+    -fx-text-fill: -bs-background-color;
 }
 
-.slider-section-button:selected {
-    -fx-border-style: solid;
-    -fx-border-width: 1 0 0 0;
-    -fx-border-color: -bs-rd-green;
+.message-header {
+    -fx-text-fill: -bs-color-gray-3;
+    -fx-font-size: 0.846em;
 }
 
-.slider-section-button:selected .text {
-    -fx-fill: -bs-rd-green;
+.my-message-header {
+    -fx-text-fill: -bs-rd-message-bubble;
+    -fx-fill: -bs-rd-message-bubble;
+    -fx-font-size: 0.846em;
 }
 
 /********************************************************************************************************************
  *                                                                                                                  *
- * Notifications                                                                                                              *
+ * Notifications                                                                                                    *
  *                                                                                                                  *
  ********************************************************************************************************************/
-
 #notification-erase-button {
-    -fx-background-color: -bs-soft-red;
-    -fx-text-fill: -bs-rd-white;
+    -fx-background-color: -bs-red-soft;
+    -fx-text-fill: -bs-background-color;
+}
+
+.status-icon {
+    -fx-text-fill: -fx-faint-focus-color;
 }
diff --git a/desktop/src/main/java/bisq/desktop/colors-dark.css b/desktop/src/main/java/bisq/desktop/colors-dark.css
index 2343de27590..b5ef02d7ffc 100644
--- a/desktop/src/main/java/bisq/desktop/colors-dark.css
+++ b/desktop/src/main/java/bisq/desktop/colors-dark.css
@@ -1,137 +1,96 @@
 .root {
-    -bs-very-dark-grey3: #BBB; /* 3 usages */
-    -bs-grey: #999999; /* 8 usages */
-    -bs-medium-grey: #555555; /* 8 usages */
-    -bs-bg-grey: #222222; /* 25 usages */
-    -bs-bg-grey2: #444; /* 1 usages */
-    -bs-bg-grey3: #2c2c2c; /* 1 usages */
-    -bs-light-grey: #333333; /* derive(-bs-rd-white, -20%); 13 usages */
-    -bs-content-bg-grey: #0b0b0b; /* 14 usages */
-    -bs-very-light-grey: #070707; /* 10 usages */
-    -bs-bg-light: #050505; /* derive(-bs-rd-white, -2%) 4 usages */
-    -bs-very-light-grey: #0F0F0F; /* derive(-bs-rd-white, -6%) 10 usages */
-    -bs-very-dark-grey: #c3c3c3; /* 8 usages */
-    -bs-very-dark-grey2: #EEE; /* 1 usages */
-    -bs-black-transparent: rgba(255, 255, 255, 0.5); /* 1 usages */
-    -bs-light-grey2: #303030; /* 2 usages */
-    -bs-light-grey3: #4a4a4a; /* 1 usages */
-    -bs-font-dark: #CCC; /* 11 usages */
-    -bs-bg-grey7: #1f1f1f; /* 2 usages */
-    -bs-bg-grey9: #030303; /* 1 usages */
-    -bs-bg-grey10: #1a1a1a; /* 1 usages */
-    -bs-bg-grey11: #0e0e0e; /* 1 usages */
-    -bs-dark-grey: #AAA; /* 8 usages */
-    -bs-dim-grey: #969696; /* 1 usages */
-    -bs-very-dark-grey3: #CCCFFF; /* 3 usages */
-
-    -bs-soft-red: #11999b; /* 1 usages */
-    -bs-pink: #007679; /* 2 usages */
-    -bs-orange: #0075d4; /* 2 usages */
-    -bs-orange2: #2296ff; /* 1 usages */
-    -bs-yellow: #0049f0; /* 2 usages */
-    -bs-yellow-light: derive(-bs-yellow, 81%);
-    -bs-bg-grey8: #1E161E; /* 1 usages */
-    -bs-bg-green2: #9E679A; /* 2 usages */
-    -bs-bg-green: #664563; /* 4 usages */
-    -bs-turquoise: #d35350; /* 1 usages */
-    -bs-bg-grey5: #0e0908; /* 4 usages */
-    -bs-bg-grey6: #180a06; /* 3 usages */
-    -bs-bg-blue2: #955b49; /* 3 usages */
-    -bs-bg-blue1: #4a1e10; /* 3 usages */
-    -bs-bg-blue4: #a85336; /* 1 usages */
-    -bs-bg-blue3: #644236; /* 1 usages */
-    -fx-faint-focus-color: #0f87c322; /* 5 usages */
-    -bs-blue-transparent: #0f87c344;
-    -bs-blue: blue; /* 1 usages */
-
-    /* Redesign colors */
-    -bs-rd-green: #25B135; /* 6 usages */
-    -bs-rd-green-dark: #3EA34A;
-    -bs-rd-nav-selected: #25B135;
-    -bs-rd-nav-deselected: rgba(0, 0, 0, 0.59);
-    -bs-rd-nav-background: #2EA33C;
-    -bs-rd-nav-primary-background: #25B135;
-    -bs-rd-nav-primary-border: #E761D8;
-    -bs-rd-grey: #C8C8C8;
-    -fx-accent: -bs-rd-green; /* 18 usages */
-
-    /* Redesign colors */
-    -bs-rd-green: #25B135; /* 6 usages */
-    -bs-rd-green-dark: #3EA34A;
-    -bs-rd-nav-selected: #25B135;
-    -bs-rd-nav-deselected: rgba(255, 255, 255, 0.59);
-    -bs-rd-nav-background: #2EA33C;
-    -bs-rd-nav-primary-background: #25B135;
-    -bs-rd-nav-primary-border: #189E27;
-    -bs-rd-grey: #373737;
-    -fx-accent: -bs-rd-green; /* 18 usages */
-
-    /* TODO: refactor all colors to use derive from base colors, to enable easy re-coloring */
-    -bs-rd-white: #000000; /* 30 usages */
-    -bs-rd-white-transparent: rgba(0, 0, 0, 0.31);
-    -bs-rd-grey-light: #272727;
-    -bs-rd-grey-medium-light: #161616;
-    -bs-rd-grey-very-light: #070707; /* 10 usages */
-    -bs-rd-grey-background: #0D0D0D;
-    -bs-rd-grey-background-bottom: #090909; /* 1 usages */
-    -bs-rd-grey-background-dark: #222222;
-    -bs-rd-grey-background-darker: #2F2F2F;
-    -bs-rd-grey-background-darker-2: #656565;
-    -bs-rd-grey-background-darkest: #BBBBBB;
-    -bs-rd-grey-darker: #1E1E1E;
-    -bs-rd-font-lighter: #585858;
-    -bs-rd-font-light: #727272;
-    -bs-rd-font-dark: #B4B4B4;
-    -bs-rd-font-balance: #B0B0B0;
-    -bs-rd-font-balance-label: #717171;
-    -bs-rd-font-dark-grey: #c3c3c3;
-    -bs-rd-font-confirmation-label: -bs-rd-grey-background-darker-2;
-    -bs-rd-nav-border: #ACACAC;
-    -bs-rd-tab-border: #1D1F1F;
-    -bs-rd-nav-background-dark: #F1F1F1;
-    -bs-rd-black: #FFFFFF; /* 13 usages */
-    -bs-rd-black-transparent-dark: rgba(255, 255, 255, 0.54);
-    -bs-rd-black-transparent: rgba(255, 255, 255, 0.2);
-    -bs-rd-grey-line: #686868;
-    -bs-rd-separator: #242424;
-    -bs-rd-separator-dark: #2A1F29;
-    -bs-rd-error-red: #22ffff; /* 5 usages */
-    -bs-rd-message-bubble: #FF7939;
-    -bs-toggle-selected: #848484;
-
-    -bs-red: #28CFCF; /* 5 usages */
-    -fx-box-border: -bs-rd-grey-medium-light;
-
-    -bs-green-soft: derive(-bs-rd-green, 60%); /* 2 usages */
-    -bs-red-soft: derive(-bs-rd-error-red, 60%); /* 2 usages */
-
-    -bs-warning: -bs-orange; /* 1 usages */
-
-    -bs-buy: -bs-rd-green-dark; /* 12 usages */
-    -bs-buy-focus: derive(-bs-buy, -50%); /* 2 usages */
-    -bs-buy-hover: derive(-bs-buy, -10%); /* 2 usages */
-    -bs-buy-transparent: rgba(193, 92, 181, 0.3); /* 1 usages */
-
-    -bs-sell: -bs-red; /* 11 usages */
-    -bs-sell-focus: derive(-bs-sell, -50%); /* 2 usages */
-    -bs-sell-hover: derive(-bs-sell, -10%); /* 2 usages */
-    -bs-sell-transparent: rgba(40, 207, 207, 0.3); /* 1 usages */
-
-    -bs-volume-transparent: rgba(218, 78, 202, 0.3);
-    -bs-candle-stick-average-line: -bs-rd-green;
-    -bs-candle-stick-loss: #01CFFE;
-    -bs-candle-stick-won: #DF4DDE;
-
-    -bs-cancel: -bs-bg-grey; /* 5 usages */
-    -bs-cancel-focus: derive(-bs-cancel, -50%); /* 1 usages */
-    -bs-cancel-hover: derive(-bs-cancel, -10%); /* 1 usages */
-
-    -fx-default-button: derive(-fx-accent, 95%);
-    -fx-focus-color: -fx-accent;
-    -fx-selection-bar: #1e0a1c;
-
+    -bs-green-soft: white;
+    -bs-bg-green: #98b999;
+    -bs-color-green-1: #c4d9c5;
+    -bs-color-green-2: #98b999;
+    -bs-color-green-3: #619864;
+    -bs-color-green-4: #15bc1d;
+    -bs-color-green-5: #2a7e2e;
+    -bs-color-blue-1: #b4e1ee;
+    -bs-color-blue-2: #69a3b5;
+    -bs-color-blue-3: #56adc8;
+    -bs-color-blue-4: #1f8cad;
+    -bs-color-blue-5: #0b4c60;
+    -bs-turquoise: #2cadaf;
+    -bs-blue: #1f8cad;
+    -bs-blue-transparent: rgba(11, 76, 96, 0.27);
+    -bs-yellow: #ffb70f;
+    -bs-yellow-light: #f9d686;
+    -bs-red: #d83431;
+    -bs-red-soft: white;
+    -bs-color-primary: #25b136;
+    -bs-color-primary-dark: #2ea33c;
+    -bs-text-color: #afaeb0;
+    -bs-background-color: #2e2e31;
+    -bs-background-gray: #1d1d21;
+    -bs-color-gray: #373737;
+    -bs-color-gray-11: #f2f2f2;
+    -bs-color-gray-10: #cfcecf;
+    -bs-color-gray-6: #afaeb0;
+    -bs-color-gray-4: #929293;
+    -bs-color-gray-3: #7b7b7c;
+    -bs-color-gray-2: #504f52;
+    -bs-color-gray-1: #2e2e31;
+    -bs-color-gray-0: #1d1d21;
+    -bs-rd-nav-selected: #25b136;
+    -bs-rd-nav-deselected: rgba(46, 46, 49, 0.59);
+    -bs-rd-nav-background: #2ea33c;
+    -bs-rd-nav-primary-background: #25b136;
+    -bs-rd-nav-primary-border: #44a750;
+    -bs-rd-nav-border: #2e2e31;
+    -bs-rd-nav-border-color: rgba(46, 46, 49, 0.31);
+    -bs-rd-tab-border: #cfcecf;
+    -bs-tab-content-area: #cfcecf;
+    -bs-color-gray-background: #2e2e31;
+    -bs-content-pane-bg-top: #1d1d21;
+    -bs-content-pane-bg-bottom: #2e2e31;
+    -bs-scroll-pane-background: transparent;
+    -bs-tab-content-area: transparent;
+    -bs-viewport-background: transparent;
+    -bs-footer-pane-background: #2e2e31;
+    -bs-footer-pane-text: #cfcecf;
+    -bs-footer-pane-line: #2e2e31;
+    -bs-rd-font-balance: #929293;
+    -bs-rd-font-dark-gray: #7b7b7c;
+    -bs-rd-font-dark: #afaeb0;
+    -bs-rd-font-light: #cfcecf;
+    -bs-rd-font-lighter: #f2f2f2;
+    -bs-rd-font-confirmation-label: #504f52;
+    -bs-rd-font-balance-label: #504f52;
+    -bs-text-color-transparent-dark: rgba(29, 29, 33, 0.54);
+    -bs-text-color-transparent: rgba(29, 29, 33, 0.2);
+    -bs-color-gray-line: #504f52;
+    -bs-rd-separator: #2e2e31;
+    -bs-rd-separator-dark: #151517;
+    -bs-rd-error-red: #d83431;
+    -bs-rd-message-bubble: #2cadaf;
+    -bs-toggle-selected: #504f52;
+    -bs-rd-tooltip-truncated: #afaeb0;
+    -bs-warning: #db6300;
+    -bs-buy: #2ea33c;
+    -bs-buy-focus: black;
+    -bs-buy-hover: #237b2d;
+    -bs-buy-transparent: rgba(46, 163, 60, 0.3);
+    -bs-sell: #ee6563;
+    -bs-sell-focus: #090202;
+    -bs-sell-hover: #b42522;
+    -bs-sell-transparent: rgba(216, 52, 49, 0.3);
+    -bs-volume-transparent: rgba(37, 177, 54, 0.3);
+    -bs-candle-stick-average-line: rgba(21, 188, 29, 0.8);
+    -bs-candle-stick-loss: #ee6563;
+    -bs-candle-stick-won: #15bc1d;
+    -bs-cancel: #1d1d21;
+    -bs-cancel-focus: black;
+    -bs-cancel-hover: #050506;
+    -fx-accent: #2ea33c;
+    -fx-box-border: #1d1d21;
+    -fx-focus-color: #2ea33c;
+    -fx-faint-focus-color: rgba(11, 76, 96, 0.13);
+    -fx-selection-bar: #2a7e2e;
     -fx-selection-bar-non-focused: -fx-selection-bar;
+    -fx-default-button: white;
+}
 
-    -fx-font-size: 13;
-    -fx-font-family: "IBM Plex Sans";
+.text {
+    -fx-text-fill: -bs-text-color;
 }
diff --git a/desktop/src/main/java/bisq/desktop/colors-light.css b/desktop/src/main/java/bisq/desktop/colors-light.css
index e84f30ad2bf..b99aba0f4b7 100644
--- a/desktop/src/main/java/bisq/desktop/colors-light.css
+++ b/desktop/src/main/java/bisq/desktop/colors-light.css
@@ -1,126 +1,92 @@
 .root {
-    -bs-very-dark-grey3: #444; /* 3 usages */
-    -bs-grey: #666666; /* 8 usages */
-    -bs-medium-grey: #AAAAAA; /* 8 usages */
-    -bs-bg-grey: #dddddd; /* 25 usages */
-    -bs-bg-grey2: #bbb; /* 1 usages */
-    -bs-bg-grey3: #d3d3d3; /* 1 usages */
-    -bs-light-grey: #cccccc; /* derive(-bs-rd-white, -20%); 13 usages */
-    -bs-content-bg-grey: #f4f4f4; /* 14 usages */
-    -bs-very-light-grey: #f8f8f8; /* 10 usages */
-    -bs-bg-light: #FAFAFA; /* derive(-bs-rd-white, -2%) 4 usages */
-    -bs-very-light-grey: #F0F0F0; /* derive(-bs-rd-white, -6%) 10 usages */
-    -bs-very-dark-grey: #3c3c3c; /* 8 usages */
-    -bs-very-dark-grey2: #111; /* 1 usages */
-    -bs-black-transparent: rgba(0, 0, 0, 0.5); /* 1 usages */
-    -bs-light-grey2: #cfcfcf; /* 2 usages */
-    -bs-light-grey3: #b5b5b5; /* 1 usages */
-    -bs-font-dark: #333; /* 11 usages */
-    -bs-bg-grey7: #e0e0e0; /* 2 usages */
-    -bs-bg-grey9: #fcfcfc; /* 1 usages */
-    -bs-bg-grey10: #e5e5e5; /* 1 usages */
-    -bs-bg-grey11: #f1f1f1; /* 1 usages */
-    -bs-dark-grey: #555; /* 8 usages */
-    -bs-dim-grey: #696969; /* 1 usages */
-    -bs-very-dark-grey3: #333000; /* 3 usages */
-
-    -bs-soft-red: #ee6664; /* 1 usages */
-    -bs-pink: #ff8986; /* 2 usages */
-    -bs-orange: #ff8a2b; /* 2 usages */
-    -bs-orange2: #dd6900; /* 1 usages */
-    -bs-yellow: #ffb60f; /* 2 usages */
-    -bs-yellow-light: derive(-bs-yellow, 81%);
-    -bs-bg-grey8: #E1E9E1; /* 1 usages */
-    -bs-bg-green2: #619865; /* 2 usages */
-    -bs-bg-green: #99ba9c; /* 4 usages */
-    -bs-turquoise: #2cacaf; /* 1 usages */
-    -bs-bg-grey5: #f1f6f7; /* 4 usages */
-    -bs-bg-grey6: #e7f5f9; /* 3 usages */
-    -bs-bg-blue2: #6aa4b6; /* 3 usages */
-    -bs-bg-blue1: #b5e1ef; /* 3 usages */
-    -bs-bg-blue4: #57acc9; /* 1 usages */
-    -bs-bg-blue3: #9bbdc9; /* 1 usages */
-    -fx-faint-focus-color: #0f87c322; /* 5 usages */
-    -bs-blue-transparent: #0f87c344;
-    -bs-blue: blue; /* 1 usages */
-
-    /* Redesign colors */
-    -bs-rd-green: #25B135; /* 6 usages */
-    -bs-rd-green-dark: #3EA34A;
-    -bs-rd-nav-selected: #25B135;
+    -bs-green-soft: white;
+    -bs-bg-green: #98b999;
+    -bs-color-green-1: #c4d9c5;
+    -bs-color-green-2: #98b999;
+    -bs-color-green-3: #619864;
+    -bs-color-green-4: #15bc1d;
+    -bs-color-green-5: #2a7e2e;
+    -bs-color-blue-1: #b4e1ee;
+    -bs-color-blue-2: #69a3b5;
+    -bs-color-blue-3: #56adc8;
+    -bs-color-blue-4: #1f8cad;
+    -bs-color-blue-5: #0b4c60;
+    -bs-turquoise: #2cadaf;
+    -bs-blue: #1f8cad;
+    -bs-blue-transparent: rgba(11, 76, 96, 0.27);
+    -bs-yellow: #ffb70f;
+    -bs-yellow-light: #f9d686;
+    -bs-red: #d83431;
+    -bs-red-soft: white;
+    -bs-color-primary: #25b136;
+    -bs-color-primary-dark: #2ea33c;
+    -bs-text-color: #0a0a0a;
+    -bs-background-color: #ffffff;
+    -bs-background-gray: #cfcecf;
+    -bs-color-gray: #373737;
+    -bs-color-gray-11: #1d1d21;
+    -bs-color-gray-10: #2e2e31;
+    -bs-color-gray-6: #504f52;
+    -bs-color-gray-4: #7b7b7c;
+    -bs-color-gray-3: #929293;
+    -bs-color-gray-2: #afaeb0;
+    -bs-color-gray-1: #cfcecf;
+    -bs-color-gray-0: #f2f2f2;
+    -bs-rd-nav-selected: #25b136;
     -bs-rd-nav-deselected: rgba(255, 255, 255, 0.59);
-    -bs-rd-nav-background: #2EA33C;
-    -bs-rd-nav-primary-background: #25B135;
-    -bs-rd-nav-primary-border: #189E27;
-    -bs-rd-grey: #373737;
-    -fx-accent: -bs-rd-green; /* 18 usages */
-
-    /* TODO: refactor all colors to use derive from base colors, to enable easy re-coloring */
-    -bs-rd-white: #ffffff; /* 30 usages */
-    -bs-rd-white-transparent: rgba(255, 255, 255, 0.31);
-    -bs-rd-grey-light: #D8D8D8;
-    -bs-rd-grey-medium-light: #E9E9E9;
-    -bs-rd-grey-very-light: #f8f8f8; /* 10 usages */
-    -bs-rd-grey-background: #F2F2F2;
-    -bs-rd-grey-background-bottom: #f6f6f6; /* 1 usages */
-    -bs-rd-grey-background-dark: #DDDDDD;
-    -bs-rd-grey-background-darker: #D0D0D0;
-    -bs-rd-grey-background-darker-2: #9A9A9A;
-    -bs-rd-grey-background-darkest: #444444;
-    -bs-rd-grey-darker: #E1E1E1;
-    -bs-rd-font-lighter: #A7A7A7;
-    -bs-rd-font-light: #8D8D8D;
-    -bs-rd-font-dark: #4B4B4B;
-    -bs-rd-font-balance: #4F4F4F;
-    -bs-rd-font-balance-label: #8E8E8E;
-    -bs-rd-font-dark-grey: #3c3c3c;
-    -bs-rd-font-confirmation-label: -bs-rd-grey-background-darker-2;
-    -bs-rd-nav-border: #535353;
-    -bs-rd-tab-border: #E2E0E0;
-    -bs-rd-nav-background-dark: #0E0E0E;
-    -bs-rd-black: #000000; /* 13 usages */
-    -bs-rd-black-transparent-dark: rgba(0, 0, 0, 0.54);
-    -bs-rd-black-transparent: rgba(0, 0, 0, 0.2);
-    -bs-rd-grey-line: #979797;
-    -bs-rd-separator: #DBDBDB;
-    -bs-rd-separator-dark: #D5E0D6;
-    -bs-rd-error-red: #dd0000; /* 5 usages */
-    -bs-rd-message-bubble: #0086C6;
-    -bs-toggle-selected: #7B7B7B;
-
-    -bs-red: #D73030; /* 5 usages */
-    -fx-box-border: -bs-rd-grey-medium-light;
-
-    -bs-green-soft: derive(-bs-rd-green, 60%); /* 2 usages */
-    -bs-red-soft: derive(-bs-rd-error-red, 60%); /* 2 usages */
-
-    -bs-warning: -bs-orange; /* 1 usages */
-
-    -bs-buy: -bs-rd-green-dark; /* 12 usages */
-    -bs-buy-focus: derive(-bs-buy, -50%); /* 2 usages */
-    -bs-buy-hover: derive(-bs-buy, -10%); /* 2 usages */
-    -bs-buy-transparent: rgba(62, 163, 74, 0.3); /* 1 usages */
-
-    -bs-sell: -bs-red; /* 11 usages */
-    -bs-sell-focus: derive(-bs-sell, -50%); /* 2 usages */
-    -bs-sell-hover: derive(-bs-sell, -10%); /* 2 usages */
-    -bs-sell-transparent: rgba(215, 48, 48, 0.3); /* 1 usages */
-
-    -bs-volume-transparent: rgba(37, 177, 53, 0.3);
-    -bs-candle-stick-average-line: -bs-rd-green;
-    -bs-candle-stick-loss: #FE3001;
-    -bs-candle-stick-won: #20B221;
-
-    -bs-cancel: -bs-bg-grey; /* 5 usages */
-    -bs-cancel-focus: derive(-bs-cancel, -50%); /* 1 usages */
-    -bs-cancel-hover: derive(-bs-cancel, -10%); /* 1 usages */
-
-    -fx-default-button: derive(-fx-accent, 95%);
-    -fx-focus-color: -fx-accent;
-    -fx-selection-bar: #e1f5e3;
-
+    -bs-rd-nav-background: #2ea33c;
+    -bs-rd-nav-primary-background: #25b136;
+    -bs-rd-nav-primary-border: #44a750;
+    -bs-rd-nav-border: #504f52;
+    -bs-rd-nav-border-color: rgba(255, 255, 255, 0.31);
+    -bs-rd-tab-border: derive(#f2f2f2, -5%);
+    -bs-tab-content-area: #ffffff;
+    -bs-color-gray-background: #f2f2f2;
+    -bs-content-pane-bg-top: #f2f2f2;
+    -bs-content-pane-bg-bottom: derive(#f2f2f2, -2%);
+    -bs-scroll-pane-background: transparent;
+    -bs-tab-content-area: transparent;
+    -bs-viewport-background: transparent;
+    -bs-footer-pane-background: #cfcecf;
+    -bs-footer-pane-text: #1d1d21;
+    -bs-footer-pane-line: #cfcecf;
+    -bs-rd-font-balance: #1d1d21;
+    -bs-rd-font-dark-gray: #2e2e31;
+    -bs-rd-font-dark: #2e2e31;
+    -bs-rd-font-light: #504f52;
+    -bs-rd-font-lighter: #7b7b7c;
+    -bs-rd-font-confirmation-label: #504f52;
+    -bs-rd-font-balance-label: #504f52;
+    -bs-text-color-transparent-dark: rgba(29, 29, 33, 0.54);
+    -bs-text-color-transparent: rgba(29, 29, 33, 0.2);
+    -bs-color-gray-line: #504f52;
+    -bs-rd-separator: #cfcecf;
+    -bs-rd-separator-dark: derive(#f2f2f2, -5%);
+    -bs-rd-error-red: #d83431;
+    -bs-rd-message-bubble: #2cadaf;
+    -bs-toggle-selected: #504f52;
+    -bs-rd-tooltip-truncated: #0a0a0a;
+    -bs-warning: #db6300;
+    -bs-buy: #2ea33c;
+    -bs-buy-focus: black;
+    -bs-buy-hover: #237b2d;
+    -bs-buy-transparent: rgba(46, 163, 60, 0.3);
+    -bs-sell: #ee6563;
+    -bs-sell-focus: #090202;
+    -bs-sell-hover: #b42522;
+    -bs-sell-transparent: rgba(216, 52, 49, 0.3);
+    -bs-volume-transparent: rgba(37, 177, 54, 0.3);
+    -bs-candle-stick-average-line: rgba(21, 188, 29, 0.8);
+    -bs-candle-stick-loss: #ee6563;
+    -bs-candle-stick-won: #15bc1d;
+    -bs-cancel: #cfcecf;
+    -bs-cancel-focus: #504e50;
+    -bs-cancel-hover: #b6b4b6;
+    -fx-accent: #2ea33c;
+    -fx-box-border: #cfcecf;
+    -fx-focus-color: #2ea33c;
+    -fx-faint-focus-color: rgba(11, 76, 96, 0.13);
+    -fx-selection-bar: #c4d9c5;
     -fx-selection-bar-non-focused: -fx-selection-bar;
-
-    -fx-font-size: 13;
-    -fx-font-family: "IBM Plex Sans";
+    -fx-default-button: white;
 }