diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 24959179c..57d0a84f7 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -96,9 +96,9 @@
 @colortheme_drive-color: #fff;
 @colortheme_drive-warn: #cd2532;
 
-@colortheme_team-bg: #0b0061;
-@colortheme_team-color: #fff;
-@colortheme_team-warn: #cd2532;
+@colortheme_teams-bg: #0b0061;
+@colortheme_teams-color: #fff;
+@colortheme_teams-warn: #cd2532;
 
 @colortheme_file-bg: #cd2532;
 @colortheme_file-color: #fff;
diff --git a/customize.dist/src/less2/include/icon-colors.less b/customize.dist/src/less2/include/icon-colors.less
index 5c4909628..776a7c443 100644
--- a/customize.dist/src/less2/include/icon-colors.less
+++ b/customize.dist/src/less2/include/icon-colors.less
@@ -21,6 +21,7 @@
     .cp-icon-color-sheet { color: @colortheme_oocell-bg; }
     .cp-icon-color-kanban { color: @colortheme_kanban-bg; }
     .cp-icon-color-admin { color: @colortheme_admin-bg; }
+    .cp-icon-color-teams { color: @colortheme_teams-bg; }
 
     .cp-border-color-pad { border-color: @colortheme_pad-bg !important; }
     .cp-border-color-code { border-color: @colortheme_code-bg !important; }
@@ -39,5 +40,6 @@
     .cp-border-color-sheet { border-color: @colortheme_oocell-bg !important; }
     .cp-border-color-kanban { border-color: @colortheme_kanban-bg !important; }
     .cp-border-color-admin { border-color: @colortheme_admin-bg !important; }
+    .cp-border-color-teams { border-color: @colortheme_teams-bg !important; }
 }
 
diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 09f1604f3..be0ba3f47 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -106,6 +106,7 @@ define(function() {
         ooslide: 'fa-file-powerpoint-o',
         sheet: 'fa-file-excel-o',
         drive: 'fa-hdd-o',
+        teams: 'fa-users',
     };
 
     // Ability to create owned pads and expiring pads through a new pad creation screen.
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ef52bf8e1..484c21f22 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2499,7 +2499,18 @@ define([
                     'href': origin+'/drive/',
                     'class': 'fa fa-hdd-o'
                 },
-                content: h('span', Messages.login_accessDrive)
+                content: h('span', Messages.type.drive)
+            });
+        }
+        if (padType !== 'teams' && accountName) {
+            options.push({
+                tag: 'a',
+                attributes: {
+                    'target': '_blank',
+                    'href': origin+'/teams/',
+                    'class': 'fa fa-users'
+                },
+                content: h('span', Messages.type.teams)
             });
         }
         options.push({ tag: 'hr' });
diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index 41d03640a..96f2aa6fd 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -7,9 +7,9 @@
 
 &.cp-app-team {
     .framework_min_main(
-        @bg-color: @colortheme_team-bg,
-        @warn-color: @colortheme_team-warn,
-        @color: @colortheme_team-color
+        @bg-color: @colortheme_teams-bg,
+        @warn-color: @colortheme_teams-warn,
+        @color: @colortheme_teams-color
     );
 
     .drive_main();
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 5e9bdc7a8..4fa227dd3 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -838,7 +838,7 @@ define([
             driveAPP.loggedIn = common.isLoggedIn();
             if (!driveAPP.loggedIn) { throw new Error('NOT_LOGGED_IN'); }
 
-            common.setTabTitle(Messages.type.team);
+            common.setTabTitle(Messages.type.teams);
 
             // Drive data
             if (privateData.newSharedFolder) {
@@ -850,7 +850,7 @@ define([
             var $bar = $('#cp-toolbar');
             var configTb = {
                 displayed: ['useradmin', 'pageTitle', 'newpad', 'limit', 'notifications'],
-                pageTitle: Messages.type.team,
+                pageTitle: Messages.type.teams,
                 metadataMgr: metadataMgr,
                 readOnly: privateData.readOnly,
                 sfCommon: common,