diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 3595df2c1..736f2cece 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -36,7 +36,6 @@
 
         display: flex;
         align-items: stretch;
-        border-bottom: @border-toolbar-active-panel-top 1px solid;
 
         .extra {
             background-color: @header-background-color-ie;
@@ -59,7 +58,7 @@
         background-color: @header-background-color-ie;
         background-color: @header-background-color;
         position: relative;
-        overflow: visible;
+        overflow: hidden;
         display: flex;
         flex-shrink: 1;
 
@@ -67,7 +66,7 @@
             padding: 4px 0 0;
             margin: 0;
             white-space: nowrap;
-            overflow: visible;
+            overflow: hidden;
             list-style: none;
             font-size: 0;
         }
@@ -76,7 +75,6 @@
             display: inline-flex;
             align-items: center;
             height: 100%;
-            border-top: transparent 2px solid;
             &:hover {
                 background-color: @highlight-header-button-hover-ie;
                 background-color: @highlight-header-button-hover;
@@ -85,9 +83,6 @@
             &.active {
                 background-color: @background-toolbar-ie;
                 background-color: @background-toolbar;
-                border: @border-toolbar-active-panel-top 1px solid;
-                border-bottom: none;
-                height: 28px;
             }
 
 
@@ -100,15 +95,12 @@
                 text-align: center;
                 color: @text-toolbar-header-ie;
                 color: @text-toolbar-header;
-                position: relative;
-                top: -1px;
             }
 
             &.active {
                 > a {
                     color: @text-normal-ie;
                     color: @text-normal;
-                    padding: 0 11px;
                 }
             }
         }
@@ -404,10 +396,6 @@
             box-shadow: inset 0 -1px 0 0 @border-regular-control;
         }
 
-        .box-tabs {
-           border-bottom: none;
-        }
-
         .tabs {
             ul {
                 padding: 0;
@@ -415,7 +403,6 @@
 
             li {
                 position: relative;
-                border: none;
                 &:after {
                     //transition: opacity .1s;
                     //transition: bottom .1s;
@@ -430,9 +417,9 @@
 
                 &.active {
                     background-color: transparent;
-                    > a {
-                        padding: 0 12px;
-                    }
+                    //> a {
+                    //    padding: 0 12px;
+                    //}
                     &:after {
                         opacity: 1;
                         bottom: 0;
@@ -440,15 +427,19 @@
                 }
 
                 &:hover:not(.active) {
-                    //background-color: rgba(0, 0, 0, .05);
-                    background-color: @highlight-button-hover-ie;
-                    background-color: @highlight-button-hover;
+                    background-color: rgba(0, 0, 0, .05);
+
+                    .theme-type-dark & {
+                        background-color: rgba(255, 255, 255, .05);
+                    }
+
+                    //background-color: @highlight-button-hover-ie;
+                    //background-color: @highlight-button-hover;
                 }
 
                 > a {
                     color: @text-normal-ie;
                     color: @text-normal;
-                    top: 0;
                     &::after {
                         display:block;
                         content:attr(data-title);
@@ -575,8 +566,8 @@
             color: @text-normal-ie;
             color: @text-normal;
             &:hover:not(:disabled),&:focus {
-                box-shadow: 0 0 0 @scaled-one-px-value-ie @highlight-header-button-hover-ie;
-                box-shadow: 0 0 0 @scaled-one-px-value @highlight-header-button-hover;
+                box-shadow: 0 0 0 @scaled-one-px-value-ie @highlight-button-hover-ie;
+                box-shadow: 0 0 0 @scaled-one-px-value @highlight-button-hover;
             }
         }