diff --git a/application/Espo/Resources/metadata/themes/Espo.json b/application/Espo/Resources/metadata/themes/Espo.json
index 3457af895e..2c8df4a991 100644
--- a/application/Espo/Resources/metadata/themes/Espo.json
+++ b/application/Espo/Resources/metadata/themes/Espo.json
@@ -3,7 +3,7 @@
     "stylesheetIframe": "client/css/espo/espo-iframe.css",
     "dashboardCellHeight": 155,
     "dashboardCellMargin": 19,
-    "navbarHeight": 44,
+    "navbarHeight": 43,
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
diff --git a/application/Espo/Resources/metadata/themes/EspoRtl.json b/application/Espo/Resources/metadata/themes/EspoRtl.json
index 8187ec8b15..4147ea4b68 100644
--- a/application/Espo/Resources/metadata/themes/EspoRtl.json
+++ b/application/Espo/Resources/metadata/themes/EspoRtl.json
@@ -3,7 +3,7 @@
     "stylesheetIframe": "client/css/espo/espo-rtl-iframe.css",
     "dashboardCellHeight": 155,
     "dashboardCellMargin": 19,
-    "navbarHeight": 44,
+    "navbarHeight": 43,
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
diff --git a/application/Espo/Resources/metadata/themes/EspoVertical.json b/application/Espo/Resources/metadata/themes/EspoVertical.json
index 39f81c4468..b607b746cb 100644
--- a/application/Espo/Resources/metadata/themes/EspoVertical.json
+++ b/application/Espo/Resources/metadata/themes/EspoVertical.json
@@ -10,6 +10,7 @@
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
+    "logo": "client/img/logo-39.png",
     "textColor": "#333",
     "chartGridColor": "#ddd",
     "chartTickColor": "#e8eced",
diff --git a/application/Espo/Resources/metadata/themes/Hazyblue.json b/application/Espo/Resources/metadata/themes/Hazyblue.json
index 4d994d6621..f80267134c 100644
--- a/application/Espo/Resources/metadata/themes/Hazyblue.json
+++ b/application/Espo/Resources/metadata/themes/Hazyblue.json
@@ -3,7 +3,7 @@
     "stylesheetIframe": "client/css/espo/hazyblue-iframe.css",
     "dashboardCellHeight": 155,
     "dashboardCellMargin": 19,
-    "navbarHeight": 44,
+    "navbarHeight": 43,
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
diff --git a/application/Espo/Resources/metadata/themes/HazyblueVertical.json b/application/Espo/Resources/metadata/themes/HazyblueVertical.json
index 41fd6b4f72..6f7a25e89b 100644
--- a/application/Espo/Resources/metadata/themes/HazyblueVertical.json
+++ b/application/Espo/Resources/metadata/themes/HazyblueVertical.json
@@ -10,6 +10,7 @@
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
+    "logo": "client/img/logo-33.png",
     "textColor": "#333",
     "chartGridColor": "#ddd",
     "chartTickColor": "#e8eced",
diff --git a/application/Espo/Resources/metadata/themes/Sakura.json b/application/Espo/Resources/metadata/themes/Sakura.json
index ae4785c682..c5b1346ff8 100644
--- a/application/Espo/Resources/metadata/themes/Sakura.json
+++ b/application/Espo/Resources/metadata/themes/Sakura.json
@@ -3,7 +3,7 @@
     "stylesheetIframe": "client/css/espo/sakura-iframe.css",
     "dashboardCellHeight": 155,
     "dashboardCellMargin": 19,
-    "navbarHeight": 44,
+    "navbarHeight": 43,
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
diff --git a/application/Espo/Resources/metadata/themes/SakuraVertical.json b/application/Espo/Resources/metadata/themes/SakuraVertical.json
index 8e419a0d22..8fa12b4b73 100644
--- a/application/Espo/Resources/metadata/themes/SakuraVertical.json
+++ b/application/Espo/Resources/metadata/themes/SakuraVertical.json
@@ -10,6 +10,7 @@
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
+    "logo": "client/img/logo-33.png",
     "textColor": "#333",
     "chartGridColor": "#ddd",
     "chartTickColor": "#e8eced",
diff --git a/application/Espo/Resources/metadata/themes/Violet.json b/application/Espo/Resources/metadata/themes/Violet.json
index 7f36d4b3ac..105ef4991b 100644
--- a/application/Espo/Resources/metadata/themes/Violet.json
+++ b/application/Espo/Resources/metadata/themes/Violet.json
@@ -3,7 +3,7 @@
     "stylesheetIframe": "client/css/espo/violet-iframe.css",
     "dashboardCellHeight": 155,
     "dashboardCellMargin": 19,
-    "navbarHeight": 44,
+    "navbarHeight": 43,
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "textColor": "#333",
diff --git a/application/Espo/Resources/metadata/themes/VioletVertical.json b/application/Espo/Resources/metadata/themes/VioletVertical.json
index ce896ad24f..fbb357e3d7 100644
--- a/application/Espo/Resources/metadata/themes/VioletVertical.json
+++ b/application/Espo/Resources/metadata/themes/VioletVertical.json
@@ -10,6 +10,7 @@
     "modalFooterAtTheTop": true,
     "modalFullHeight": true,
     "fontSize": 14,
+    "logo": "client/img/logo-33.png",
     "textColor": "#333",
     "chartGridColor": "#ddd",
     "chartTickColor": "#e8eced",
diff --git a/client/img/logo-33.png b/client/img/logo-33.png
new file mode 100644
index 0000000000..448e7fcfb0
Binary files /dev/null and b/client/img/logo-33.png differ
diff --git a/client/img/logo.png b/client/img/logo.png
index 97dfd91cfb..b6f64ee68f 100644
Binary files a/client/img/logo.png and b/client/img/logo.png differ
diff --git a/frontend/less/espo-vertical/variables.less b/frontend/less/espo-vertical/variables.less
index a7d939d63c..442d937745 100644
--- a/frontend/less/espo-vertical/variables.less
+++ b/frontend/less/espo-vertical/variables.less
@@ -1,4 +1,5 @@
 @navbar-width: 153px;
 @navbar-minimized-width: 39px;
 @tob-bar-height: 30px;
-@top-navbar-bg-color: @main-gray;
\ No newline at end of file
+@top-navbar-bg-color: @main-gray;
+@navbar-color-border-width: 2px;
\ No newline at end of file
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index d61d1c726d..8e25bb3b62 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -1184,7 +1184,7 @@ label.attach-file-label {
 .stick-sub {
     position: fixed;
     top: 0;
-    margin: 44px 0 0 -@container-padding;
+    margin: @navbar-height 0 0 -@container-padding;
     z-index: 4;
 }
 
diff --git a/frontend/less/espo/layout.less b/frontend/less/espo/layout.less
index 8fb624ccda..bd7182d6a6 100644
--- a/frontend/less/espo/layout.less
+++ b/frontend/less/espo/layout.less
@@ -29,7 +29,6 @@
   border-width: 0 0 1px;
 }
 
-
 body {
     padding-top: 55px;
 }
@@ -77,6 +76,12 @@ body > footer {
     body > footer {
         margin-top: 23px;
     }
+
+    #header .navbar li.tab > a {
+        border-left-width: @navbar-color-border-width;
+        border-left-style: solid;
+        border-color: transparent;
+    }
 }
 
 #header a.minimizer {
@@ -91,6 +96,20 @@ body > footer {
     .more-icon {
         top: 3px;
     }
+
+    #header .navbar ul.nav > li.tab > a {
+        border-bottom-width: @navbar-color-border-width;
+        border-bottom-style: solid;
+        border-color: transparent;
+        padding-bottom: floor(@navbar-padding-vertical - @navbar-color-border-width);
+    }
+
+    #header .navbar ul.dropdown-menu > li.tab > a {
+        border-left-width: @navbar-color-border-width;
+        border-left-style: solid;
+        border-color: transparent;
+        padding-left: 20px - @navbar-color-border-width;
+    }
 }
 
 body > #header ul.tabs span.short-label {
diff --git a/frontend/less/espo/variables.less b/frontend/less/espo/variables.less
index 15af5cf618..a06b27a205 100644
--- a/frontend/less/espo/variables.less
+++ b/frontend/less/espo/variables.less
@@ -42,7 +42,7 @@
 
 @padding-base-horizontal: 10px;
 
-@navbar-height: 44px;
+@navbar-height: 43px;
 @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
 
 @brand-primary: #5184B0;
@@ -127,7 +127,7 @@
 @login-panel-heading-bg: @navbar-inverse-bg;
 
 @logo-width: 181px;
-@logo-height: 44px;
+@logo-height: @navbar-height;
 
 @dashlet-unit-height: 155px;
 
@@ -139,4 +139,4 @@
 
 @modal-title-line-height: floor(@font-size-h4 * @line-height-base);
 
-@navbar-color-border-width: 2px;
+@navbar-color-border-width: 4px;