diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index cccf315c28..b405e945d9 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -106,6 +106,7 @@
   "chat_error": "",
   "checking_dropbox_status": "",
   "checking_project_github_status": "",
+  "choose_a_custom_color": "",
   "clear_cached_files": "",
   "clear_search": "",
   "click_here_to_view_sl_in_lng": "",
@@ -562,6 +563,7 @@
   "open_project": "",
   "optional": "",
   "or": "",
+  "organize_projects": "",
   "other_logs_and_files": "",
   "other_output_files": "",
   "overall_theme": "",
diff --git a/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx b/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx
index 35890ac799..7f89e36766 100644
--- a/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx
+++ b/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx
@@ -2,6 +2,8 @@ import Icon from '../../../../shared/components/icon'
 import useSelectColor from '../../hooks/use-select-color'
 import { SketchPicker } from 'react-color'
 import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Tooltip from '../../../../shared/components/tooltip'
 
 const PRESET_COLORS: ReadonlyArray<string> = [
   '#A7B1C2',
@@ -39,6 +41,7 @@ function ColorPickerItem({ color }: ColorPickerItemProps) {
 }
 
 function MoreButton() {
+  const { t } = useTranslation()
   const {
     selectedColor,
     selectColor,
@@ -70,13 +73,19 @@ function MoreButton() {
             : 'white',
         }}
       >
-        {isCustomColorSelected ? (
-          <Icon type="check" className="color-picker-item-icon" />
-        ) : showCustomPicker ? (
-          <Icon type="chevron-down" className="color-picker-more-open" />
-        ) : (
-          <Icon type="plus" className="color-picker-more" />
-        )}
+        <Tooltip
+          id="tooltip-color-picker-plus"
+          description={t('choose_a_custom_color')}
+          overlayProps={{ delay: 0, placement: 'bottom' }}
+        >
+          {isCustomColorSelected ? (
+            <Icon type="check" className="color-picker-item-icon" />
+          ) : showCustomPicker ? (
+            <Icon type="chevron-down" className="color-picker-more-open" />
+          ) : (
+            <Icon type="plus" className="color-picker-more" />
+          )}
+        </Tooltip>
       </div>
       {showCustomPicker && (
         <>
diff --git a/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx b/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx
index dea1509021..7199f0a589 100644
--- a/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx
+++ b/services/web/frontend/js/features/project-list/components/sidebar/tags-list.tsx
@@ -32,7 +32,7 @@ export default function TagsList() {
   return (
     <>
       <li role="separator" className="separator">
-        <h2>{t('tags')}</h2>
+        <h2>{t('organize_projects')}</h2>
       </li>
       <li className="tag">
         <Button
@@ -103,20 +103,22 @@ export default function TagsList() {
           </li>
         )
       })}
-      <li
-        className={`tag untagged ${
-          selectedTagId === UNCATEGORIZED_KEY ? 'active' : ''
-        }`}
-      >
-        <Button
-          className="tag-name"
-          onClick={() => selectTag(UNCATEGORIZED_KEY)}
-          bsStyle={null}
+      {tags.length > 0 && (
+        <li
+          className={`tag untagged ${
+            selectedTagId === UNCATEGORIZED_KEY ? 'active' : ''
+          }`}
         >
-          <span className="name">{t('uncategorized')}</span>
-          <span className="subdued"> ({untaggedProjectsCount})</span>
-        </Button>
-      </li>
+          <Button
+            className="tag-name"
+            onClick={() => selectTag(UNCATEGORIZED_KEY)}
+            bsStyle={null}
+          >
+            <span className="name">{t('uncategorized')}</span>
+            <span className="subdued"> ({untaggedProjectsCount})</span>
+          </Button>
+        </li>
+      )}
       <CreateTagModal id="create-tag-modal" />
       <EditTagModal id="edit-tag-modal" />
       <DeleteTagModal id="delete-tag-modal" />
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 0302fdd320..c5b2c15856 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -209,6 +209,7 @@
   "checking": "Checking",
   "checking_dropbox_status": "Checking Dropbox status",
   "checking_project_github_status": "Checking project status in GitHub",
+  "choose_a_custom_color": "Choose a custom color",
   "choose_your_plan": "Choose your plan",
   "city": "City",
   "clear_cached_files": "Clear cached files",
@@ -1035,6 +1036,7 @@
   "or_create_project_left": "or create your first project on the left.",
   "organization": "Organization",
   "organization_type": "Organization Type",
+  "organize_projects": "Organize Projects",
   "other_actions": "Other Actions",
   "other_logs_and_files": "Other logs and files",
   "other_output_files": "Download other output files",
diff --git a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
index f9a081f8e6..d8a13050a4 100644
--- a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
@@ -43,7 +43,7 @@ describe('<TagsList />', function () {
 
   it('displays the tags list', function () {
     screen.getByRole('heading', {
-      name: 'Tags',
+      name: 'Organize Projects',
     })
     screen.getByRole('button', {
       name: 'New Tag',