diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index a9b1147b96..6a785ed3f2 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -858,6 +858,7 @@
         height: 100%;
         border: @scaled-one-px-value-ie solid @border-color-shading-ie;
         border: @scaled-one-px-value solid @border-color-shading;
+        border-radius: @border-radius-form-control;
         background-color: transparent;
     }
 
diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less
index dd709c5bc1..2524ab4e29 100644
--- a/apps/common/main/resources/less/colors-table-white.less
+++ b/apps/common/main/resources/less/colors-table-white.less
@@ -181,6 +181,9 @@
         --border-sidemenu: 0 none;
         --border-radius-toolbar: 8px;
         --toolbar-tab-radius: 5px;
+        --toolbar-tab-line-radius: 2px;
+        --toolbar-tab-line-height: 3px;
+        --toolbar-tab-line-bottom: 2px;
         --background-statusbar: var(--background-toolbar);
         --border-toolbar-z-clear: transparent;
         --shadow-toolbar: 0px 1px 3px 0px rgba(0, 0, 0, 0.10), 0px 1px 2px 0px rgba(0, 0, 0, 0.06);
diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less
index a73a582c59..37002a615c 100644
--- a/apps/common/main/resources/less/colors-table.less
+++ b/apps/common/main/resources/less/colors-table.less
@@ -236,6 +236,9 @@
 
     --border-radius-toolbar: 0;
     --toolbar-tab-radius: 0;
+    --toolbar-tab-line-radius: 2px;
+    --toolbar-tab-line-height: 2px;
+    --toolbar-tab-line-bottom: 4px;
     --border-sidemenu: var(--scaled-one-pixel, 1px) solid var(--border-toolbar);
     --background-statusbar: var(--background-pane);
     --border-toolbar-z-clear: var(--border-toolbar);
@@ -492,6 +495,9 @@
 @shadow-side-panel: var(--shadow-side-panel, none);
 @border-radius-toolbar: var(--border-radius-toolbar,0);
 @toolbar-tab-radius: var(--toolbar-tab-radius, 0);
+@toolbar-tab-line-radius: var(--toolbar-tab-line-radius, 2px);
+@toolbar-tab-line-height: var(--toolbar-tab-line-height, 2px);
+@toolbar-tab-line-bottom: var(--toolbar-tab-line-bottom, 4px);
 @layout-padding-toolbar: var(--layout-padding-toolbar, 0);
 @layout-padding-x-side-panel: var(--layout-padding-x-side-panel, 0);
 @layout-padding-y-side-panel: var(--layout-padding-y-side-panel, 2px);
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 86e5f68f14..bfd3083364 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -761,8 +761,6 @@
             padding: 4px 0;
         }
 
-        @underscore_height: 2px;
-
         .tabs {
             ul {
                 padding: 0;
@@ -773,17 +771,19 @@
 
                 &:after {
                     border-top-style: solid;
-                    border-top-width: @underscore_height;
+                    border-top-width: @toolbar-tab-line-height;
                     content: '';
                     position: absolute;
-                    .margin-left-6();
-                    width: calc(100% - 12px);
-                    bottom: -@underscore_height;
+                    .margin-left-7();
+                    width: calc(100% - 14px);
+                    bottom: calc(-1 * @toolbar-tab-line-height);
                     opacity: 0;
                     .tab-header-color();
                     .style-off-tabs& {
                         .tab-toolbar-color();
                     }
+                    border-radius: @toolbar-tab-line-radius;
+                    transition: margin-left .05s ease-in-out, width .05s ease-in-out, opacity .1s ease-in-out;
                 }
 
                 &.active,
@@ -795,14 +795,21 @@
                 &.active {
                     &:after {
                         opacity: 1;
-                        bottom: 4px;
+                        bottom: @toolbar-tab-line-bottom;
                     }
                 }
 
                 &:hover:not(.active) {
                     &:after {
                         opacity: 0.4;
-                        bottom: 4px;
+                        bottom: @toolbar-tab-line-bottom;
+                    }
+                }
+
+                &:hover.active {
+                    &:after {
+                        .margin-left-2();
+                        width: calc(100% - 4px);
                     }
                 }
 
@@ -820,7 +827,7 @@
                 &.short {
                     li {
                         &:after {
-                            bottom: 4px;
+                            bottom: @toolbar-tab-line-bottom;
                         }
                     }
                 }