diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index fe6a47453..6abe77fa3 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -542,14 +542,14 @@
     width: 45px;
     height: 22px;
     padding: 1px 11px 1px 1px;
-    border:1px solid @input-border;
+    border:1px solid @border-regular-control;
     .border-radius(@border-radius-small);
 
     span:nth-child(1) {
         float: left;
         width: 100%;
         height: 100%;
-        border: 1px solid rgba(0, 0, 0, 0.2);
+        border: 1px solid @border-control-focus;
         background-color: transparent;
     }
 
@@ -629,8 +629,8 @@
 .btn-text-default {
     width: 75px;
     height: 22px;
-    background: @input-bg;
-    border: 1px solid @input-border;
+    background: @background-normal;
+    border: 1px solid @border-regular-control;
     .border-radius(@border-radius-small);
 
     &.auto {
@@ -660,8 +660,8 @@
 .btn-text-menu-default {
     width: 100%;
     height: 22px;
-    background: @input-bg;
-    border: 1px solid @input-border;
+    background: @background-normal;
+    border: 1px solid @border-regular-control;
     .border-radius(@border-radius-small);
 
     button {
@@ -694,8 +694,8 @@
 .btn-text-split-default {
     width: 75px;
     height: 22px;
-    background: @input-bg;
-    border: 1px solid @input-border;
+    background: @background-normal;
+    border: 1px solid @border-regular-control;
     .border-radius(@border-radius-small);
 
     &.dropdown-toggle {
@@ -727,8 +727,8 @@
 .btn-icon-default {
     width: 45px;
     height: 22px;
-    background: @input-bg;
-    border: 1px solid @input-border;
+    background: @background-normal;
+    border: 1px solid @border-regular-control;
     .border-radius(@border-radius-small);
 
     .icon {
@@ -767,8 +767,8 @@
     padding: 2px;
     margin:0;
     box-shadow: none;
-    background-color: @input-bg;
-    border: 1px solid @input-border;
+    background-color: @background-normal;
+    border: 1px solid @border-regular-control;
     .border-radius(@border-radius-small);
 
     &.template-table {
@@ -793,7 +793,7 @@
         margin-right: 3px;
         background-color: transparent;
         background-repeat: no-repeat;
-        border: 1px solid @input-border;
+        border: 1px solid @border-regular-control;
         position: relative;
     }
 
@@ -807,7 +807,7 @@
     .over,
     &:active,
     &.active {
-        background-color: @input-bg !important;
+        background-color: @background-normal !important;
     }
 
     &:active:not(.disabled),
diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less
index 4b454217d..a58d38b0a 100644
--- a/apps/common/main/resources/less/combobox.less
+++ b/apps/common/main/resources/less/combobox.less
@@ -52,7 +52,7 @@
     .btn:hover,
     .btn:focus {
         border-left: 0;
-        border-color: @input-border;
+        border-color: @border-control-focus;
         background-color: transparent;
         margin-left: -1px;
         position: absolute;
@@ -62,8 +62,8 @@
 
     .btn-default:not(.disabled),
     &.open .dropdown-toggle.btn-default {
-        background-color: @input-bg;
-        border-color: @input-border;
+        background-color: @background-normal;
+        border-color: @border-regular-control;
     }
 
     &.input-group-nr.open:not(.no-highlighted) {
diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less
index e50bd6a55..e12b93a8b 100644
--- a/apps/common/main/resources/less/dropdown-menu.less
+++ b/apps/common/main/resources/less/dropdown-menu.less
@@ -3,6 +3,9 @@
 }
 
 .dropdown-menu {
+    background-color: @background-normal;
+    border-color: @border-regular-control;
+
     &.scrollable-menu {
         height: auto;
         max-height: 400px;
@@ -30,6 +33,7 @@
         & > a {
             padding: 5px 20px;
             cursor: pointer;
+            color: @text-normal;
 
             &:focus, &.focus {
                 outline: 0;
diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less
index e6b97a0d3..6c18b4269 100644
--- a/apps/common/main/resources/less/input.less
+++ b/apps/common/main/resources/less/input.less
@@ -4,8 +4,11 @@
     color: var(--text-normal);
     .user-select(text);
 
+    border: 1px solid @border-regular-control;
+    background-color: @background-normal;
+
     &:focus {
-        border-color: @input-border;
+        border-color: @border-control-focus;
         outline: 0;
         .box-shadow(none);
     }
@@ -13,12 +16,12 @@
 
 .form-control[readonly] {
     cursor: pointer;
-    background-color: @input-bg;
+    background-color: @background-normal;
 }
 
 .form-control[disabled] {
     cursor: default;
-    background-color: @input-bg;
+    background-color: @background-normal;
    .user-select(none);
 }
 
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index 9389188ae..0cf61e8b9 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -26,7 +26,7 @@
     z-index: @zindex-modal-background;
     box-shadow: 0 5px 15px rgba(0,0,0,0.2);
     border-radius: 5px;
-    background-color: @body-bg;
+    background-color: @background-normal;
     border: solid 1px var(--border-toolbar);
 
     left: 0;
@@ -122,7 +122,7 @@
         position: absolute;
         top: 34px;
         width: 100%;
-        background-color: @body-bg;
+        background-color: @background-normal;
     }
 
     &.modal {