diff --git a/www/css/common.v2.css b/www/css/common.v2.css
index f9a4e9e0..bf56ac57 100644
--- a/www/css/common.v2.css
+++ b/www/css/common.v2.css
@@ -1,3 +1,6 @@
+/* Import any external, global CSS files here */
+@import url("https://cdn.jsdelivr.net/npm/@creativebulma/bulma-tooltip@1.2.0/dist/bulma-tooltip.min.css");
+
 /* -------------------- */
 /* -= General layout =- */
 
@@ -9,6 +12,11 @@ html, body {
     height: 100vh;
 }
 
+/* Get rid of underlines on the tooltip elements */
+[data-tooltip] {
+    border-bottom-width: 0 !important;
+}
+
 /* ---------------- */
 /* -= Typography =- */
 
diff --git a/www/include/primary_nav.html b/www/include/primary_nav.html
index 32d41d53..5e071846 100644
--- a/www/include/primary_nav.html
+++ b/www/include/primary_nav.html
@@ -11,7 +11,7 @@
               <li>
 
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-monitor"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="My Workspace"><i class="mdi mdi-24px mdi-monitor"></i></span>
                   <span class="icon-text-part"><a class="is-active" tool="workspace" href="./index.html">My Workspace</a></span>
                 </span>
                 </a>
@@ -23,13 +23,13 @@
             <ul class="menu-list">
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon is-medium"><i class="mdi mdi-24px mdi-test-tube"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Gene Expression"><i class="mdi mdi-24px mdi-test-tube"></i></span>
                   <span class="icon-text-part"><a tool="search_expression">Gene Expression</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon is-medium"><i class="mdi mdi-24px mdi-table-search"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Datasets"><i class="mdi mdi-24px mdi-table-search"></i></span>
                   <span class="icon-text-part"><a tool="search_datasets" href="./dataset_explorer.html">Datasets</a></span>
                 </span>
               </li>
@@ -40,31 +40,31 @@
             <ul class="menu-list">
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-chart-line"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Single Cell Workbench"><i class="mdi mdi-24px mdi-chart-line"></i></span>
                   <span class="icon-text-part"><a tool="sc_workbench" href="./analyze_dataset.html">Single Cell Workbench</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-compare-horizontal"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Comparison Tool"><i class="mdi mdi-24px mdi-compare-horizontal"></i></span>
                   <span class="icon-text-part"><a tool="compare" href="./compare_datasets.html">Comparison Tool</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-chart-box-outline"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Single-gene Curator"><i class="mdi mdi-24px mdi-chart-box-outline"></i></span>
                   <span class="icon-text-part"><a tool="sg_curator" href="./dataset_curator.html">Single-gene Curator</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-chart-box-outline"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Multi-gene Displays"><i class="mdi mdi-24px mdi-chart-box-outline"></i></span>
                   <span class="icon-text-part"><a tool="mg_displays" href="./multigene_curator.html">Multi-gene Displays</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-view-dashboard-outline"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Epiviz Panel Designer"><i class="mdi mdi-24px mdi-view-dashboard-outline"></i></span>
                   <span class="icon-text-part"><a tool="epiviz">Epiviz Panel Designer</a></span>
                 </span>
               </li>
@@ -75,19 +75,19 @@
             <ul class="menu-list">
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-folder-open-outline"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Dataset Collections"><i class="mdi mdi-24px mdi-folder-open-outline"></i></span>
                   <span class="icon-text-part"><a tool="manage_dataset" href="./dataset_explorer.html">Dataset Collections</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-folder-text-outline"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Gene Collections"><i class="mdi mdi-18px mdi-folder-text-outline"></i></span>
                   <span class="icon-text-part"><a tool="manage_genes" href="./gene_collection_manager.html">Gene Collections</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-cloud-upload-outline"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Dataset Uploader"><i class="mdi mdi-24px mdi-cloud-upload-outline"></i></span>
                   <span class="icon-text-part"><a tool="upload_dataset" href="./upload_dataset.html">Dataset Uploader</a></span>
                 </span>
               </li>
@@ -98,13 +98,13 @@
             <ul class="menu-list">
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-help-circle-outline"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Help"><i class="mdi mdi-24px mdi-help-circle-outline"></i></span>
                   <span class="icon-text-part"><a>Help</a></span>
                 </span>
               </li>
               <li>
                 <span class="icon-text is-align-items-center is-flex">
-                  <span class="icon"><i class="mdi mdi-18px mdi-face-agent"></i></span>
+                  <span class="icon icon-image-part is-medium has-tooltip-right has-tooltip-arrow" data-tooltip="Feedback"><i class="mdi mdi-24px mdi-face-agent"></i></span>
                   <span class="icon-text-part"><a>Feedback</a></span>
                 </span>
               </li>