diff --git a/desktop/app/src/ui/components/ToolbarIcon.tsx b/desktop/app/src/ui/components/ToolbarIcon.tsx
index f0a55e864..687817477 100644
--- a/desktop/app/src/ui/components/ToolbarIcon.tsx
+++ b/desktop/app/src/ui/components/ToolbarIcon.tsx
@@ -8,6 +8,7 @@
  */
 
 import Glyph from './Glyph';
+import Tooltip from './Tooltip';
 import {colors} from './colors';
 import styled from '@emotion/styled';
 import React from 'react';
@@ -26,18 +27,20 @@ const ToolbarIconContainer = styled.div({
   position: 'relative', // for settings popover positioning
 });
 
-export default function ToolbarIcon({active, icon, ...props}: Props) {
+export default function ToolbarIcon({active, icon, title, ...props}: Props) {
   return (
-    <ToolbarIconContainer {...props}>
-      <Glyph
-        name={icon}
-        size={16}
-        color={
-          active
-            ? colors.macOSTitleBarIconSelected
-            : colors.macOSTitleBarIconActive
-        }
-      />
-    </ToolbarIconContainer>
+    <Tooltip title={title}>
+      <ToolbarIconContainer {...props}>
+        <Glyph
+          name={icon}
+          size={16}
+          color={
+            active
+              ? colors.macOSTitleBarIconSelected
+              : colors.macOSTitleBarIconActive
+          }
+        />
+      </ToolbarIconContainer>
+    </Tooltip>
   );
 }