diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 67cc3932b..cc9ee6c3f 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -269,6 +269,12 @@
                     cursor: pointer;
                     margin-left: -5px;
                     padding-left: 5px;
+                    .fa, .cptools {
+                        display: inline-block;
+                        min-width: 0;
+                        width: 25px;
+                        margin-right: 0px;
+                    }
                 }
             }
         }
diff --git a/customize.dist/src/less2/include/leftside-menu.less b/customize.dist/src/less2/include/leftside-menu.less
index 1c0b828dd..4ffd2c4b8 100644
--- a/customize.dist/src/less2/include/leftside-menu.less
+++ b/customize.dist/src/less2/include/leftside-menu.less
@@ -6,13 +6,16 @@
 }
 .leftside-menu-category_main() {
     .unselectable_make();
-    padding: 5px 20px;
+    padding: 5px 15px;
     margin: 15px 0;
     cursor: pointer;
     height: @variables_bar-height;
     line-height: @variables_bar-height - 10px;
     .fa, .cptools {
-        width: 25px;
+        display: inline-flex;
+        justify-content: center;
+        margin-right: 5px;
+        min-width: 25px;
     }
     &:hover {
         background: rgba(0,0,0,0.05);
diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index ae1fa4a10..c9e2fdb03 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -38,13 +38,18 @@
             }
             &.cp-leftside-narrow {
                 transition: width 0.2s;
-                width: 50px;
+                width: 55px;
                 .cp-sidebarlayout-category {
                     display: flex;
                     max-width: 100%;
                     align-items: center;
+                    .fa, .cptools {
+                        margin-right: 0;
+                        flex: 0;
+                    }
                     span.cp-sidebarlayout-category-name {
-                        flex: 1;
+                        //margin-left: 5px;
+                        padding-left: 5px;
                         white-space: nowrap;
                         overflow: hidden;
                         text-overflow: ellipsis;
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index e337bd386..d0ae3910f 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -892,6 +892,7 @@ define([
 
         // Arrow keys to modify the selection
         var onWindowKeydown = function (e) {
+            if (!$content.is(':visible')) { return; }
             var $searchBar = $tree.find('#cp-app-drive-tree-search-input');
             if (document.activeElement && document.activeElement.nodeName === 'INPUT') { return; }
             if ($searchBar.is(':focus') && $searchBar.val()) { return; }
diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index b99afa42f..042d75a49 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -29,6 +29,9 @@
                 }
             }
         }
+        div#cp-sidebarlayout-leftside {
+            background-color: #e0e0e0;
+        }
         div#cp-sidebarlayout-rightside.cp-rightside-drive {
             padding: 0;
             & > .cp-team-chat {
@@ -80,6 +83,11 @@
                 background-color: transparent !important;
             }
         }
+        .cp-team-cat-chat {
+            span.cp-team-chat-notification {
+                color: red;
+            }
+        }
 
         .cp-team-list {
             .cp-team-list-container {