diff --git a/application/Espo/Core/Utils/ClientManager.php b/application/Espo/Core/Utils/ClientManager.php
index 053368aa4d..96b598ac26 100644
--- a/application/Espo/Core/Utils/ClientManager.php
+++ b/application/Espo/Core/Utils/ClientManager.php
@@ -170,7 +170,7 @@ class ClientManager
 
         $cssFileList = $this->metadata->get(['app', 'client', 'cssList'], []);
         $linkList = $this->metadata->get(['app', 'client', 'linkList'], []);
-        $faviconAlternate = $this->metadata->get('app.client.favicon') ?? $this->faviconAlternate;
+        $faviconAlternate = $this->metadata->get('app.client.faviconAlternate') ?? $this->faviconAlternate;
         [$favicon, $faviconType] = $this->getFaviconData();
 
         $scriptsHtml = implode('',
@@ -397,7 +397,7 @@ class ClientManager
      */
     private function getFaviconData(): array
     {
-        $faviconSvgPath = $this->metadata->get('app.client.faviconSvg') ?? $this->favicon;
+        $faviconSvgPath = $this->metadata->get('app.client.favicon') ?? $this->favicon;
         $faviconType = str_ends_with($faviconSvgPath, '.svg') ? 'image/svg+xml' : 'image/png';
 
         return [$faviconSvgPath, $faviconType];
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 3e16461577..f659848a54 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -155,10 +155,34 @@ img.image-preview {
     }
 
     @media screen and (max-width: (@screen-sm-min - 1px)) {
-    .header-title,
+        .header-title,
         > h3 {
             font-size: 21px;
         }
+
+        .header-buttons {
+            > .btn {
+                max-width: 280px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+
+            &:has(:nth-child(3)) {
+                > .btn {
+                    max-width: 240px;
+                }
+            }
+
+            &:has(:nth-child(4)) {
+                > .btn {
+                    max-width: 170px;
+                }
+            }
+
+            .dropdown-group:last-child {
+                float: right;
+            }
+        }
     }
 
     .page-header-row {
diff --git a/frontend/less/espo/layout-side.less b/frontend/less/espo/layout-side.less
index cce7dfa356..8f691936eb 100644
--- a/frontend/less/espo/layout-side.less
+++ b/frontend/less/espo/layout-side.less
@@ -270,6 +270,10 @@ body[data-navbar="side"] {
 
                         > a {
                             width: 34px;
+
+                            &:focus {
+                                background-color: transparent;
+                            }
                         }
                     }